Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 20cb1f01 authored by Lucas Dupin's avatar Lucas Dupin Committed by Automerger Merge Worker
Browse files

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

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

Change-Id: I14edd421e6acecef6d84c2db0042c2a1f712a17c
parents 2c791097 dbdcda8e

packages/SystemUI/src/com/android/systemui/statusbar/NotificationMediaManager.java

+1 −15
Original line number Original line Diff line number Diff line
@@ -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;

    }

    }