Merge "Fix Dialog default callback registering at the wrong priority." into tm-qpr-dev am: 0143f62f7a
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/20612965 Change-Id: I2df20d29c4fd24dffff21650c1016c0047b89ccc Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
@@ -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;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user