From b01cdb975a0001a5d4bdc66e6ae451f2deab439d Mon Sep 17 00:00:00 2001
From: Jean Chalard <jchalard@google.com>
Date: Thu, 28 Jun 2012 16:58:54 +0900
Subject: Inline a method (A17)

This will allow us to remove unnecessary processing

Change-Id: I251dfdaffb077906186686ebe65fd82e1e360bd2
---
 java/src/com/android/inputmethod/latin/AutoCorrection.java | 7 -------
 java/src/com/android/inputmethod/latin/Suggest.java        | 3 ++-
 2 files changed, 2 insertions(+), 8 deletions(-)

(limited to 'java/src')

diff --git a/java/src/com/android/inputmethod/latin/AutoCorrection.java b/java/src/com/android/inputmethod/latin/AutoCorrection.java
index e3e7cc21c..0d90b1cbc 100644
--- a/java/src/com/android/inputmethod/latin/AutoCorrection.java
+++ b/java/src/com/android/inputmethod/latin/AutoCorrection.java
@@ -88,13 +88,6 @@ public class AutoCorrection {
         return !isValidWord(dictionaries, word, ignoreCase);
     }
 
-    public static boolean shouldAutoCorrectToSelf(
-            final ConcurrentHashMap<String, Dictionary> dictionaries,
-            final CharSequence consideredWord) {
-        return (!TextUtils.isEmpty(consideredWord) && !allowsToBeAutoCorrected(dictionaries,
-                consideredWord, false));
-    }
-
     public static boolean hasAutoCorrectionForBinaryDictionary(SuggestedWordInfo suggestion,
             CharSequence consideredWord, float autoCorrectionThreshold) {
         if (null != suggestion) {
diff --git a/java/src/com/android/inputmethod/latin/Suggest.java b/java/src/com/android/inputmethod/latin/Suggest.java
index ed009375e..aa85d895f 100644
--- a/java/src/com/android/inputmethod/latin/Suggest.java
+++ b/java/src/com/android/inputmethod/latin/Suggest.java
@@ -233,7 +233,8 @@ public class Suggest {
             final CharSequence autoCorrection;
             if (null != whitelistedWord) {
                 autoCorrection = whitelistedWord;
-            } else if (AutoCorrection.shouldAutoCorrectToSelf(mDictionaries, consideredWord)) {
+            } else if (!TextUtils.isEmpty(consideredWord) &&
+                    !AutoCorrection.allowsToBeAutoCorrected(mDictionaries, consideredWord, false)) {
                 autoCorrection = consideredWord;
             } else if (AutoCorrection.hasAutoCorrectionForBinaryDictionary(bestSuggestion,
                             consideredWord, mAutoCorrectionThreshold)) {
-- 
cgit v1.2.3-83-g751a