commit ad56a9ac51a4dfb330b6a5f7ade78bd426b6716e
author Jean Chalard <jchalard@google.com> Fri Sep 02 15:35:23 2011 +0900
committer Jean Chalard <jchalard@google.com> Fri Sep 02 15:35:23 2011 +0900
tree 4c132147156d61fe0755e1ffb3e90281a1d22401
parent 2e58804a98e92aa134ed748d2de12ff885f27e14

Fix an NPE in settings

Change-Id: I264c001a9cc28f864ad024fcf51fb42e9c203d3f

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 1e2ef48..db8ca34 100644
--- a/java/src/com/android/inputmethod/latin/Settings.java
+++ b/java/src/com/android/inputmethod/latin/Settings.java
@@ -426,8 +426,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(