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

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

AICS: onExtAudioInGainPropsChanged: skip serialize 

Bug: 361263965
Test: atest vc_test
Flag: com.android.bluetooth.flags.leaudio_add_aics_support
Change-Id: I77552129bd6f6866e8abfd2c641aeccab0bbfee4
parent 48410cf0

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

+3 −13
Original line number Diff line number Diff line
@@ -18,7 +18,6 @@ package com.android.bluetooth.vc; 


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

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

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_OUT_DESCRIPTION_CHANGED;

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

import static com.android.bluetooth.vc.VolumeControlStackEvent.EVENT_TYPE_EXT_AUDIO_OUT_VOL_OFFSET_CHANGED;
@@ -175,17 +174,8 @@ class VolumeControlNativeCallback { 
    }



    @VisibleForTesting

    void onExtAudioInGainPropsChanged(

            int externalInputId, int unit, int min, int max, byte[] address) {

        VolumeControlStackEvent event =

                new VolumeControlStackEvent(EVENT_TYPE_EXT_AUDIO_IN_GAIN_PROPS_CHANGED);

        event.device = getDevice(address);

        event.valueInt1 = externalInputId;

        event.valueInt2 = unit;

        event.valueInt3 = min;

        event.valueInt4 = max;



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

        mVolumeControlService.messageFromNative(event);

    void onExtAudioInGainPropsChanged(int id, int unit, int min, int max, byte[] address) {

        sendMessageToService(

                s -> s.onExtAudioInGainPropsChanged(getDevice(address), id, unit, min, max));

    }

}

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

+2 −13
Original line number Diff line number Diff line
@@ -1120,10 +1120,9 @@ public class VolumeControlService extends ProfileService { 
        input.setDescription(id, description);

    }



    void handleDeviceExtInputGainPropsChanged(

            BluetoothDevice device, int id, int unit, int min, int max) {

    void onExtAudioInGainPropsChanged(BluetoothDevice device, int id, int unit, int min, int max) {

        String logInfo =

                "handleDeviceExtInputGainPropsChanged("

                "onExtAudioInGainPropsChanged("

                        + ("device:" + device)

                        + (", id" + id)

                        + (" unit: " + unit + " min" + min + " max:" + max)
@@ -1183,16 +1182,6 @@ public class VolumeControlService extends ProfileService { 
            return;

        }



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

            handleDeviceExtInputGainPropsChanged(

                    device,

                    stackEvent.valueInt1,

                    stackEvent.valueInt2,

                    stackEvent.valueInt3,

                    stackEvent.valueInt4);

            return;

        }



        synchronized (mStateMachines) {

            VolumeControlStateMachine sm = mStateMachines.get(device);

            if (sm == null) {

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

+0 −17
Original line number Diff line number Diff line
@@ -29,14 +29,12 @@ 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_GAIN_PROPS_CHANGED = 11;



    public int type;

    public BluetoothDevice device;

    public int valueInt1;

    public int valueInt2;

    public int valueInt3;

    public int valueInt4;

    public boolean valueBool1;

    public boolean valueBool2;

    public String valueString1;
@@ -56,7 +54,6 @@ public class VolumeControlStackEvent { 
        result.append(", valueInt1:").append(eventTypeValue1ToString(type, valueInt1));

        result.append(", valueInt2:").append(eventTypeValue2ToString(type, valueInt2));

        result.append(", valueInt3:").append(eventTypeValue3ToString(type, valueInt3));

        result.append(", valueInt4:").append(eventTypeValue4ToString(type, valueInt4));

        result.append(", valueBool1:").append(eventTypeValueBool1ToString(type, valueBool1));

        result.append(", valueBool2:").append(eventTypeValueBool2ToString(type, valueBool2));

        result.append(", valueString1:").append(eventTypeString1ToString(type, valueString1));
@@ -80,8 +77,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_GAIN_PROPS_CHANGED:

                return "EVENT_TYPE_EXT_AUDIO_IN_GAIN_PROPS_CHANGED";

            default:

                return "EVENT_TYPE_UNKNOWN:" + type;

        }
@@ -99,8 +94,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_GAIN_PROPS_CHANGED:

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

            default:

                break;

        }
@@ -131,16 +124,6 @@ public class VolumeControlStackEvent { 
        return Integer.toString(value);

    }



    private static String eventTypeValue4ToString(int type, int value) {

        switch (type) {

            case EVENT_TYPE_EXT_AUDIO_IN_GAIN_PROPS_CHANGED:

                return "{gain set max:" + value + "}";

            default:

                break;

        }

        return Integer.toString(value);

    }



    private static String eventTypeValueBool1ToString(int type, boolean value) {

        switch (type) {

            case EVENT_TYPE_VOLUME_STATE_CHANGED:

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

+3 −7
Original line number Diff line number Diff line
@@ -18,7 +18,6 @@ package com.android.bluetooth.vc; 


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

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

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_OUT_DESCRIPTION_CHANGED;

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

import static com.android.bluetooth.vc.VolumeControlStackEvent.EVENT_TYPE_EXT_AUDIO_OUT_VOL_OFFSET_CHANGED;
@@ -198,15 +197,12 @@ public class VolumeControlNativeCallbackTest { 


    @Test

    public void onExtAudioInGainPropsChanged() {

        int externalInputId = 2;

        int id = 2;

        int unit = 1;

        int min = 0;

        int max = 100;



        mNativeCallback.onExtAudioInGainPropsChanged(externalInputId, unit, min, max, null);

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

        VolumeControlStackEvent event = mEvent.getValue();



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

        mNativeCallback.onExtAudioInGainPropsChanged(id, unit, min, max, null);

        verify(mService).onExtAudioInGainPropsChanged(any(), eq(id), eq(unit), eq(min), eq(max));

    }

}