From a73d43fceedd5ad7d50c0aef91edf24f8a47a551 Mon Sep 17 00:00:00 2001
From: Lucas Dupin <dupin@google.com>
Date: Tue, 16 Jun 2020 16:44:53 -0700
Subject: [PATCH] fix issue where players would be wrongly dismissed

When resumption is disabled, we should only remove players when
timedOut is true.

Fixes: 158721393
Test: manual
Change-Id: I18b36c95ac72d5728ed203ac2b5d344b58676dc4
---
 .../SystemUI/src/com/android/systemui/media/MediaDataManager.kt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/SystemUI/src/com/android/systemui/media/MediaDataManager.kt b/packages/SystemUI/src/com/android/systemui/media/MediaDataManager.kt
index 88bdaece59712..5300795189dec 100644
--- a/packages/SystemUI/src/com/android/systemui/media/MediaDataManager.kt
+++ b/packages/SystemUI/src/com/android/systemui/media/MediaDataManager.kt
@@ -261,7 +261,7 @@ class MediaDataManager @Inject constructor(
                 }
                 it.active = !timedOut
                 onMediaDataLoaded(token, token, it)
-            } else {
+            } else if (timedOut) {
                 notificationEntryManager.removeNotification(it.notificationKey, null /* ranking */,
                         UNDEFINED_DISMISS_REASON)
             }