From e5f99e636051be0a4d2a83e8d2fb0bed2b60b777 Mon Sep 17 00:00:00 2001
From: Shan Huang <shanh@google.com>
Date: Tue, 1 Mar 2022 02:44:55 +0000
Subject: [PATCH] Fix a problem that Dialog does not close in new dispatch.

We can treat Dialog as a standard widget that handles back.
Its dedicated back nav type is not in use and can eventually be removed.

Test: try dismiss dialog in BackTest app.

Change-Id: If89856ccfac8b1fd968aa674628476de02fbf489
(cherry picked from commit 6cb6399008712cf6d4e26de47fc54200cc2d6371)
---
 core/java/android/app/Dialog.java | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/core/java/android/app/Dialog.java b/core/java/android/app/Dialog.java
index 82ff42b417994..170853020811a 100644
--- a/core/java/android/app/Dialog.java
+++ b/core/java/android/app/Dialog.java
@@ -465,7 +465,8 @@ public class Dialog implements DialogInterface, Window.Callback,
                     onBackPressed();
                 }
             };
-            getOnBackInvokedDispatcher().registerSystemOnBackInvokedCallback(mDefaultBackCallback);
+            getOnBackInvokedDispatcher().registerOnBackInvokedCallback(
+                    mDefaultBackCallback, OnBackInvokedDispatcher.PRIORITY_DEFAULT);
             mDefaultBackCallback = null;
         }
     }