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

Commit 7c3cb20c authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Handle AVRCP volume control issue" into main am: 64391b65 

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



Change-Id: I2611a038d448ababc94df471e35b6fa87271bd30
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents c3482252 64391b65

android/app/src/com/android/bluetooth/avrcpcontroller/AvrcpControllerService.java

+4 −3
Original line number Diff line number Diff line
@@ -508,7 +508,8 @@ public class AvrcpControllerService extends ProfileService { 
        AvrcpControllerStateMachine stateMachine = getStateMachine(device);

        if (stateMachine != null) {

            stateMachine.sendMessage(

                    AvrcpControllerStateMachine.MESSAGE_PROCESS_REGISTER_ABS_VOL_NOTIFICATION);

                    AvrcpControllerStateMachine.MESSAGE_PROCESS_REGISTER_ABS_VOL_NOTIFICATION,

                    label);

        }

    }
@@ -517,8 +518,8 @@ public class AvrcpControllerService extends ProfileService { 
    synchronized void handleSetAbsVolume(BluetoothDevice device, byte absVol, byte label) {

        AvrcpControllerStateMachine stateMachine = getStateMachine(device);

        if (stateMachine != null) {

            stateMachine.sendMessage(AvrcpControllerStateMachine.MESSAGE_PROCESS_SET_ABS_VOL_CMD,

                    absVol);

            stateMachine.sendMessage(

                    AvrcpControllerStateMachine.MESSAGE_PROCESS_SET_ABS_VOL_CMD, absVol, label);

        }

    }

android/app/tests/unit/src/com/android/bluetooth/avrcpcontroller/AvrcpControllerServiceTest.java

+6 −3
Original line number Diff line number Diff line
@@ -361,8 +361,10 @@ public class AvrcpControllerServiceTest { 


        mService.handleRegisterNotificationAbsVol(mRemoteDevice, label);



        verify(mStateMachine).sendMessage(

                AvrcpControllerStateMachine.MESSAGE_PROCESS_REGISTER_ABS_VOL_NOTIFICATION);

        verify(mStateMachine)

                .sendMessage(

                        AvrcpControllerStateMachine.MESSAGE_PROCESS_REGISTER_ABS_VOL_NOTIFICATION,

                        label);

    }



    @Test
@@ -373,7 +375,8 @@ public class AvrcpControllerServiceTest { 
        mService.handleSetAbsVolume(mRemoteDevice, absVol, label);



        verify(mStateMachine)

                .sendMessage(AvrcpControllerStateMachine.MESSAGE_PROCESS_SET_ABS_VOL_CMD, absVol);

                .sendMessage(

                        AvrcpControllerStateMachine.MESSAGE_PROCESS_SET_ABS_VOL_CMD, absVol, label);

    }



    @Test