aboutsummaryrefslogtreecommitdiffstats
path: root/java/src
diff options
context:
space:
mode:
authorJean Chalard <jchalard@google.com>2011-08-31 03:06:37 -0700
committerAndroid (Google) Code Review <android-gerrit@google.com>2011-08-31 03:06:37 -0700
commit0fd213521905b4d9e16a792259d2c5decfdb15cb (patch)
tree15afdbdf514c27a1ed14e0d484f6e6569083d650 /java/src
parente5c705f1642cc9b34d6b43602465d836a293546a (diff)
parenta770d650b5b6efc37945f8fafb4fee26d2aec466 (diff)
downloadlatinime-0fd213521905b4d9e16a792259d2c5decfdb15cb.tar.gz
latinime-0fd213521905b4d9e16a792259d2c5decfdb15cb.tar.xz
latinime-0fd213521905b4d9e16a792259d2c5decfdb15cb.zip
Merge "Fix a possible NPE"
Diffstat (limited to 'java/src')
-rw-r--r--java/src/com/android/inputmethod/latin/Settings.java4
1 files changed, 3 insertions, 1 deletions
diff --git a/java/src/com/android/inputmethod/latin/Settings.java b/java/src/com/android/inputmethod/latin/Settings.java
index b79c441d7..1e2ef4824 100644
--- a/java/src/com/android/inputmethod/latin/Settings.java
+++ b/java/src/com/android/inputmethod/latin/Settings.java
@@ -336,7 +336,9 @@ public class Settings extends InputMethodSettingsActivity
R.string.auto_correction_threshold_mode_index_off);
final String currentSetting = mAutoCorrectionThresholdPreference.getValue();
mBigramSuggestion.setEnabled(!currentSetting.equals(autoCorrectionOff));
- mBigramPrediction.setEnabled(!currentSetting.equals(autoCorrectionOff));
+ if (null != mBigramPrediction) {
+ mBigramPrediction.setEnabled(!currentSetting.equals(autoCorrectionOff));
+ }
}
public Activity getActivityInternal() {