diff options
| author | 2022-12-22 22:01:04 +0000 | |
|---|---|---|
| committer | 2022-12-22 22:01:04 +0000 | |
| commit | 9f8ba05991c8ffa95a48c6256b5cc63886516cce (patch) | |
| tree | 0fd044de63c4eddbb6a3caca03a91df2cba256ca | |
| parent | 2c85e87d4ca970a98321369e501a4d3f4452eb43 (diff) | |
| parent | 6eda890a0eb85da6c39e2487a204a6cc2da19c5e (diff) | |
Merge "Allow IME to register callbacks with negative priorities." into tm-qpr-dev am: 77bef7e1d5 am: 6eda890a0e
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/20766528
Change-Id: Ic63fcdd5f3f84fb2d21b47abd72b02c3a66bef39
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
| -rw-r--r-- | core/java/android/window/ImeOnBackInvokedDispatcher.java | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/core/java/android/window/ImeOnBackInvokedDispatcher.java b/core/java/android/window/ImeOnBackInvokedDispatcher.java index f74d29486909..be9cbfff5db2 100644 --- a/core/java/android/window/ImeOnBackInvokedDispatcher.java +++ b/core/java/android/window/ImeOnBackInvokedDispatcher.java @@ -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( |