commit 68823ae08e820f0951447ed12c1bd32a24333d2e
author Jean Chalard <jchalard@google.com> Fri Mar 09 22:01:15 2012 +0900
committer Jean Chalard <jchalard@google.com> Fri Mar 09 22:01:15 2012 +0900
tree 1b6fdb43a3f80d4867be018aaccab8583e9f4b15
parent ebbb7e9665b2f9bce46ddc2daa82b9ef73f6c712

Make the safety net memory private

Change-Id: I10959d47c980d2e8f2ea995955acf02193e3ff7b

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

diff --git a/java/src/com/android/inputmethod/latin/LatinIME.java b/java/src/com/android/inputmethod/latin/LatinIME.java
index c7a0f49..917adb2 100644
--- a/java/src/com/android/inputmethod/latin/LatinIME.java
+++ b/java/src/com/android/inputmethod/latin/LatinIME.java
@@ -1845,8 +1845,7 @@
     public void showSuggestions(final SuggestedWords suggestedWords, final CharSequence typedWord) {
         final CharSequence autoCorrection;
         if (suggestedWords.size() > 0) {
-            if (!suggestedWords.mShouldBlockAutoCorrectionBySafetyNet
-                    && suggestedWords.hasAutoCorrectionWord()) {
+            if (suggestedWords.hasAutoCorrectionWord()) {
                 autoCorrection = suggestedWords.getWord(1);
             } else {
                 autoCorrection = typedWord;

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

diff --git a/java/src/com/android/inputmethod/latin/SuggestedWords.java b/java/src/com/android/inputmethod/latin/SuggestedWords.java
index 2018bca..059d684 100644
--- a/java/src/com/android/inputmethod/latin/SuggestedWords.java
+++ b/java/src/com/android/inputmethod/latin/SuggestedWords.java
@@ -33,7 +33,7 @@
     public final boolean mTypedWordValid;
     public final boolean mHasAutoCorrectionCandidate;
     public final boolean mIsPunctuationSuggestions;
-    public final boolean mShouldBlockAutoCorrectionBySafetyNet;
+    private final boolean mShouldBlockAutoCorrectionBySafetyNet;
     private final List<SuggestedWordInfo> mSuggestedWordInfoList;
 
     SuggestedWords(List<CharSequence> words, boolean typedWordValid,
@@ -65,7 +65,8 @@
     }
 
     public boolean hasAutoCorrectionWord() {
-        return mHasAutoCorrectionCandidate && size() > 1 && !mTypedWordValid;
+        return !mShouldBlockAutoCorrectionBySafetyNet
+                && mHasAutoCorrectionCandidate && size() > 1 && !mTypedWordValid;
     }
 
     public boolean willAutoCorrect() {