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

Commit a2c8daf7 authored by Shan Huang's avatar Shan Huang Committed by Android (Google) Code Review
Browse files

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

parents 5685efd6 d6c5d36d

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"