Merge "Fix Dialog default callback registering at the wrong priority." into tm-qpr-dev

This commit is contained in:
TreeHugger Robot
2022-12-10 18:02:13 +00:00
committed by Android (Google) Code Review

View File

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