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

Commit 6196b3ad authored by Łukasz Rymanowski's avatar Łukasz Rymanowski Committed by Automerger Merge Worker
Browse files

Merge "LeAudioService: Store volume for the group" into tm-d1-dev am: 27e255be am: 4db03db5 

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



Change-Id: I42c1cfb427a9bbb94d41220cced7d72b0c99f0a9
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 22a4c07e 4db03db5

android/app/jni/com_android_bluetooth_vc.cpp

+2 −2
Original line number Diff line number Diff line
@@ -346,7 +346,7 @@ static void setVolumeNative(JNIEnv* env, jobject object, jbyteArray address, 
  env->ReleaseByteArrayElements(address, addr, 0);

}



static void setVolumeGroupNative(JNIEnv* env, jobject object, jint group_id,

static void setGroupVolumeNative(JNIEnv* env, jobject object, jint group_id,

                                 jint volume) {

  if (!sVolumeControlInterface) {

    LOG(ERROR) << __func__
@@ -547,7 +547,7 @@ static JNINativeMethod sMethods[] = { 
    {"disconnectVolumeControlNative", "([B)Z",

     (void*)disconnectVolumeControlNative},

    {"setVolumeNative", "([BI)V", (void*)setVolumeNative},

    {"setVolumeGroupNative", "(II)V", (void*)setVolumeGroupNative},

    {"setGroupVolumeNative", "(II)V", (void*)setGroupVolumeNative},

    {"muteNative", "([B)V", (void*)muteNative},

    {"muteGroupNative", "(I)V", (void*)muteGroupNative},

    {"unmuteNative", "([B)V", (void*)unmuteNative},

android/app/src/com/android/bluetooth/le_audio/LeAudioService.java

+44 −4
Original line number Diff line number Diff line
@@ -127,6 +127,9 @@ public class LeAudioService extends ProfileService { 
    AudioManager mAudioManager;

    LeAudioTmapGattServer mTmapGattServer;



    @VisibleForTesting

    VolumeControlService mVolumeControlService;



    @VisibleForTesting

    RemoteCallbackList<IBluetoothLeBroadcastCallback> mBroadcastCallbacks;
@@ -384,6 +387,7 @@ public class LeAudioService extends ProfileService { 


        mAdapterService = null;

        mAudioManager = null;

        mVolumeControlService = null;



        return true;

    }
@@ -412,6 +416,18 @@ public class LeAudioService extends ProfileService { 
        sLeAudioService = instance;

    }



    private int getGroupVolume(int groupId) {

        if (mVolumeControlService == null) {

            mVolumeControlService = mServiceFactory.getVolumeControlService();

        }

        if (mVolumeControlService == null) {

            Log.e(TAG, "Volume control service is not available");

            return -1;

        }



        return mVolumeControlService.getGroupVolume(groupId);

    }



    public boolean connect(BluetoothDevice device) {

        if (DBG) {

            Log.d(TAG, "connect(): " + device);
@@ -830,6 +846,7 @@ public class LeAudioService extends ProfileService { 
                            + previousInDevice + ", mActiveAudioInDevice" + mActiveAudioInDevice

                            + " isLeOutput: false");

            }



            mAudioManager.handleBluetoothActiveDeviceChanged(mActiveAudioInDevice,previousInDevice,

                    BluetoothProfileConnectionInfo.createLeAudioInfo(false, false));
@@ -899,9 +916,14 @@ public class LeAudioService extends ProfileService { 
                            + previousOutDevice + ", mActiveOutDevice: " + mActiveAudioOutDevice

                            + " isLeOutput: true");

            }

            int volume = -1;

            if (mActiveAudioOutDevice != null) {

                volume = getGroupVolume(groupId);

            }



            mAudioManager.handleBluetoothActiveDeviceChanged(mActiveAudioOutDevice,

                    previousOutDevice,

                    BluetoothProfileConnectionInfo.createLeAudioInfo(suppressNoisyIntent, true));

                    getLeAudioOutputProfile(suppressNoisyIntent, volume));

            return true;

        }

        Log.d(TAG, "updateActiveOutDevice: Nothing to do.");
@@ -1054,6 +1076,22 @@ public class LeAudioService extends ProfileService { 
        }

    }



    BluetoothProfileConnectionInfo getLeAudioOutputProfile(boolean suppressNoisyIntent,

            int volume) {

        /* TODO - b/236618595 */

        Parcel parcel = Parcel.obtain();

        parcel.writeInt(BluetoothProfile.LE_AUDIO);

        parcel.writeBoolean(suppressNoisyIntent);

        parcel.writeInt(volume);

        parcel.writeBoolean(true /* isLeOutput */);

        parcel.setDataPosition(0);



        BluetoothProfileConnectionInfo profileInfo =

                BluetoothProfileConnectionInfo.CREATOR.createFromParcel(parcel);

        parcel.recycle();

        return profileInfo;

    }



    BluetoothProfileConnectionInfo getBroadcastProfile(boolean suppressNoisyIntent) {

        Parcel parcel = Parcel.obtain();

        parcel.writeInt(BluetoothProfile.LE_AUDIO_BROADCAST);
@@ -1766,9 +1804,11 @@ public class LeAudioService extends ProfileService { 
            return;

        }



        VolumeControlService service = mServiceFactory.getVolumeControlService();

        if (service != null) {

            service.setVolumeGroup(currentlyActiveGroupId, volume);

        if (mVolumeControlService == null) {

            mVolumeControlService = mServiceFactory.getVolumeControlService();

        }

        if (mVolumeControlService != null) {

            mVolumeControlService.setGroupVolume(currentlyActiveGroupId, volume);

        }

    }

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

+3 −3
Original line number Diff line number Diff line
@@ -113,8 +113,8 @@ public class VolumeControlNativeInterface { 
     * @param volume

     */

    @VisibleForTesting(visibility = VisibleForTesting.Visibility.PACKAGE)

    public void setVolumeGroup(int groupId, int volume) {

        setVolumeGroupNative(groupId, volume);

    public void setGroupVolume(int groupId, int volume) {

        setGroupVolumeNative(groupId, volume);

    }



     /**
@@ -370,7 +370,7 @@ public class VolumeControlNativeInterface { 
    private native boolean connectVolumeControlNative(byte[] address);

    private native boolean disconnectVolumeControlNative(byte[] address);

    private native void setVolumeNative(byte[] address, int volume);

    private native void setVolumeGroupNative(int groupId, int volume);

    private native void setGroupVolumeNative(int groupId, int volume);

    private native void muteNative(byte[] address);

    private native void muteGroupNative(int groupId);

    private native void unmuteNative(byte[] address);

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

+43 −4
Original line number Diff line number Diff line
@@ -179,6 +179,7 @@ public class VolumeControlService extends ProfileService { 
    private final Map<BluetoothDevice, VolumeControlStateMachine> mStateMachines = new HashMap<>();

    private final Map<BluetoothDevice, VolumeControlOffsetDescriptor> mAudioOffsets =

                                                                            new HashMap<>();

    private final Map<Integer, Integer> mGroupVolumeCache = new HashMap<>();



    private BroadcastReceiver mBondStateChangedReceiver;

    private BroadcastReceiver mConnectionStateChangedReceiver;
@@ -242,6 +243,7 @@ public class VolumeControlService extends ProfileService { 
        registerReceiver(mConnectionStateChangedReceiver, filter);



        mAudioOffsets.clear();

        mGroupVolumeCache.clear();

        mCallbacks = new RemoteCallbackList<IBluetoothVolumeControlCallback>();



        // Mark service as started
@@ -296,6 +298,7 @@ public class VolumeControlService extends ProfileService { 
        mVolumeControlNativeInterface = null;



        mAudioOffsets.clear();

        mGroupVolumeCache.clear();



        // Clear AdapterService, VolumeControlNativeInterface

        mAudioManager = null;
@@ -578,8 +581,17 @@ public class VolumeControlService extends ProfileService { 
    /**

     * {@hide}

     */

    public void setVolumeGroup(int groupId, int volume) {

        mVolumeControlNativeInterface.setVolumeGroup(groupId, volume);

    public void setGroupVolume(int groupId, int volume) {

        mGroupVolumeCache.put(groupId, volume);

        mVolumeControlNativeInterface.setGroupVolume(groupId, volume);

    }



    /**

     * {@hide}

     * @param groupId

     */

    public int getGroupVolume(int groupId) {

        return mGroupVolumeCache.getOrDefault(groupId, -1);

    }



    /**
@@ -618,6 +630,11 @@ public class VolumeControlService extends ProfileService { 
        }

        // TODO: Handle the other arguments: device, groupId, mute.



        /* We are interested only in the group volume as any LeAudio device is a part of group */

        if (device == null) {

            mGroupVolumeCache.put(groupId, volume);

        }



        int streamType = getBluetoothContextualVolumeStream();

        mAudioManager.setStreamVolume(streamType, getDeviceVolume(streamType, volume),

                AudioManager.FLAG_SHOW_UI | AudioManager.FLAG_BLUETOOTH_ABS_VOLUME);
@@ -1125,7 +1142,7 @@ public class VolumeControlService extends ProfileService { 
        }



        @Override

        public void setVolumeGroup(int groupId, int volume, AttributionSource source,

        public void setGroupVolume(int groupId, int volume, AttributionSource source,

                SynchronousResultReceiver receiver) {

            try {

                Objects.requireNonNull(source, "source cannot be null");
@@ -1133,7 +1150,7 @@ public class VolumeControlService extends ProfileService { 


                VolumeControlService service = getService(source);

                if (service != null) {

                    service.setVolumeGroup(groupId, volume);

                    service.setGroupVolume(groupId, volume);

                }

                receiver.send(null);

            } catch (RuntimeException e) {
@@ -1141,6 +1158,24 @@ public class VolumeControlService extends ProfileService { 
            }

        }



        @Override

        public void getGroupVolume(int groupId, AttributionSource source,

                SynchronousResultReceiver receiver) {

            try {

                Objects.requireNonNull(source, "source cannot be null");

                Objects.requireNonNull(receiver, "receiver cannot be null");



                VolumeControlService service = getService(source);

                if (service != null) {

                    service.getGroupVolume(groupId);

                }

                receiver.send(null);

            } catch (RuntimeException e) {

                receiver.propagateException(e);

            }

        }





        @Override

        public void mute(BluetoothDevice device,  AttributionSource source,

                SynchronousResultReceiver receiver) {
@@ -1271,5 +1306,9 @@ public class VolumeControlService extends ProfileService { 
            ProfileService.println(sb, "    Volume offset cnt: " + descriptor.size());

            descriptor.dump(sb);

        }

        for (Map.Entry<Integer, Integer> entry : mGroupVolumeCache.entrySet()) {

            ProfileService.println(sb, "    GroupId: " + entry.getKey() + " volume: "

                            + entry.getValue());

        }

    }

}

android/app/tests/unit/src/com/android/bluetooth/le_audio/LeAudioServiceTest.java

+54 −0
Original line number Diff line number Diff line
@@ -47,6 +47,7 @@ import android.content.Intent; 
import android.content.IntentFilter;

import android.media.AudioManager;

import android.media.BluetoothProfileConnectionInfo;

import android.os.Parcel;

import android.os.ParcelUuid;



import androidx.test.InstrumentationRegistry;
@@ -58,6 +59,7 @@ import com.android.bluetooth.R; 
import com.android.bluetooth.TestUtils;

import com.android.bluetooth.btservice.AdapterService;

import com.android.bluetooth.btservice.storage.DatabaseManager;

import com.android.bluetooth.vc.VolumeControlService;



import org.junit.After;

import org.junit.Assume;
@@ -65,6 +67,7 @@ import org.junit.Before; 
import org.junit.Rule;

import org.junit.Test;

import org.junit.runner.RunWith;

import org.mockito.ArgumentCaptor;

import org.mockito.Mock;

import org.mockito.MockitoAnnotations;

import org.mockito.Spy;
@@ -105,6 +108,7 @@ public class LeAudioServiceTest { 
    @Mock private DatabaseManager mDatabaseManager;

    @Mock private LeAudioNativeInterface mNativeInterface;

    @Mock private AudioManager mAudioManager;

    @Mock private VolumeControlService mVolumeControlService;

    @Mock private LeAudioTmapGattServer mTmapGattServer;

    @Spy private LeAudioObjectsFactory mObjectsFactory = LeAudioObjectsFactory.getInstance();
@@ -179,6 +183,7 @@ public class LeAudioServiceTest { 
        startService();

        mService.mLeAudioNativeInterface = mNativeInterface;

        mService.mAudioManager = mAudioManager;

        mService.mVolumeControlService = mVolumeControlService;



        LeAudioStackEvent stackEvent =

        new LeAudioStackEvent(LeAudioStackEvent.EVENT_TYPE_NATIVE_INITIALIZED);
@@ -1381,4 +1386,53 @@ public class LeAudioServiceTest { 
        verify(mAudioManager, times(1)).handleBluetoothActiveDeviceChanged(eq(null), eq(leadDevice),

                any(BluetoothProfileConnectionInfo.class));

    }



    /**

     * Test volume caching for the group

     */

    @Test

    public void testVolumeCache() {

        int groupId = 1;

        int volume = 100;

        int availableContexts = 4;



        doReturn(true).when(mNativeInterface).connectLeAudio(any(BluetoothDevice.class));

        connectTestDevice(mLeftDevice, groupId);

        connectTestDevice(mRightDevice, groupId);



        assertThat(mService.setActiveDevice(mLeftDevice)).isTrue();



        ArgumentCaptor<BluetoothProfileConnectionInfo> profileInfo =

                        ArgumentCaptor.forClass(BluetoothProfileConnectionInfo.class);



        //Add location support.

        injectAudioConfChanged(groupId, availableContexts);



        doReturn(-1).when(mVolumeControlService).getGroupVolume(groupId);

        //Set group and device as active.

        injectGroupStatusChange(groupId, LeAudioStackEvent.GROUP_STATUS_ACTIVE);



        verify(mAudioManager, times(1)).handleBluetoothActiveDeviceChanged(any(), eq(null),

                        profileInfo.capture());

        assertThat(profileInfo.getValue().getVolume()).isEqualTo(-1);



        mService.setVolume(volume);

        verify(mVolumeControlService, times(1)).setGroupVolume(groupId, volume);



        // Set group to inactive.

        injectGroupStatusChange(groupId, LeAudioStackEvent.GROUP_STATUS_INACTIVE);



        verify(mAudioManager, times(1)).handleBluetoothActiveDeviceChanged(eq(null), any(),

                        any(BluetoothProfileConnectionInfo.class));



        doReturn(100).when(mVolumeControlService).getGroupVolume(groupId);



        //Set back to active and check if last volume is restored.

        injectGroupStatusChange(groupId, LeAudioStackEvent.GROUP_STATUS_ACTIVE);



        verify(mAudioManager, times(2)).handleBluetoothActiveDeviceChanged(any(), eq(null),

                        profileInfo.capture());



        assertThat(profileInfo.getValue().getVolume()).isEqualTo(volume);

    }

}