aboutsummaryrefslogtreecommitdiffstats
path: root/java/src
diff options
context:
space:
mode:
authorKurt Partridge <kep@google.com>2013-04-17 19:41:24 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2013-04-17 19:41:24 -0700
commitde51abf1cfa0aea19d82cae69ea9bad2338d6d3a (patch)
treec8acdf7ce56f0a8d7648a619473de3899180e9db /java/src
parentf080123dd4fa52589aa5ee1e42b2699192e8523e (diff)
parentbfe5c07fda3d24589b1ad16d41c0dafd6651d0ee (diff)
downloadlatinime-de51abf1cfa0aea19d82cae69ea9bad2338d6d3a.tar.gz
latinime-de51abf1cfa0aea19d82cae69ea9bad2338d6d3a.tar.xz
latinime-de51abf1cfa0aea19d82cae69ea9bad2338d6d3a.zip
am bfe5c07f: am ededdc6a: Merge "Avoid NPE"
* commit 'bfe5c07fda3d24589b1ad16d41c0dafd6651d0ee': 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() {