Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Respect the enforce flag for callback registration." into tm-qpr-dev am: a2c8daf7d1

Browse Source 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19563307

Change-Id: I1366d03a794ead35ba2a5aa3134306b4e0062399
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Shan Huang
2022-08-09 22:55:14 +00:00
committed by Automerger Merge Worker
parent 187dbf52b1 a2c8daf7d1
commit fa21ec758e
1 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
core/java/android/window/WindowOnBackInvokedDispatcher.java
View File

@@ -325,7 +325,8 @@ public class WindowOnBackInvokedDispatcher implements OnBackInvokedDispatcher {
public boolean checkApplicationCallbackRegistration(int priority, public boolean checkApplicationCallbackRegistration(int priority,
OnBackInvokedCallback callback) { OnBackInvokedCallback callback) {
if (!mApplicationCallBackEnabled if (!mApplicationCallBackEnabled
&& !(callback instanceof CompatOnBackInvokedCallback)) { && !(callback instanceof CompatOnBackInvokedCallback)
&& !ALWAYS_ENFORCE_PREDICTIVE_BACK) {
Log.w("OnBackInvokedCallback", Log.w("OnBackInvokedCallback",
"OnBackInvokedCallback is not enabled for the application." "OnBackInvokedCallback is not enabled for the application."
+ "\nSet 'android:enableOnBackInvokedCallback=\"true\"' in the" + "\nSet 'android:enableOnBackInvokedCallback=\"true\"' in the"