Merge "Fix issue where player would not be dismissed" into rvc-dev am: f51a9a0cf6

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

Change-Id: Id3eb9b6204a220db3061bf94a1c7083c8b8d6cc8

1 files changed, 1 insertions, 15 deletions

diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/NotificationMediaManager.java b/packages/SystemUI/src/com/android/systemui/statusbar/NotificationMediaManager.java
index 5628a24f40ef..739d30c2a707 100644
--- a/packages/SystemUI/src/com/android/systemui/statusbar/NotificationMediaManager.java
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/NotificationMediaManager.java
@@ -100,12 +100,7 @@ public class NotificationMediaManager implements Dumpable {
         PAUSED_MEDIA_STATES.add(PlaybackState.STATE_STOPPED);
         PAUSED_MEDIA_STATES.add(PlaybackState.STATE_PAUSED);
         PAUSED_MEDIA_STATES.add(PlaybackState.STATE_ERROR);
-    }
-    private static final HashSet<Integer> INACTIVE_MEDIA_STATES = new HashSet<>();
-    static {
-        INACTIVE_MEDIA_STATES.add(PlaybackState.STATE_NONE);
-        INACTIVE_MEDIA_STATES.add(PlaybackState.STATE_STOPPED);
-        INACTIVE_MEDIA_STATES.add(PlaybackState.STATE_ERROR);
+        PAUSED_MEDIA_STATES.add(PlaybackState.STATE_CONNECTING);
     }
 
     private final NotificationEntryManager mEntryManager;
@@ -262,15 +257,6 @@ public class NotificationMediaManager implements Dumpable {
         return !PAUSED_MEDIA_STATES.contains(state);
     }
 
-    /**
-     * Check if a state should be considered active (playing or paused)
-     * @param state a PlaybackState
-     * @return true if active
-     */
-    public static boolean isActiveState(int state) {
-        return !INACTIVE_MEDIA_STATES.contains(state);
-    }
-
     public void setUpWithPresenter(NotificationPresenter presenter) {
         mPresenter = presenter;
     }