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

Commit 9f7fdc0d authored by Wei Sheng Shih's avatar Wei Sheng Shih Committed by Android (Google) Code Review
Browse files

Merge "Fix IME crash when leave VR mode."

parents 474dffd2 767d1e5a

services/core/java/com/android/server/inputmethod/InputMethodManagerService.java

+3 −4
Original line number Diff line number Diff line
@@ -390,12 +390,11 @@ public class InputMethodManagerService extends IInputMethodManager.Stub 
    };



    private void restoreNonVrImeFromSettingsNoCheck() {

        mIsVrImeStarted = false;

        // switch back to non-VR InputMethod from settings.

        synchronized (mMethodMap) {

            final String lastInputId = mSettings.getSelectedInputMethod();

            setInputMethodLocked(lastInputId,

                    mSettings.getSelectedInputMethodSubtypeId(lastInputId));

            if (!mIsVrImeStarted) return;

            mIsVrImeStarted = false;

            updateFromSettingsLocked(false);

        }

    }