diff options
| author |   Kurt Partridge <kep@google.com> | 2013-01-10 16:08:47 -0800 |
|---|---|---|
| committer |   Android Git Automerger <android-git-automerger@android.com> | 2013-01-10 16:08:47 -0800 |
| commit | ef243ffa1ad3d67187e03a71bc5b4a4ebf139442 (patch) | |
| tree | e8bbea07f72b4efe753f6cbfc0052db893f7b750 /java/src | |
| parent | 564524067fcf34750a189b210084619461611eb5 (diff) | |
| parent | 211103d7fecc3d6df116ec677ae88cb6d70cce86 (diff) | |
| download | latinime-ef243ffa1ad3d67187e03a71bc5b4a4ebf139442.tar.gz latinime-ef243ffa1ad3d67187e03a71bc5b4a4ebf139442.tar.xz latinime-ef243ffa1ad3d67187e03a71bc5b4a4ebf139442.zip | |
am 211103d7: [Rlog58a] Fix privacy leak of word in logUnitStart
* commit '211103d7fecc3d6df116ec677ae88cb6d70cce86':
[Rlog58a] Fix privacy leak of word in logUnitStart
Diffstat (limited to 'java/src')
| -rw-r--r-- | java/src/com/android/inputmethod/research/LogUnit.java | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/java/src/com/android/inputmethod/research/LogUnit.java b/java/src/com/android/inputmethod/research/LogUnit.java index 7b45ff175..cfba28909 100644 --- a/java/src/com/android/inputmethod/research/LogUnit.java +++ b/java/src/com/android/inputmethod/research/LogUnit.java @@ -133,7 +133,7 @@ import java.util.Map; // will not have been opened for writing. if (jsonWriter == null) { jsonWriter = researchLog.getValidJsonWriterLocked(); - outputLogUnitStart(jsonWriter); + outputLogUnitStart(jsonWriter, isIncludingPrivateData); } outputLogStatementToLocked(jsonWriter, mLogStatementList.get(i), mValuesList.get(i), mTimeList.get(i)); @@ -169,11 +169,14 @@ import java.util.Map; private static final String LOG_UNIT_BEGIN_KEY = "logUnitStart"; private static final String LOG_UNIT_END_KEY = "logUnitEnd"; - private void outputLogUnitStart(final JsonWriter jsonWriter) { + private void outputLogUnitStart(final JsonWriter jsonWriter, + final boolean isIncludingPrivateData) { try { jsonWriter.beginObject(); jsonWriter.name(CURRENT_TIME_KEY).value(System.currentTimeMillis()); - jsonWriter.name(WORD_KEY).value(getWord()); + if (isIncludingPrivateData) { + jsonWriter.name(WORD_KEY).value(getWord()); + } jsonWriter.name(EVENT_TYPE_KEY).value(LOG_UNIT_BEGIN_KEY); jsonWriter.endObject(); } catch (IOException e) { |