1 files changed, 14 insertions, 2 deletions
diff --git a/packages/SystemUI/src/com/android/systemui/media/dialog/MediaOutputDialogFactory.kt b/packages/SystemUI/src/com/android/systemui/media/dialog/MediaOutputDialogFactory.kt
index bc1dca58990d..4cdca4cbcf1e 100644
--- a/packages/SystemUI/src/com/android/systemui/media/dialog/MediaOutputDialogFactory.kt
+++ b/packages/SystemUI/src/com/android/systemui/media/dialog/MediaOutputDialogFactory.kt
@@ -33,10 +33,22 @@ class MediaOutputDialogFactory @Inject constructor(
     private val shadeController: ShadeController,
     private val starter: ActivityStarter
 ) {
+    companion object {
+        var mediaOutputDialog: MediaOutputDialog? = null
+    }
+
     /** Creates a [MediaOutputDialog] for the given package. */
     fun create(packageName: String, aboveStatusBar: Boolean) {
-        MediaOutputController(context, packageName, mediaSessionManager, lbm, shadeController,
-                starter).run {
+        mediaOutputDialog?.dismiss()
+
+        mediaOutputDialog = MediaOutputController(context, packageName, mediaSessionManager, lbm,
+                shadeController, starter).run {
             MediaOutputDialog(context, aboveStatusBar, this) }
     }
+
+    /** dismiss [MediaOutputDialog] if exist. */
+    fun dismiss() {
+        mediaOutputDialog?.dismiss()
+        mediaOutputDialog = null
+    }
 }