aboutsummaryrefslogtreecommitdiffstats
path: root/java/src/com/android/inputmethod/latin
diff options
context:
space:
mode:
authorJean Chalard <jchalard@google.com>2014-11-20 13:50:27 +0900
committerJean Chalard <jchalard@google.com>2014-11-20 13:50:27 +0900
commit0e00f5fe3a00ca13ebf6b59cd04f58b11429fa88 (patch)
tree0df7e4d35636fcfb0c7f8a17493c4577330dad31 /java/src/com/android/inputmethod/latin
parent7cca01aa1d5aa1c8b8f10117fd2d83a49c82bea5 (diff)
downloadlatinime-0e00f5fe3a00ca13ebf6b59cd04f58b11429fa88.tar.gz
latinime-0e00f5fe3a00ca13ebf6b59cd04f58b11429fa88.tar.xz
latinime-0e00f5fe3a00ca13ebf6b59cd04f58b11429fa88.zip
Fix a NPE
Bug: 18451316 Change-Id: Ia20bf388471f84c963354df050182e722d966a02
Diffstat (limited to 'java/src/com/android/inputmethod/latin')
-rw-r--r--java/src/com/android/inputmethod/latin/DictionaryFacilitator.java6
1 files changed, 6 insertions, 0 deletions
diff --git a/java/src/com/android/inputmethod/latin/DictionaryFacilitator.java b/java/src/com/android/inputmethod/latin/DictionaryFacilitator.java
index d23639a0d..b24fdea55 100644
--- a/java/src/com/android/inputmethod/latin/DictionaryFacilitator.java
+++ b/java/src/com/android/inputmethod/latin/DictionaryFacilitator.java
@@ -266,6 +266,12 @@ public class DictionaryFacilitator {
}
final DictionaryGroup newMostProbableDictionaryGroup =
findDictionaryGroupWithLocale(mDictionaryGroups, locale);
+ if (null == newMostProbableDictionaryGroup) {
+ // It seems this may happen as a race condition; pressing the globe key and space
+ // in quick succession could commit a word out of a dictionary that's not in the
+ // facilitator any more. In this case, just not changing things is fine.
+ return;
+ }
mMostProbableDictionaryGroup.mWeightForTypingInLocale =
DictionaryGroup.WEIGHT_FOR_TYPING_IN_NOT_MOST_PROBABLE_LANGUAGE;
mMostProbableDictionaryGroup.mWeightForGesturingInLocale =