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

Commit 8ec05512 authored by Shan Huang's avatar Shan Huang
Browse files

Allow IME to register callbacks with negative priorities. 

It's perfectly valid to register system callbacks (which have negative
priority) from the IME process from framework code, once it is opted in.

We should still reject negative priority for registration through public APIs though. Will follow up separately in b/262930093.

Test: atest android.view.inputmethod.cts.KeyboardVisibilityControlTest#testHideImeAfterBackPressed_legacyAppMigratedIme
Fixes: 262727745
Change-Id: Ie13c738d0d4a10f4265fbf116ff7b4206d3bfc62
parent aab31806

core/java/android/window/ImeOnBackInvokedDispatcher.java

+3 −3
Original line number Diff line number Diff line
@@ -123,7 +123,7 @@ public class ImeOnBackInvokedDispatcher implements OnBackInvokedDispatcher, Parc 


    private void receive(

            int resultCode, Bundle resultData,

            @NonNull OnBackInvokedDispatcher receivingDispatcher) {

            @NonNull WindowOnBackInvokedDispatcher receivingDispatcher) {

        final int callbackId = resultData.getInt(RESULT_KEY_ID);

        if (resultCode == RESULT_CODE_REGISTER) {

            int priority = resultData.getInt(RESULT_KEY_PRIORITY);
@@ -140,11 +140,11 @@ public class ImeOnBackInvokedDispatcher implements OnBackInvokedDispatcher, Parc 
            @NonNull IOnBackInvokedCallback iCallback,

            @OnBackInvokedDispatcher.Priority int priority,

            int callbackId,

            @NonNull OnBackInvokedDispatcher receivingDispatcher) {

            @NonNull WindowOnBackInvokedDispatcher receivingDispatcher) {

        final ImeOnBackInvokedCallback imeCallback =

                new ImeOnBackInvokedCallback(iCallback, callbackId, priority);

        mImeCallbacks.add(imeCallback);

        receivingDispatcher.registerOnBackInvokedCallback(priority, imeCallback);

        receivingDispatcher.registerOnBackInvokedCallbackUnchecked(imeCallback, priority);

    }



    private void unregisterReceivedCallback(