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

Commit 674f92ed authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "MCP: Align to AVRCP player actions" am: 34d9a1d7 

Original change: https://android-review.googlesource.com/c/platform/packages/modules/Bluetooth/+/2622871



Change-Id: I130dfe01a68cc813447af10d18bf9b2d77e41943
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 475bfd60 34d9a1d7

android/app/src/com/android/bluetooth/mcp/MediaControlProfile.java

+34 −5
Original line number Diff line number Diff line
@@ -81,6 +81,25 @@ public class MediaControlProfile implements MediaControlServiceCallbacks { 
        sMediaPlayerListForTesting = mediaPlayerList;

    }



    // Same base feature set as the player item features defined in `avrcp/get_foder_items.cc`

    private static final long BASE_PLAYER_ACTION_SET =

            PlaybackState.ACTION_PLAY

                    | PlaybackState.ACTION_STOP

                    | PlaybackState.ACTION_PAUSE

                    | PlaybackState.ACTION_REWIND

                    | PlaybackState.ACTION_FAST_FORWARD

                    | PlaybackState.ACTION_SKIP_TO_NEXT

                    | PlaybackState.ACTION_SKIP_TO_PREVIOUS;



    @VisibleForTesting

    long getCurrentPlayerSupportedActions() {

        // Notice: Stay compatible with the currently hard-codded ACRVP supported player features

        if (mCurrentData != null && mCurrentData.state != null) {

            return Long.valueOf(mCurrentData.state.getActions() | BASE_PLAYER_ACTION_SET);

        }

        return Long.valueOf(BASE_PLAYER_ACTION_SET);

    }



    public class ListCallback implements MediaPlayerList.MediaUpdateCallback {

        @Override

        public void run(MediaData data) {
@@ -152,7 +171,18 @@ public class MediaControlProfile implements MediaControlServiceCallbacks { 
                MediaState playback_state = playerState2McsState(mCurrentData.state.getState());

                state_map.put(PlayerStateField.PLAYBACK_STATE, playback_state);



                int opcodes = playerActions2McsSupportedOpcodes(mCurrentData.state.getActions());

                if ((mCurrentData.state.getActions() & BASE_PLAYER_ACTION_SET)

                        != BASE_PLAYER_ACTION_SET) {

                    mEventLogger.loge(

                            TAG,

                            "onCurrentPlayerStateUpdated: base actions not supported, player"

                                + " actions= "

                                    + Long.toHexString(mCurrentData.state.getActions())

                                    + ", expected at least= "

                                    + Long.toHexString(BASE_PLAYER_ACTION_SET));

                }



                int opcodes = playerActions2McsSupportedOpcodes(getCurrentPlayerSupportedActions());

                state_map.put(PlayerStateField.OPCODES_SUPPORTED, opcodes);



                if (playback_state != MediaState.INACTIVE) {
@@ -319,7 +349,7 @@ public class MediaControlProfile implements MediaControlServiceCallbacks { 
        mEventLogger.logd(DBG, TAG, "GMCS onTrackPositionSetRequest");



        if (mMediaPlayerList.getActivePlayer() == null) return;

        if ((mCurrentData.state.getActions() & PlaybackState.ACTION_SEEK_TO) != 0) {

        if ((getCurrentPlayerSupportedActions() & PlaybackState.ACTION_SEEK_TO) != 0) {

            mMediaPlayerList.getActivePlayer().seekTo(TrackPositionRelativeToAbsolute(position));

        } else {

            // player does not support seek to command, notify last known track position only
@@ -364,7 +394,6 @@ public class MediaControlProfile implements MediaControlServiceCallbacks { 
        // TODO: Implement once we have the Object Transfer Service

    }





    @Override

    public void onMediaControlRequest(Request request) {

        mEventLogger.logd(
@@ -378,7 +407,7 @@ public class MediaControlProfile implements MediaControlServiceCallbacks { 
            mGMcsService.setMediaControlRequestResult(request, status);

        }



        long actions = mCurrentData.state.getActions();

        long actions = getCurrentPlayerSupportedActions();

        switch (request.getOpcode()) {

            case Request.Opcodes.PLAY:

                if ((actions & PlaybackState.ACTION_PLAY) != 0
@@ -618,7 +647,7 @@ public class MediaControlProfile implements MediaControlServiceCallbacks { 
                        if (mCurrentData.state != null) {

                            int opcodes =

                                    playerActions2McsSupportedOpcodes(

                                            mCurrentData.state.getActions());

                                            getCurrentPlayerSupportedActions());

                            handled_request_map.put(settings_field, opcodes);

                            mEventLogger.logd(

                                    DBG,

android/app/tests/unit/src/com/android/bluetooth/mcp/MediaControlProfileTest.java

+20 −0
Original line number Diff line number Diff line
@@ -384,6 +384,26 @@ public class MediaControlProfileTest { 
        verify(mMockMediaPlayerWrapper, timeout(100)).pauseCurrent();

    }



    @Test

    public void testAvrcpCompatibleActionSet() {

        long actions = PlaybackState.ACTION_SET_RATING;

        PlaybackState.Builder bob = new PlaybackState.Builder(mMockMediaData.state);

        bob.setActions(actions);

        mMockMediaData.state = bob.build();



        // Same base feature set as the player item features defined in `avrcp/get_foder_items.cc`

        final long baseFeatures =

                PlaybackState.ACTION_PLAY

                        | PlaybackState.ACTION_STOP

                        | PlaybackState.ACTION_PAUSE

                        | PlaybackState.ACTION_REWIND

                        | PlaybackState.ACTION_FAST_FORWARD

                        | PlaybackState.ACTION_SKIP_TO_NEXT

                        | PlaybackState.ACTION_SKIP_TO_PREVIOUS;

        Assert.assertEquals(

                actions | baseFeatures, mMediaControlProfile.getCurrentPlayerSupportedActions());

    }



    @Test

    public void testPlayerActions2McsSupportedOpcodes() {

        long actions = PlaybackState.ACTION_PLAY | PlaybackState.ACTION_PAUSE