commit 5bb7a64fe255ce12badf94e9236a7a8d26ef3488
author Jean Chalard <jchalard@google.com> Thu Sep 01 23:42:43 2011 -0700
committer Android (Google) Code Review <android-gerrit@google.com> Thu Sep 01 23:42:43 2011 -0700
tree 74f35b4daed89b6674265f9c1cee6a958d9ed82c
parent 66a5884ad8df544f1c462148e763b29c7202f7b8
parent ad56a9ac51a4dfb330b6a5f7ade78bd426b6716e

Merge "Fix an NPE in settings"

java/src/com/android/inputmethod/latin/Settings.java

diff --git a/java/src/com/android/inputmethod/latin/Settings.java b/java/src/com/android/inputmethod/latin/Settings.java
index c42f056..e99bb70 100644
--- a/java/src/com/android/inputmethod/latin/Settings.java
+++ b/java/src/com/android/inputmethod/latin/Settings.java
@@ -431,8 +431,10 @@
         final boolean showBigramSuggestionsOption = res.getBoolean(
                 R.bool.config_enable_bigram_suggestions_option);
         if (!showBigramSuggestionsOption) {
-            textCorrectionGroup.removePreference(findPreference(PREF_BIGRAM_SUGGESTIONS));
-            textCorrectionGroup.removePreference(findPreference(PREF_BIGRAM_PREDICTIONS));
+            textCorrectionGroup.removePreference(mBigramSuggestion);
+            if (null != mBigramPrediction) {
+                textCorrectionGroup.removePreference(mBigramPrediction);
+            }
         }
 
         final boolean showUsabilityModeStudyOption = res.getBoolean(