commit c2049c3284e6fb64860f133c798388582b35b862
author Kurt Partridge <kep@google.com> Wed Dec 19 17:20:12 2012 -0800
committer Android (Google) Code Review <android-gerrit@google.com> Wed Dec 19 17:20:12 2012 -0800
tree abb55891ad6541075346432af1ec86b35d308fb9
parent 94ac7a38516635d552c54bdcb5785e7d60fe2188
parent 41fe487e3a379ec69925b679140b406eb21884ba

Merge "[Rlog6.1] Fix LOG_EVERYTHING bug."

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

diff --git a/java/src/com/android/inputmethod/research/ResearchLogger.java b/java/src/com/android/inputmethod/research/ResearchLogger.java
index 9f65f5d..151190a 100644
--- a/java/src/com/android/inputmethod/research/ResearchLogger.java
+++ b/java/src/com/android/inputmethod/research/ResearchLogger.java
@@ -681,7 +681,7 @@
         if (!mCurrentLogUnit.isEmpty()) {
             if (mMainLogBuffer != null) {
                 mMainLogBuffer.shiftIn(mCurrentLogUnit);
-                if (mMainLogBuffer.isSafeToLog() && mMainResearchLog != null) {
+                if ((mMainLogBuffer.isSafeToLog() || LOG_EVERYTHING) && mMainResearchLog != null) {
                     publishLogBuffer(mMainLogBuffer, mMainResearchLog,
                             true /* isIncludingPrivateData */);
                     mMainLogBuffer.resetWordCounter();