Remove a useless parameter

Change-Id: I03005240238fb004c20b2df0d836796e2e8b307f

4 files changed, 11 insertions, 18 deletions

diff --git a/java/src/com/android/inputmethod/latin/LatinIME.java b/java/src/com/android/inputmethod/latin/LatinIME.java
index 6570f7a2f..9f5931de9 100644
--- a/java/src/com/android/inputmethod/latin/LatinIME.java
+++ b/java/src/com/android/inputmethod/latin/LatinIME.java
@@ -931,8 +931,7 @@ public class LatinIME extends InputMethodServiceCompatWrapper implements Keyboar
                     false /* typedWordValid */,
                     false /* hasAutoCorrectionCandidate */,
                     false /* allowsToBeAutoCorrected */,
-                    false /* isPunctuationSuggestions */,
-                    false /* shouldBlockAutoCorrectionBySafetyNet */);
+                    false /* isPunctuationSuggestions */);
             // When in fullscreen mode, show completions generated by the application
             final boolean isAutoCorrection = false;
             setSuggestions(suggestedWords, isAutoCorrection);
@@ -1794,8 +1793,7 @@ public class LatinIME extends InputMethodServiceCompatWrapper implements Keyboar
                             false /* typedWordValid */,
                             false /* hasAutoCorrectionCandidate */,
                             false /* allowsToBeAutoCorrected */,
-                            false /* isPunctuationSuggestions */,
-                            false /* shouldBlockAutoCorrectionBySafetyNet */);
+                            false /* isPunctuationSuggestions */);
             showSuggestions(obsoleteSuggestedWords, typedWord);
         }
     }
diff --git a/java/src/com/android/inputmethod/latin/SettingsValues.java b/java/src/com/android/inputmethod/latin/SettingsValues.java
index d88047c32..d12b9c428 100644
--- a/java/src/com/android/inputmethod/latin/SettingsValues.java
+++ b/java/src/com/android/inputmethod/latin/SettingsValues.java
@@ -187,8 +187,7 @@ public class SettingsValues {
                 false /* typedWordValid */,
                 false /* hasAutoCorrectionCandidate */,
                 false /* allowsToBeAutoCorrected */,
-                true /* isPunctuationSuggestions */,
-                false /* shouldBlockAutoCorrectionBySafetyNet */);
+                true /* isPunctuationSuggestions */);
     }
 
     private static SuggestedWords createSuggestPuncOutputTextList(final String[] puncs) {
@@ -209,8 +208,7 @@ public class SettingsValues {
                 false /* typedWordValid */,
                 false /* hasAutoCorrectionCandidate */,
                 false /* allowsToBeAutoCorrected */,
-                true /* isPunctuationSuggestions */,
-                false /* shouldBlockAutoCorrectionBySafetyNet */);
+                true /* isPunctuationSuggestions */);
     }
 
     private static String createWordSeparators(final String weakSpaceStrippers,
diff --git a/java/src/com/android/inputmethod/latin/Suggest.java b/java/src/com/android/inputmethod/latin/Suggest.java
index 7ac00a34e..b93626caa 100644
--- a/java/src/com/android/inputmethod/latin/Suggest.java
+++ b/java/src/com/android/inputmethod/latin/Suggest.java
@@ -273,8 +273,7 @@ public class Suggest implements Dictionary.WordCallback {
                 false /* typedWordValid */,
                 false /* hasAutoCorrectionCandidate */,
                 false /* allowsToBeAutoCorrected */,
-                false /* isPunctuationSuggestions */,
-                false /* shouldBlockAutoCorrectionBySafetyNet */);
+                false /* isPunctuationSuggestions */);
     }
 
     // TODO: cleanup dictionaries looking up and suggestions building with SuggestedWords.Builder
@@ -446,10 +445,10 @@ public class Suggest implements Dictionary.WordCallback {
         }
         return new SuggestedWords(scoreInfoList,
                 !allowsToBeAutoCorrected /* typedWordValid */,
-                autoCorrectionAvailable /* hasAutoCorrectionCandidate */,
+                autoCorrectionAvailable & !shouldBlockAutoCorrectionBySatefyNet
+                        /* hasAutoCorrectionCandidate */,
                 allowsToBeAutoCorrected /* allowsToBeAutoCorrected */,
-                false /* isPunctuationSuggestions */,
-                shouldBlockAutoCorrectionBySatefyNet);
+                false /* isPunctuationSuggestions */);
     }
 
     @Override
diff --git a/java/src/com/android/inputmethod/latin/SuggestedWords.java b/java/src/com/android/inputmethod/latin/SuggestedWords.java
index 7ce1049d7..201e0f410 100644
--- a/java/src/com/android/inputmethod/latin/SuggestedWords.java
+++ b/java/src/com/android/inputmethod/latin/SuggestedWords.java
@@ -25,7 +25,7 @@ import java.util.List;
 
 public class SuggestedWords {
     public static final SuggestedWords EMPTY = new SuggestedWords(
-            Collections.<SuggestedWordInfo>emptyList(), false, false, false, false, false);
+            Collections.<SuggestedWordInfo>emptyList(), false, false, false, false);
 
     public final boolean mTypedWordValid;
     public final boolean mHasAutoCorrectionCandidate;
@@ -37,12 +37,10 @@ public class SuggestedWords {
             final boolean typedWordValid,
             final boolean hasAutoCorrectionCandidate,
             final boolean allowsToBeAutoCorrected,
-            final boolean isPunctuationSuggestions,
-            final boolean shouldBlockAutoCorrectionBySafetyNet) {
+            final boolean isPunctuationSuggestions) {
         mSuggestedWordInfoList = suggestedWordInfoList;
         mTypedWordValid = typedWordValid;
-        mHasAutoCorrectionCandidate = hasAutoCorrectionCandidate
-                && !shouldBlockAutoCorrectionBySafetyNet;
+        mHasAutoCorrectionCandidate = hasAutoCorrectionCandidate;
         mAllowsToBeAutoCorrected = allowsToBeAutoCorrected;
         mIsPunctuationSuggestions = isPunctuationSuggestions;
     }