Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit fa21ec75 authored by Shan Huang's avatar Shan Huang Committed by Automerger Merge Worker
Browse files

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

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



Change-Id: I1366d03a794ead35ba2a5aa3134306b4e0062399
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 187dbf52 a2c8daf7

core/java/android/window/WindowOnBackInvokedDispatcher.java

+2 −1
Original line number Diff line number Diff line
@@ -325,7 +325,8 @@ public class WindowOnBackInvokedDispatcher implements OnBackInvokedDispatcher { 
        public boolean checkApplicationCallbackRegistration(int priority,

                OnBackInvokedCallback callback) {

            if (!mApplicationCallBackEnabled

                    && !(callback instanceof CompatOnBackInvokedCallback)) {

                    && !(callback instanceof CompatOnBackInvokedCallback)

                    && !ALWAYS_ENFORCE_PREDICTIVE_BACK) {

                Log.w("OnBackInvokedCallback",

                        "OnBackInvokedCallback is not enabled for the application."

                                + "\nSet 'android:enableOnBackInvokedCallback=\"true\"' in the"