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

Commit d1a4aa17 authored by William Escande's avatar William Escande
Browse files

AICS: onExtAudioInStatusChanged: skip serialize 

Bug: 361263965
Test: atest vc_test
Flag: com.android.bluetooth.flags.leaudio_add_aics_support
Change-Id: Ieac5e4aa76a0d6e6674298c7e83ef775920116ad
parent 1e71c962

android/app/src/com/android/bluetooth/vc/VolumeControlNativeCallback.java

+2 −10
Original line number Diff line number Diff line
@@ -20,7 +20,6 @@ import static com.android.bluetooth.vc.VolumeControlStackEvent.EVENT_TYPE_CONNEC 
import static com.android.bluetooth.vc.VolumeControlStackEvent.EVENT_TYPE_DEVICE_AVAILABLE;

import static com.android.bluetooth.vc.VolumeControlStackEvent.EVENT_TYPE_EXT_AUDIO_IN_DESCR_CHANGED;

import static com.android.bluetooth.vc.VolumeControlStackEvent.EVENT_TYPE_EXT_AUDIO_IN_GAIN_PROPS_CHANGED;

import static com.android.bluetooth.vc.VolumeControlStackEvent.EVENT_TYPE_EXT_AUDIO_IN_STATUS_CHANGED;

import static com.android.bluetooth.vc.VolumeControlStackEvent.EVENT_TYPE_EXT_AUDIO_IN_TYPE_CHANGED;

import static com.android.bluetooth.vc.VolumeControlStackEvent.EVENT_TYPE_EXT_AUDIO_OUT_DESCRIPTION_CHANGED;

