commit e2777d9a419f33435df6473075b92dae0217b3e1
author SongFerng Wang <songferngwang@google.com> Tue Jun 13 04:22:57 2023 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Tue Jun 13 04:22:57 2023 +0000
tree c22e91974b60a3b6506fa9205fccb3817f3244d4
parent 705e962f67752759987b1cf72c82f6d6402bc616
parent b2b558b061391fcf89c6ddffd825695698e11935

Merge "Fix the blocking test case issue" into udc-dev am: b2b558b061

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

Change-Id: I0dee6159981fb52578bc59c1feac98118476aabc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

packages/SystemUI/tests/src/com/android/systemui/media/dialog/MediaOutputBroadcastDialogTest.java

diff --git a/packages/SystemUI/tests/src/com/android/systemui/media/dialog/MediaOutputBroadcastDialogTest.java b/packages/SystemUI/tests/src/com/android/systemui/media/dialog/MediaOutputBroadcastDialogTest.java
index 9dba9b5..f8971fd 100644
--- a/packages/SystemUI/tests/src/com/android/systemui/media/dialog/MediaOutputBroadcastDialogTest.java
+++ b/packages/SystemUI/tests/src/com/android/systemui/media/dialog/MediaOutputBroadcastDialogTest.java
@@ -136,7 +136,10 @@
 
     @After
     public void tearDown() {
-        mMediaOutputBroadcastDialog.dismissDialog();
+        if (mMediaOutputBroadcastDialog.mAlertDialog != null){
+            mMediaOutputBroadcastDialog.mAlertDialog.dismiss();
+        }
+        mMediaOutputBroadcastDialog.dismiss();
     }
 
     @Test