aboutsummaryrefslogtreecommitdiffstats
path: root/java/src
diff options
context:
space:
mode:
authorKurt Partridge <kep@google.com>2013-02-21 14:15:35 -0800
committerAndroid Git Automerger <android-git-automerger@android.com>2013-02-21 14:15:35 -0800
commit14ff187c393609c6e33bef720a0319eaa795d597 (patch)
treeb36eff4c6546dd6c22eca58a75c42b674e0a84db /java/src
parentbe28c0c0b5832c86b7d392ee730d7bb66d1913f1 (diff)
parentc8a1ec6e4128240a8f666120dbc3fb066a717f00 (diff)
downloadlatinime-14ff187c393609c6e33bef720a0319eaa795d597.tar.gz
latinime-14ff187c393609c6e33bef720a0319eaa795d597.tar.xz
latinime-14ff187c393609c6e33bef720a0319eaa795d597.zip
am c8a1ec6e: Merge "[TestPrep2] Rename a method"
* commit 'c8a1ec6e4128240a8f666120dbc3fb066a717f00': [TestPrep2] Rename a method
Diffstat (limited to 'java/src')
-rw-r--r--java/src/com/android/inputmethod/research/LogUnit.java6
-rw-r--r--java/src/com/android/inputmethod/research/ResearchLog.java2
2 files changed, 4 insertions, 4 deletions
diff --git a/java/src/com/android/inputmethod/research/LogUnit.java b/java/src/com/android/inputmethod/research/LogUnit.java
index 1a9a720f3..e91976a03 100644
--- a/java/src/com/android/inputmethod/research/LogUnit.java
+++ b/java/src/com/android/inputmethod/research/LogUnit.java
@@ -151,10 +151,10 @@ import java.util.List;
continue;
}
// Only retrieve the jsonWriter if we need to. If we don't get this far, then
- // researchLog.getValidJsonWriterLocked() will not ever be called, and the file
- // will not have been opened for writing.
+ // researchLog.getInitializedJsonWriterLocked() will not ever be called, and the
+ // file will not have been opened for writing.
if (jsonWriter == null) {
- jsonWriter = researchLog.getValidJsonWriterLocked();
+ jsonWriter = researchLog.getInitializedJsonWriterLocked();
outputLogUnitStart(jsonWriter, canIncludePrivateData);
}
logStatement.outputToLocked(jsonWriter, mTimeList.get(i), mValuesList.get(i));
diff --git a/java/src/com/android/inputmethod/research/ResearchLog.java b/java/src/com/android/inputmethod/research/ResearchLog.java
index 5114977d8..4dff17530 100644
--- a/java/src/com/android/inputmethod/research/ResearchLog.java
+++ b/java/src/com/android/inputmethod/research/ResearchLog.java
@@ -206,7 +206,7 @@ public class ResearchLog {
* Return a JsonWriter for this ResearchLog. It is initialized the first time this method is
* called. The cached value is returned in future calls.
*/
- public JsonWriter getValidJsonWriterLocked() {
+ public JsonWriter getInitializedJsonWriterLocked() {
try {
if (mJsonWriter == NULL_JSON_WRITER && mFile != null) {
final FileOutputStream fos =