diff options
| author | Shan Huang <shanh@google.com> | 2022-08-09 22:34:23 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2022-08-09 22:34:23 +0000 |
| commit | a2c8daf7d16701de9172b8b43f8a57acddc2579b (patch) | |
| tree | 6e5f785cf4ffe21ed2ac7c4dc84e4ff098a724fd /core/java/android | |
| parent | 5685efd6d68efb88669d0cb934a56ccc68de3855 (diff) | |
| parent | d6c5d36d1c41c2849cf8f37b40d6f3b93805abcd (diff) | |
Merge "Respect the enforce flag for callback registration." into tm-qpr-dev
Diffstat (limited to 'core/java/android')
| -rw-r--r-- | core/java/android/window/WindowOnBackInvokedDispatcher.java | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/core/java/android/window/WindowOnBackInvokedDispatcher.java b/core/java/android/window/WindowOnBackInvokedDispatcher.java index 1d396be6b478..0730f3ddf8ac 100644 --- a/core/java/android/window/WindowOnBackInvokedDispatcher.java +++ b/core/java/android/window/WindowOnBackInvokedDispatcher.java @@ -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" |