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

Commit 402f0a4a authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Exclude MediaSession2 from the media button session" into rvc-dev am:... 

Merge "Exclude MediaSession2 from the media button session" into rvc-dev am: 31fdc741 am: a5b0451e

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

Change-Id: I36d57341b964485b4067f86a002657b6606e6031
parents 123dfcfc a5b0451e

services/core/java/com/android/server/media/MediaSessionService.java

+1 −1
Original line number Diff line number Diff line
@@ -2099,7 +2099,7 @@ public class MediaSessionService extends SystemService implements Monitor { 
                boolean asSystemService, KeyEvent keyEvent, boolean needWakeLock) {

            if (mCurrentFullUserRecord.getMediaButtonSessionLocked()

                    instanceof MediaSession2Record) {

                // TODO(jaewan): Implement

                // TODO(jaewan): Make MediaSession2 to receive media key event

                return;

            }

            MediaSessionRecord session = null;

services/core/java/com/android/server/media/MediaSessionStack.java

+4 −0
Original line number Diff line number Diff line
@@ -244,6 +244,10 @@ class MediaSessionStack { 
    private MediaSessionRecordImpl findMediaButtonSession(int uid) {

        MediaSessionRecordImpl mediaButtonSession = null;

        for (MediaSessionRecordImpl session : mSessions) {

            if (session instanceof MediaSession2Record) {

                // TODO(jaewan): Make MediaSession2 to receive media key event

                continue;

            }

            if (uid == session.getUid()) {

                if (session.checkPlaybackActiveState(

                        mAudioPlayerStateMonitor.isPlaybackActive(session.getUid()))) {