Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 5e4e05af authored by Tadashi G. Takaoka's avatar Tadashi G. Takaoka
Browse files

Fix NPE 

Bug: 4686479
Change-Id: I0b8a32d0f9bcebe55eebecd38dc5e69198e94378
parent c029e0f4

java/src/com/android/inputmethod/keyboard/KeyboardSwitcher.java

+8 −4
Original line number Diff line number Diff line
@@ -782,11 +782,15 @@ public class KeyboardSwitcher implements SharedPreferences.OnSharedPreferenceCha 
    }



    public void onAutoCorrectionStateChanged(boolean isAutoCorrection) {

        if (isAutoCorrection != mIsAutoCorrectionActive) {

            LatinKeyboardView keyboardView = getKeyboardView();

        if (mIsAutoCorrectionActive != isAutoCorrection) {

            mIsAutoCorrectionActive = isAutoCorrection;

            keyboardView.invalidateKey(((LatinKeyboard) keyboardView.getKeyboard())

                    .onAutoCorrectionStateChanged(isAutoCorrection));

            final LatinKeyboard keyboard = getLatinKeyboard();

            if (keyboard != null && keyboard.needsAutoCorrectionSpacebarLed()) {

                final Key invalidatedKey = keyboard.onAutoCorrectionStateChanged(isAutoCorrection);

                final LatinKeyboardView keyboardView = getKeyboardView();

                if (keyboardView != null)

                    keyboardView.invalidateKey(invalidatedKey);

            }

        }

    }

java/src/com/android/inputmethod/latin/LatinIME.java

+2 −8
Original line number Diff line number Diff line
@@ -1459,18 +1459,12 @@ public class LatinIME extends InputMethodServiceCompatWrapper implements Keyboar 
    }



    public void setSuggestions(SuggestedWords words) {

//        if (mVoiceProxy.getAndResetIsShowingHint()) {

//             setCandidatesView(mCandidateViewContainer);

//        }



        if (mCandidateView != null) {

            mCandidateView.setSuggestions(words);

            if (mKeyboardSwitcher.getLatinKeyboard().needsAutoCorrectionSpacebarLed()) {

            mKeyboardSwitcher.onAutoCorrectionStateChanged(

                    words.hasWordAboveAutoCorrectionScoreThreshold());

        }

    }

    }



    public void updateSuggestions() {

        // Check if we have a suggestion engine attached.