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

Commit 35613589 authored by Automerger Merge Worker's avatar Automerger Merge Worker
Browse files

Merge "Compare Session tokens for MediaControllers" am: f3bbe2b4 am: 87f0ac83 

Change-Id: I5db36f0fd1c08634c3ba1ae184301d0dc4794476
parents 42ae35b6 87f0ac83

android/app/src/com/android/bluetooth/avrcp/MediaPlayerList.java

+3 −3
Original line number Diff line number Diff line
@@ -694,13 +694,13 @@ public class MediaPlayerList { 
            boolean isActive = false;

            Log.v(TAG, "onPlaybackConfigChanged(): Configs list size=" + configs.size());

            for (AudioPlaybackConfiguration config : configs) {

                if (config.isActive() && (config.getAudioAttributes().getUsage()

                if (config.getPlayerState() == AudioPlaybackConfiguration.PLAYER_STATE_STARTED

                        && (config.getAudioAttributes().getUsage()

                            == AudioAttributes.USAGE_ASSISTANCE_NAVIGATION_GUIDANCE)

                        && (config.getAudioAttributes().getContentType()

                            == AudioAttributes.CONTENT_TYPE_SPEECH)) {

                    if (DEBUG) {

                        Log.d(TAG, "onPlaybackConfigChanged(): config="

                                 + AudioPlaybackConfiguration.toLogFriendlyString(config));

                        Log.d(TAG, "onPlaybackConfigChanged(): config=" + config);

                    }

                    isActive = true;

                }

android/app/src/com/android/bluetooth/avrcp/mockable/MediaController.java

+2 −2
Original line number Diff line number Diff line
@@ -215,14 +215,14 @@ public class MediaController { 
     * Wrapper for MediaController.controlsSameSession(MediaController other)

     */

    public boolean controlsSameSession(MediaController other) {

        return mDelegate.controlsSameSession(other.getWrappedInstance());

        return mDelegate.getSessionToken().equals(other.getWrappedInstance().getSessionToken());

    }



    /**

     * Wrapper for MediaController.controlsSameSession(MediaController other)

     */

    public boolean controlsSameSession(android.media.session.MediaController other) {

        return mDelegate.controlsSameSession(other);

        return mDelegate.getSessionToken().equals(other.getSessionToken());

    }



    /**