nyancrimew
/
LatinIME
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

am 211103d7: [Rlog58a] Fix privacy leak of word in logUnitStart 

* commit '211103d7fecc3d6df116ec677ae88cb6d70cce86':
  [Rlog58a] Fix privacy leak of word in logUnitStart
main
Kurt Partridge 2013-01-10 16:08:47 -08:00 committed by Android Git Automerger
parent 564524067f 211103d7fe
commit ef243ffa1a
1 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
java/src/com/android/inputmethod/research/LogUnit.java
View File

@ -133,7 +133,7 @@ import java.util.Map;
// will not have been opened for writing. // will not have been opened for writing.
if (jsonWriter == null) { if (jsonWriter == null) {
jsonWriter = researchLog.getValidJsonWriterLocked(); jsonWriter = researchLog.getValidJsonWriterLocked();
outputLogUnitStart(jsonWriter); outputLogUnitStart(jsonWriter, isIncludingPrivateData);
} }
outputLogStatementToLocked(jsonWriter, mLogStatementList.get(i), mValuesList.get(i), outputLogStatementToLocked(jsonWriter, mLogStatementList.get(i), mValuesList.get(i),
mTimeList.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_BEGIN_KEY = "logUnitStart";
private static final String LOG_UNIT_END_KEY = "logUnitEnd"; 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 { try {
jsonWriter.beginObject(); jsonWriter.beginObject();
jsonWriter.name(CURRENT_TIME_KEY).value(System.currentTimeMillis()); 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.name(EVENT_TYPE_KEY).value(LOG_UNIT_BEGIN_KEY);
jsonWriter.endObject(); jsonWriter.endObject();
} catch (IOException e) { } catch (IOException e) {