From ca819178a1211219297a2bdaef7c024375b8c7ea Mon Sep 17 00:00:00 2001 From: Jean Chalard Date: Fri, 24 Jan 2014 20:45:58 +0900 Subject: [PATCH] [IL88] Simple refactoring With this, the value passed to suggestedWords is never null. Bug: 8636060 Change-Id: I433dd7e7290125e217e05cc20bee7a4b58fe083f --- .../android/inputmethod/accessibility/AccessibilityUtils.java | 2 +- java/src/com/android/inputmethod/latin/LatinIME.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/java/src/com/android/inputmethod/accessibility/AccessibilityUtils.java b/java/src/com/android/inputmethod/accessibility/AccessibilityUtils.java index 10fb9fef4..216a825e0 100644 --- a/java/src/com/android/inputmethod/accessibility/AccessibilityUtils.java +++ b/java/src/com/android/inputmethod/accessibility/AccessibilityUtils.java @@ -158,7 +158,7 @@ public final class AccessibilityUtils { * @param typedWord the currently typed word */ public void setAutoCorrection(final SuggestedWords suggestedWords, final String typedWord) { - if (suggestedWords != null && suggestedWords.mWillAutoCorrect) { + if (suggestedWords.mWillAutoCorrect) { mAutoCorrectionWord = suggestedWords.getWord(SuggestedWords.INDEX_OF_AUTO_CORRECTION); mTypedWord = typedWord; } else { diff --git a/java/src/com/android/inputmethod/latin/LatinIME.java b/java/src/com/android/inputmethod/latin/LatinIME.java index 4520283c0..ea3940e75 100644 --- a/java/src/com/android/inputmethod/latin/LatinIME.java +++ b/java/src/com/android/inputmethod/latin/LatinIME.java @@ -1434,7 +1434,7 @@ public class LatinIME extends InputMethodService implements KeyboardActionListen final String typedWord) { if (suggestedWords.isEmpty()) { // No auto-correction is available, clear the cached values. - AccessibilityUtils.getInstance().setAutoCorrection(null, null); + AccessibilityUtils.getInstance().setAutoCorrection(SuggestedWords.EMPTY, typedWord); clearSuggestionStrip(); return; }