Merge "Fix NPE"

2013-04-17 20:33:25 +00:00 · 2013-04-17 20:33:25 +00:00 · a5bfac5bec
parent 7da87f97b0 4ac28ded28
commit a5bfac5bec
1 changed files with 1 additions and 1 deletions
--- 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;
            }
        }