Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit c8a1ec6e authored by Kurt Partridge's avatar Kurt Partridge Committed by Android (Google) Code Review
Browse files

Merge "[TestPrep2] Rename a method"

parents 4e5a4ddb b6d05aeb

java/src/com/android/inputmethod/research/LogUnit.java

+3 −3
Original line number Diff line number Diff line
@@ -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));

java/src/com/android/inputmethod/research/ResearchLog.java

+1 −1
Original line number Diff line number Diff line
@@ -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 =