commit 39cb0334d9c7aec68b00ba1399a5194493264709
author Kurt Partridge <kep@google.com> Mon Mar 25 17:33:43 2013 -0700
committer Kurt Partridge <kep@google.com> Tue Mar 26 16:46:43 2013 -0700
tree 4eb86710cb703de34c1b5c626ceb021c6d48634b
parent 73d00e68d8fcd64ce28fc5bed6881100a0fead9b

Avoid NPE

Initialize FeedbackLog earlier to avoid NPE

Change-Id: I646944c68a7d092345def16060b2a4edd8c7dbef

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