From 10dff76856a98b6eec86a53d3d07fdc9708037b7 Mon Sep 17 00:00:00 2001 From: "Tadashi G. Takaoka" Date: Thu, 17 Nov 2011 21:45:49 -0800 Subject: [PATCH] Fix NPE introduced by I38b21d49 Bug: 5560766 Change-Id: Ic5eaebe0ef893c69ad90a777ebfa07807535a0e3 --- .../android/inputmethod/latin/LatinIME.java | 19 +++++++++++-------- 1 file changed, 11 insertions(+), 8 deletions(-) diff --git a/java/src/com/android/inputmethod/latin/LatinIME.java b/java/src/com/android/inputmethod/latin/LatinIME.java index dbd850561..7c27fe957 100644 --- a/java/src/com/android/inputmethod/latin/LatinIME.java +++ b/java/src/com/android/inputmethod/latin/LatinIME.java @@ -245,18 +245,20 @@ public class LatinIME extends InputMethodServiceCompatWrapper implements Keyboar private static final int MSG_SET_BIGRAM_PREDICTIONS = 7; private static final int MSG_PENDING_IMS_CALLBACK = 8; - private final int mDelayBeforeFadeoutLanguageOnSpacebar; - private final int mDelayUpdateSuggestions; - private final int mDelayUpdateShiftState; - private final int mDurationOfFadeoutLanguageOnSpacebar; - private final float mFinalFadeoutFactorOfLanguageOnSpacebar; - private final long mDoubleSpacesTurnIntoPeriodTimeout; - private final long mIgnoreSpecialKeyTimeout; + private int mDelayBeforeFadeoutLanguageOnSpacebar; + private int mDelayUpdateSuggestions; + private int mDelayUpdateShiftState; + private int mDurationOfFadeoutLanguageOnSpacebar; + private float mFinalFadeoutFactorOfLanguageOnSpacebar; + private long mDoubleSpacesTurnIntoPeriodTimeout; + private long mIgnoreSpecialKeyTimeout; public UIHandler(LatinIME outerInstance) { super(outerInstance); + } - final Resources res = outerInstance.getResources(); + public void onCreate() { + final Resources res = getOuterInstance().getResources(); mDelayBeforeFadeoutLanguageOnSpacebar = res.getInteger( R.integer.config_delay_before_fadeout_language_on_spacebar); mDelayUpdateSuggestions = @@ -497,6 +499,7 @@ public class LatinIME extends InputMethodServiceCompatWrapper implements Keyboar mSubtypeSwitcher = SubtypeSwitcher.getInstance(); mKeyboardSwitcher = KeyboardSwitcher.getInstance(); mVibrator = VibratorCompatWrapper.getInstance(this); + mHandler.onCreate(); DEBUG = LatinImeLogger.sDBG; final Resources res = getResources();