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

Commit c0a9c70f authored by Johannes Gallmann's avatar Johannes Gallmann
Browse files

Minor cleanup in WindowOnBackInvokedDispatcher 

Bug: 356917121
Test: Manual, i.e. verifying no regression for onKeyPreIme interception on local device
Flag: EXEMPT minor cleanup
Change-Id: Ib0033d81029beabfb12263f9922d8c3c48f406ca
parent 23912db0

core/java/android/window/WindowOnBackInvokedDispatcher.java

+2 −2
Original line number Diff line number Diff line
@@ -306,7 +306,7 @@ public class WindowOnBackInvokedDispatcher implements OnBackInvokedDispatcher { 
    }



    private boolean callOnKeyPreIme() {

        if (mViewRoot != null && !isOnBackInvokedCallbackEnabled(mViewRoot.mContext)) {

        if (mViewRoot != null && !isOnBackInvokedCallbackEnabled()) {

            return mViewRoot.injectBackKeyEvents(/*preImeOnly*/ true);

        } else {

            return false;
@@ -505,7 +505,7 @@ public class WindowOnBackInvokedDispatcher implements OnBackInvokedDispatcher { 
            if (callback instanceof ImeBackAnimationController

                    || callback instanceof ImeOnBackInvokedDispatcher.ImeOnBackInvokedCallback) {

                // call onKeyPreIme API if the current callback is an IME callback and the app has

                // not set enableOnBackInvokedCallback="false"

                // not set enableOnBackInvokedCallback="true"

                try {

                    boolean consumed = mOnKeyPreIme.getAsBoolean();

                    if (consumed) {