From be0808498c3fc09ecf52eaddcb3dae88c2aa562a Mon Sep 17 00:00:00 2001
From: Shan Huang <shanh@google.com>
Date: Thu, 1 Dec 2022 23:50:43 +0000
Subject: [PATCH] Fix Dialog default callback registering at the wrong
 priority.

Bug:259602785
Test: In a standalone app, register a callback in Dialog#onCreate() with default priority. Make sure the dialog callback can be invoked.
Test: BackNavigationTests#registerCallback_dialog (run on master)

Change-Id: I9cfd596611fb341389cda44e3605c1e99ddc3791
---
 core/java/android/app/Dialog.java | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/core/java/android/app/Dialog.java b/core/java/android/app/Dialog.java
index de0f7522f36d6..411d157fa9278 100644
--- a/core/java/android/app/Dialog.java
+++ b/core/java/android/app/Dialog.java
@@ -458,8 +458,7 @@ public class Dialog implements DialogInterface, Window.Callback,
                 && WindowOnBackInvokedDispatcher.isOnBackInvokedCallbackEnabled(mContext)) {
             // Add onBackPressed as default back behavior.
             mDefaultBackCallback = this::onBackPressed;
-            getOnBackInvokedDispatcher().registerOnBackInvokedCallback(
-                    OnBackInvokedDispatcher.PRIORITY_DEFAULT, mDefaultBackCallback);
+            getOnBackInvokedDispatcher().registerSystemOnBackInvokedCallback(mDefaultBackCallback);
             mDefaultBackCallback = null;
         }
     }