diff options
| author |   Kurt Partridge <kep@google.com> | 2013-05-15 10:36:37 -0700 |
|---|---|---|
| committer |   Android Git Automerger <android-git-automerger@android.com> | 2013-05-15 10:36:37 -0700 |
| commit | 86b2c57c47717eb4732a2dea8385bb9aea9d1047 (patch) | |
| tree | 1d9ef5d63a5da93c796aa16b123a63a4a14711cc /java/src | |
| parent | 79cd791b7257251fca60fe9f2bd03839fd17311d (diff) | |
| parent | f5864fbb7a8703cb44a6e7bd77d7031ee271db12 (diff) | |
| download | latinime-86b2c57c47717eb4732a2dea8385bb9aea9d1047.tar.gz latinime-86b2c57c47717eb4732a2dea8385bb9aea9d1047.tar.xz latinime-86b2c57c47717eb4732a2dea8385bb9aea9d1047.zip | |
am f5864fbb: am a5bfac5b: Merge "Fix NPE"
* commit 'f5864fbb7a8703cb44a6e7bd77d7031ee271db12':
Fix NPE
Diffstat (limited to 'java/src')
| -rw-r--r-- | java/src/com/android/inputmethod/research/ResearchLogger.java | 2 |
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; } } |