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

Commit 218396f7 authored by Jaewan Kim's avatar Jaewan Kim Committed by android-build-merger
Browse files

Merge "Don't ignore remote media sessions when sending media key events" into oc-dev 

am: 60b48570

Change-Id: Ic39253af5902dfba18e3ebd748f844b20cacd1ff
parents aa1bf314 60b48570

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

+1 −5
Original line number Diff line number Diff line
@@ -219,11 +219,7 @@ class MediaSessionStack { 
    private MediaSessionRecord findMediaButtonSession(int uid) {

        MediaSessionRecord mediaButtonSession = null;

        for (MediaSessionRecord session : mSessions) {

            // Since the media buttons come with the headset/speaker, users will expect changes in

            // the headset/speaker when they press media buttons. So only consider local playback

            // for the media button session.

            if (uid == session.getUid()

                    && session.getPlaybackType() == PlaybackInfo.PLAYBACK_TYPE_LOCAL) {

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

                if (session.isPlaybackActive() ==

                        mAudioPlaybackMonitor.isPlaybackActive(session.getUid())) {

                    // If there's a media session whose PlaybackState matches