Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

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

Change-Id: I765ec53fa80bfabab9766605f53ae6294d889813
This commit is contained in:
Lucas Dupin
2020-06-30 18:32:28 +00:00
committed by Automerger Merge Worker
parent eb871dd0e8 f51a9a0cf6
commit fba8e08da7
1 changed files with 1 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
packages/SystemUI/src/com/android/systemui/statusbar/NotificationMediaManager.java
View File

@@ -100,12 +100,7 @@ public class NotificationMediaManager implements Dumpable {
PAUSED_MEDIA_STATES.add(PlaybackState.STATE_STOPPED); PAUSED_MEDIA_STATES.add(PlaybackState.STATE_STOPPED);
PAUSED_MEDIA_STATES.add(PlaybackState.STATE_PAUSED); PAUSED_MEDIA_STATES.add(PlaybackState.STATE_PAUSED);
PAUSED_MEDIA_STATES.add(PlaybackState.STATE_ERROR); PAUSED_MEDIA_STATES.add(PlaybackState.STATE_ERROR);
} PAUSED_MEDIA_STATES.add(PlaybackState.STATE_CONNECTING);
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);
} }
private final NotificationEntryManager mEntryManager; private final NotificationEntryManager mEntryManager;
@@ -262,15 +257,6 @@ public class NotificationMediaManager implements Dumpable {
return !PAUSED_MEDIA_STATES.contains(state); 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) { public void setUpWithPresenter(NotificationPresenter presenter) {
mPresenter = presenter; mPresenter = presenter;
} }