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

Commit 9ce6ff60 authored by 王兆宇's avatar 王兆宇 Committed by William Escande
Browse files

Handle AVRCP volume control issue 

For the AVRCP volume control command(PDU ID: Set Absolute Volume and Event ID: EVENT VOLUME CHANGED), which needs to use the same transaction label from the CT command.
Now Statemachine wants to use this label, but the service did not send it to the state machine.
So add the label when sending a message to the state machine.

Bug: 311772251
Test: atest AvrcpControllerServiceTest
Change-Id: I3aa87f2a5bbca598d5cb45d109228c13e6dffab5
parent ddc18434

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