Fix Dialog default callback registering at the wrong priority.

Bug:259602785
Test: In a standalone app, register a callback in Dialog#onCreate() with default priority. Make sure the dialog callback can be invoked.
Test: BackNavigationTests#registerCallback_dialog (run on master)

Change-Id: I9cfd596611fb341389cda44e3605c1e99ddc3791
This commit is contained in:
Shan Huang
2022-12-01 23:50:43 +00:00
parent b73cda834c
commit be0808498c

View File

@@ -458,8 +458,7 @@ public class Dialog implements DialogInterface, Window.Callback,
&& WindowOnBackInvokedDispatcher.isOnBackInvokedCallbackEnabled(mContext)) {
// Add onBackPressed as default back behavior.
mDefaultBackCallback = this::onBackPressed;
getOnBackInvokedDispatcher().registerOnBackInvokedCallback(
OnBackInvokedDispatcher.PRIORITY_DEFAULT, mDefaultBackCallback);
getOnBackInvokedDispatcher().registerSystemOnBackInvokedCallback(mDefaultBackCallback);
mDefaultBackCallback = null;
}
}