import static com.android.bluetooth.vc.VolumeControlStackEvent.EVENT_TYPE_EXT_AUDIO_OUT_LOCATION_CHANGED;
@@ -163,15 +162,8 @@ class VolumeControlNativeCallback { 
    }



    @VisibleForTesting

    void onExtAudioInStatusChanged(int externalInputId, int status, byte[] address) {

        VolumeControlStackEvent event =

                new VolumeControlStackEvent(EVENT_TYPE_EXT_AUDIO_IN_STATUS_CHANGED);

        event.device = getDevice(address);

        event.valueInt1 = externalInputId;

        event.valueInt2 = status;



        Log.d(TAG, "onExtAudioInStatusChanged: " + event);

        mVolumeControlService.messageFromNative(event);

    void onExtAudioInStatusChanged(int id, int status, byte[] address) {

        sendMessageToService(s -> s.onExtAudioInStatusChanged(getDevice(address), id, status));

    }



    @VisibleForTesting

android/app/src/com/android/bluetooth/vc/VolumeControlService.java

+2 −7
Original line number Diff line number Diff line
@@ -1051,9 +1051,9 @@ public class VolumeControlService extends ProfileService { 
        input.setState(id, gainSetting, mute, gainMode);

    }



    void handleDeviceExtInputStatusChanged(BluetoothDevice device, int id, int status) {

    void onExtAudioInStatusChanged(BluetoothDevice device, int id, int status) {

        String logInfo =

                "handleDeviceExtInputStatusChanged("

                "onExtAudioInStatusChanged("

                        + ("device:" + device)

                        + (", id" + id)

                        + (", status" + status)
@@ -1184,11 +1184,6 @@ public class VolumeControlService extends ProfileService { 
            return;

        }



        if (stackEvent.type == VolumeControlStackEvent.EVENT_TYPE_EXT_AUDIO_IN_STATUS_CHANGED) {

            handleDeviceExtInputStatusChanged(device, stackEvent.valueInt1, stackEvent.valueInt2);

            return;

        }



        if (stackEvent.type == VolumeControlStackEvent.EVENT_TYPE_EXT_AUDIO_IN_TYPE_CHANGED) {

            handleDeviceExtInputTypeChanged(device, stackEvent.valueInt1, stackEvent.valueInt2);

            return;

android/app/src/com/android/bluetooth/vc/VolumeControlStackEvent.java

+0 −6
Original line number Diff line number Diff line
@@ -29,7 +29,6 @@ public class VolumeControlStackEvent { 
    public static final int EVENT_TYPE_EXT_AUDIO_OUT_VOL_OFFSET_CHANGED = 4;

    public static final int EVENT_TYPE_EXT_AUDIO_OUT_LOCATION_CHANGED = 5;

    public static final int EVENT_TYPE_EXT_AUDIO_OUT_DESCRIPTION_CHANGED = 6;

    public static final int EVENT_TYPE_EXT_AUDIO_IN_STATUS_CHANGED = 8;

    public static final int EVENT_TYPE_EXT_AUDIO_IN_TYPE_CHANGED = 9;

    public static final int EVENT_TYPE_EXT_AUDIO_IN_DESCR_CHANGED = 10;

    public static final int EVENT_TYPE_EXT_AUDIO_IN_GAIN_PROPS_CHANGED = 11;
@@ -83,8 +82,6 @@ public class VolumeControlStackEvent { 
                return "EVENT_TYPE_EXT_AUDIO_OUT_LOCATION_CHANGED";

            case EVENT_TYPE_EXT_AUDIO_OUT_DESCRIPTION_CHANGED:

                return "EVENT_TYPE_EXT_AUDIO_OUT_DESCRIPTION_CHANGED";

            case EVENT_TYPE_EXT_AUDIO_IN_STATUS_CHANGED:

                return "EVENT_TYPE_EXT_AUDIO_IN_STATUS_CHANGED";

            case EVENT_TYPE_EXT_AUDIO_IN_TYPE_CHANGED:

                return "EVENT_TYPE_EXT_AUDIO_IN_TYPE_CHANGED";

            case EVENT_TYPE_EXT_AUDIO_IN_DESCR_CHANGED:
@@ -108,7 +105,6 @@ public class VolumeControlStackEvent { 
            case EVENT_TYPE_EXT_AUDIO_OUT_LOCATION_CHANGED:

            case EVENT_TYPE_EXT_AUDIO_OUT_DESCRIPTION_CHANGED:

                return "{ext output id:" + value + "}";

            case EVENT_TYPE_EXT_AUDIO_IN_STATUS_CHANGED:

            case EVENT_TYPE_EXT_AUDIO_IN_TYPE_CHANGED:

            case EVENT_TYPE_EXT_AUDIO_IN_DESCR_CHANGED:

            case EVENT_TYPE_EXT_AUDIO_IN_GAIN_PROPS_CHANGED:
@@ -127,8 +123,6 @@ public class VolumeControlStackEvent { 
                return "{volume:" + value + "}";

            case EVENT_TYPE_DEVICE_AVAILABLE:

                return "{num_ext_inputs:" + value + "}";

            case EVENT_TYPE_EXT_AUDIO_IN_STATUS_CHANGED:

                return "{status:" + value + "}";

            case EVENT_TYPE_EXT_AUDIO_IN_TYPE_CHANGED:

                return "{type:" + value + "}";

            default:

android/app/tests/unit/src/com/android/bluetooth/vc/VolumeControlNativeCallbackTest.java

+3 −7
Original line number Diff line number Diff line
@@ -20,7 +20,6 @@ import static com.android.bluetooth.vc.VolumeControlStackEvent.EVENT_TYPE_CONNEC 
import static com.android.bluetooth.vc.VolumeControlStackEvent.EVENT_TYPE_DEVICE_AVAILABLE;

import static com.android.bluetooth.vc.VolumeControlStackEvent.EVENT_TYPE_EXT_AUDIO_IN_DESCR_CHANGED;

import static com.android.bluetooth.vc.VolumeControlStackEvent.EVENT_TYPE_EXT_AUDIO_IN_GAIN_PROPS_CHANGED;

import static com.android.bluetooth.vc.VolumeControlStackEvent.EVENT_TYPE_EXT_AUDIO_IN_STATUS_CHANGED;

import static com.android.bluetooth.vc.VolumeControlStackEvent.EVENT_TYPE_EXT_AUDIO_IN_TYPE_CHANGED;

import static com.android.bluetooth.vc.VolumeControlStackEvent.EVENT_TYPE_EXT_AUDIO_OUT_DESCRIPTION_CHANGED;

import static com.android.bluetooth.vc.VolumeControlStackEvent.EVENT_TYPE_EXT_AUDIO_OUT_LOCATION_CHANGED;
@@ -174,14 +173,11 @@ public class VolumeControlNativeCallbackTest { 


    @Test

    public void onExtAudioInStatusChanged() {

        int externalInputId = 2;

        int id = 2;

        int status = 1;



        mNativeCallback.onExtAudioInStatusChanged(externalInputId, status, null);

        verify(mService).messageFromNative(mEvent.capture());

        VolumeControlStackEvent event = mEvent.getValue();



        expect.that(event.type).isEqualTo(EVENT_TYPE_EXT_AUDIO_IN_STATUS_CHANGED);

        mNativeCallback.onExtAudioInStatusChanged(id, status, null);

        verify(mService).onExtAudioInStatusChanged(any(), eq(id), eq(status));

    }



    @Test