From 01e3b014bb97e649ff4cf5a58ce8285f7d800cc8 Mon Sep 17 00:00:00 2001
From: Jean Chalard <jchalard@google.com>
Date: Fri, 8 Jun 2012 21:15:33 +0900
Subject: [PATCH] Accept a null input attributes for reading settings.
Change-Id: I11a8e1aca3541c35d2b39b27716687fcd8ff3dc6
---
java/src/com/android/inputmethod/latin/LatinIME.java | 2 --
java/src/com/android/inputmethod/latin/SettingsValues.java | 2 +-
2 files changed, 1 insertion(+), 3 deletions(-)
diff --git a/java/src/com/android/inputmethod/latin/LatinIME.java b/java/src/com/android/inputmethod/latin/LatinIME.java
index 339c68b55b..5b7d6584e8 100644
--- a/java/src/com/android/inputmethod/latin/LatinIME.java
+++ b/java/src/com/android/inputmethod/latin/LatinIME.java
@@ -400,8 +400,6 @@ public class LatinIME extends InputMethodService implements KeyboardActionListen
final Resources res = getResources();
mResources = res;
- // TODO: remove the following when it's not needed by updateCorrectionMode() any more
- mInputAttributes = new InputAttributes(null, false /* isFullscreenMode */);
loadSettings();
ImfUtils.setAdditionalInputMethodSubtypes(this, mSettingsValues.getAdditionalSubtypes());
diff --git a/java/src/com/android/inputmethod/latin/SettingsValues.java b/java/src/com/android/inputmethod/latin/SettingsValues.java
index 0f522f20f9..fb3c03963c 100644
--- a/java/src/com/android/inputmethod/latin/SettingsValues.java
+++ b/java/src/com/android/inputmethod/latin/SettingsValues.java
@@ -188,7 +188,7 @@ public class SettingsValues {
private int createCorrectionMode(final InputAttributes inputAttributes) {
final boolean shouldAutoCorrect = mAutoCorrectEnabled
- && !inputAttributes.mInputTypeNoAutoCorrect;
+ && (null == inputAttributes || !inputAttributes.mInputTypeNoAutoCorrect);
if (mBigramSuggestionEnabled && shouldAutoCorrect) return Suggest.CORRECTION_FULL_BIGRAM;
return shouldAutoCorrect ? Suggest.CORRECTION_FULL : Suggest.CORRECTION_NONE;
}
--
GitLab