aboutsummaryrefslogtreecommitdiffstats
path: root/java/src
diff options
context:
space:
mode:
authorKurt Partridge <kep@google.com>2013-04-17 20:33:25 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2013-04-17 20:33:26 +0000
commita5bfac5becddda70c76a151d838666b33374c0ef (patch)
treecfa0075ecfb54246562b0667c73963489bf2f340 /java/src
parent7da87f97b07bf2c84e033fb53106f9c50b6200ec (diff)
parent4ac28ded28de7e66a25dea38126789ba00042c09 (diff)
downloadlatinime-a5bfac5becddda70c76a151d838666b33374c0ef.tar.gz
latinime-a5bfac5becddda70c76a151d838666b33374c0ef.tar.xz
latinime-a5bfac5becddda70c76a151d838666b33374c0ef.zip
Merge "Fix NPE"
Diffstat (limited to 'java/src')
-rw-r--r--java/src/com/android/inputmethod/research/ResearchLogger.java2
1 files changed, 1 insertions, 1 deletions
diff --git a/java/src/com/android/inputmethod/research/ResearchLogger.java b/java/src/com/android/inputmethod/research/ResearchLogger.java
index 4b04eb436..8f14d828c 100644
--- a/java/src/com/android/inputmethod/research/ResearchLogger.java
+++ b/java/src/com/android/inputmethod/research/ResearchLogger.java
@@ -894,7 +894,7 @@ public class ResearchLogger implements SharedPreferences.OnSharedPreferenceChang
// Check that expected word matches.
if (oldLogUnit != null) {
final String oldLogUnitWord = oldLogUnit.getWord();
- if (!oldLogUnitWord.equals(expectedWord)) {
+ if (oldLogUnitWord != null && !oldLogUnitWord.equals(expectedWord)) {
return;
}
}