commit ededdc6a8b6befbb5f21a53d366354ea8c8fd5d9
author Kurt Partridge <kep@google.com> Fri Apr 12 18:10:49 2013 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Fri Apr 12 18:10:49 2013 +0000
tree 45350ca4785c367828b0a0775df0d428544d1b9c
parent 128961ade05725564bdc229098c97c6ed66a2e9e
parent 39cb0334d9c7aec68b00ba1399a5194493264709

Merge "Avoid NPE"

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 320db81..7a23ddb 100644
--- a/java/src/com/android/inputmethod/research/ResearchLogger.java
+++ b/java/src/com/android/inputmethod/research/ResearchLogger.java
@@ -380,6 +380,9 @@
         requestIndicatorRedraw();
         mStatistics.reset();
         checkForEmptyEditor();
+        if (mFeedbackLogBuffer == null) {
+            resetFeedbackLogging();
+        }
         if (!isAllowedToLog()) {
             // Log.w(TAG, "not in usability mode; not logging");
             return;
@@ -413,9 +416,6 @@
                 }
             };
         }
-        if (mFeedbackLogBuffer == null) {
-            resetFeedbackLogging();
-        }
     }
 
     private void resetFeedbackLogging() {