aboutsummaryrefslogtreecommitdiffstats
path: root/java/src
diff options
context:
space:
mode:
authorKurt Partridge <kep@google.com>2013-04-12 11:13:44 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2013-04-12 11:13:44 -0700
commitbfe5c07fda3d24589b1ad16d41c0dafd6651d0ee (patch)
tree45350ca4785c367828b0a0775df0d428544d1b9c /java/src
parent8895e5fbea6f796b325f32c6a0bc92bd3c9ad8a4 (diff)
parentededdc6a8b6befbb5f21a53d366354ea8c8fd5d9 (diff)
downloadlatinime-bfe5c07fda3d24589b1ad16d41c0dafd6651d0ee.tar.gz
latinime-bfe5c07fda3d24589b1ad16d41c0dafd6651d0ee.tar.xz
latinime-bfe5c07fda3d24589b1ad16d41c0dafd6651d0ee.zip
am ededdc6a: Merge "Avoid NPE"
* commit 'ededdc6a8b6befbb5f21a53d366354ea8c8fd5d9': Avoid NPE
Diffstat (limited to 'java/src')
-rw-r--r--java/src/com/android/inputmethod/research/ResearchLogger.java6
1 files changed, 3 insertions, 3 deletions
diff --git a/java/src/com/android/inputmethod/research/ResearchLogger.java b/java/src/com/android/inputmethod/research/ResearchLogger.java
index 320db8123..7a23ddb05 100644
--- a/java/src/com/android/inputmethod/research/ResearchLogger.java
+++ b/java/src/com/android/inputmethod/research/ResearchLogger.java
@@ -380,6 +380,9 @@ public class ResearchLogger implements SharedPreferences.OnSharedPreferenceChang
requestIndicatorRedraw();
mStatistics.reset();
checkForEmptyEditor();
+ if (mFeedbackLogBuffer == null) {
+ resetFeedbackLogging();
+ }
if (!isAllowedToLog()) {
// Log.w(TAG, "not in usability mode; not logging");
return;
@@ -413,9 +416,6 @@ public class ResearchLogger implements SharedPreferences.OnSharedPreferenceChang
}
};
}
- if (mFeedbackLogBuffer == null) {
- resetFeedbackLogging();
- }
}
private void resetFeedbackLogging() {