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

Commit 1db208a5 authored by Shan Huang's avatar Shan Huang Committed by Automerger Merge Worker
Browse files

Merge "Fix IME callback not unregistered when IME is up during an IMM client... 

Merge "Fix IME callback not unregistered when IME is up during an IMM client switch." into tm-dev am: 43572500 am: de9e6dd5 am: 51e7c953

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18699773



Change-Id: I915277abe818ef21349a660d1da93fd06f563131
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 800c23ab 51e7c953

core/java/android/inputmethodservice/InputMethodService.java

+14 −5
Original line number Diff line number Diff line
@@ -806,11 +806,6 @@ public class InputMethodService extends AbstractInputMethodService { 
                @NonNull EditorInfo editorInfo, boolean restarting,

                @NonNull IBinder startInputToken, @InputMethodNavButtonFlags int navButtonFlags,

                @NonNull ImeOnBackInvokedDispatcher imeDispatcher) {

            mImeDispatcher = imeDispatcher;

            if (mWindow != null) {

                mWindow.getOnBackInvokedDispatcher().setImeOnBackInvokedDispatcher(

                        imeDispatcher);

            }

            mPrivOps.reportStartInputAsync(startInputToken);

            mNavigationBarController.onNavButtonFlagsChanged(navButtonFlags);

            if (restarting) {
@@ -818,6 +813,15 @@ public class InputMethodService extends AbstractInputMethodService { 
            } else {

                startInput(inputConnection, editorInfo);

            }

            // Update the IME dispatcher last, so that the previously registered back callback

            // (if any) can be unregistered using the old dispatcher if {@link #doFinishInput()}

            // is called from {@link #startInput(InputConnection, EditorInfo)} or

            // {@link #restartInput(InputConnection, EditorInfo)}.

            mImeDispatcher = imeDispatcher;

            if (mWindow != null) {

                mWindow.getOnBackInvokedDispatcher().setImeOnBackInvokedDispatcher(

                        imeDispatcher);

            }

        }



        /**
@@ -3860,6 +3864,11 @@ public class InputMethodService extends AbstractInputMethodService { 
    };



    private void compatHandleBack() {

        if (!mDecorViewVisible) {

            Log.e(TAG, "Back callback invoked on a hidden IME. Removing the callback...");

            unregisterCompatOnBackInvokedCallback();

            return;

        }

        final KeyEvent downEvent = createBackKeyEvent(

                KeyEvent.ACTION_DOWN, false /* isTracking */);

        onKeyDown(KeyEvent.KEYCODE_BACK, downEvent);