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

Commit d1b42a96 authored by Jack He's avatar Jack He Committed by Automerger Merge Worker
Browse files

Merge changes from topic "ble-broadcast-api-feedback" am: c9e3ca8e 

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

Change-Id: I9d0c043c22bead3160b8a852770b1f4a894e5b78
parents 410d0375 c9e3ca8e

android/app/src/com/android/bluetooth/csip/CsipSetCoordinatorService.java

+6 −6
Original line number Diff line number Diff line
@@ -485,7 +485,7 @@ public class CsipSetCoordinatorService extends ProfileService { 
     *

     * @hide

     */

    public @Nullable UUID groupLock(

    public @Nullable UUID lockGroup(

            int groupId, @NonNull IBluetoothCsipSetCoordinatorLockCallback callback) {

        if (callback == null) {

            return null;
@@ -517,7 +517,7 @@ public class CsipSetCoordinatorService extends ProfileService { 
     *

     * @hide

     */

    public void groupUnlock(@NonNull UUID lockUuid) {

    public void unlockGroup(@NonNull UUID lockUuid) {

        if (lockUuid == null) {

            return;

        }
@@ -982,14 +982,14 @@ public class CsipSetCoordinatorService extends ProfileService { 
        }



        @Override

        public void groupLock(

        public void lockGroup(

                int groupId, @NonNull IBluetoothCsipSetCoordinatorLockCallback callback,

                AttributionSource source, SynchronousResultReceiver receiver) {

            try {

                ParcelUuid defaultValue = null;

                CsipSetCoordinatorService service = getService(source);

                if (service != null) {

                     UUID lockUuid = service.groupLock(groupId, callback);

                    UUID lockUuid = service.lockGroup(groupId, callback);

                    defaultValue = lockUuid == null ? null : new ParcelUuid(lockUuid);

                }

                receiver.send(defaultValue);
@@ -999,12 +999,12 @@ public class CsipSetCoordinatorService extends ProfileService { 
        }



        @Override

        public void groupUnlock(@NonNull ParcelUuid lockUuid, AttributionSource source,

        public void unlockGroup(@NonNull ParcelUuid lockUuid, AttributionSource source,

                SynchronousResultReceiver receiver) {

            try {

                CsipSetCoordinatorService service = getService(source);

                if (service != null) {

                    service.groupUnlock(lockUuid.getUuid());

                    service.unlockGroup(lockUuid.getUuid());

                }

                receiver.send(null);

            } catch (RuntimeException e) {

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

+3 −3
Original line number Diff line number Diff line
@@ -667,7 +667,7 @@ public class LeAudioService extends ProfileService { 
     * Get the maximum number of supported simultaneous broadcasts.

     * @return number of supported simultaneous broadcasts

     */

    public int getMaximumNumberOfBroadcast() {

    public int getMaximumNumberOfBroadcasts() {

        /* TODO: This is currently fixed to 1 */

        return 1;

    }
@@ -2127,13 +2127,13 @@ public class LeAudioService extends ProfileService { 
        }



        @Override

        public void getMaximumNumberOfBroadcast(AttributionSource source,

        public void getMaximumNumberOfBroadcasts(AttributionSource source,

                SynchronousResultReceiver receiver) {

            try {

                int defaultValue = 0;

                LeAudioService service = getService(source);

                if (service != null) {

                    defaultValue = service.getMaximumNumberOfBroadcast();

                    defaultValue = service.getMaximumNumberOfBroadcasts();

                }

                receiver.send(defaultValue);

            } catch (RuntimeException e) {

android/app/tests/unit/src/com/android/bluetooth/csip/CsipSetCoordinatorServiceTest.java

+4 −4
Original line number Diff line number Diff line
@@ -252,7 +252,7 @@ public class CsipSetCoordinatorServiceTest { 
    public void testGroupLockSetNative() {

        int group = 0x02;



        UUID lock_uuid = mService.groupLock(group, mCsipSetCoordinatorLockCallback);

        UUID lock_uuid = mService.lockGroup(group, mCsipSetCoordinatorLockCallback);

        Assert.assertNotNull(lock_uuid);

        verify(mCsipSetCoordinatorNativeInterface, times(1)).groupLockSet(eq(group), eq(true));
@@ -270,7 +270,7 @@ public class CsipSetCoordinatorServiceTest { 
            throw e.rethrowFromSystemServer();

        }



        mService.groupUnlock(lock_uuid);

        mService.unlockGroup(lock_uuid);

        verify(mCsipSetCoordinatorNativeInterface, times(1)).groupLockSet(eq(group), eq(false));



        mCsipSetCoordinatorNativeInterface.onGroupLockChanged(
@@ -293,11 +293,11 @@ public class CsipSetCoordinatorServiceTest { 
    public void testGroupExclusiveLockSet() {

        int group = 0x02;



        UUID lock_uuid = mService.groupLock(group, mCsipSetCoordinatorLockCallback);

        UUID lock_uuid = mService.lockGroup(group, mCsipSetCoordinatorLockCallback);

        verify(mCsipSetCoordinatorNativeInterface, times(1)).groupLockSet(eq(group), eq(true));

        Assert.assertNotNull(lock_uuid);



        lock_uuid = mService.groupLock(group, mCsipSetCoordinatorLockCallback);

        lock_uuid = mService.lockGroup(group, mCsipSetCoordinatorLockCallback);

        verify(mCsipSetCoordinatorNativeInterface, times(1)).groupLockSet(eq(group), eq(true));



        doCallRealMethod()

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

+2 −2
Original line number Diff line number Diff line
@@ -154,7 +154,7 @@ public class LeAudioBroadcastServiceTest { 


        BluetoothLeAudioContentMetadata.Builder meta_builder =

                new BluetoothLeAudioContentMetadata.Builder();

        meta_builder.setLanguage("EN");

        meta_builder.setLanguage("deu");

        meta_builder.setProgramInfo("Public broadcast info");

        BluetoothLeAudioContentMetadata meta = meta_builder.build();

        mService.createBroadcast(meta, code);
@@ -170,7 +170,7 @@ public class LeAudioBroadcastServiceTest { 


        BluetoothLeAudioContentMetadata.Builder meta_builder =

        new BluetoothLeAudioContentMetadata.Builder();

        meta_builder.setLanguage("EN");

        meta_builder.setLanguage("eng");

        meta_builder.setProgramInfo("Public broadcast info");

        BluetoothLeAudioContentMetadata meta = meta_builder.build();

        mService.createBroadcast(meta, code);

framework/api/system-current.txt

+3 −3
Original line number Diff line number Diff line
@@ -116,9 +116,9 @@ package android.bluetooth { 
    method @NonNull @RequiresPermission(android.Manifest.permission.BLUETOOTH_PRIVILEGED) public java.util.List<java.lang.Integer> getAllGroupIds(@Nullable android.os.ParcelUuid);

    method @RequiresPermission(android.Manifest.permission.BLUETOOTH_PRIVILEGED) public int getConnectionPolicy(@Nullable android.bluetooth.BluetoothDevice);

    method @NonNull @RequiresPermission(android.Manifest.permission.BLUETOOTH_PRIVILEGED) public java.util.Map getGroupUuidMapByDevice(@Nullable android.bluetooth.BluetoothDevice);

    method @Nullable @RequiresPermission(android.Manifest.permission.BLUETOOTH_PRIVILEGED) public java.util.UUID groupLock(int, @Nullable java.util.concurrent.Executor, @Nullable android.bluetooth.BluetoothCsipSetCoordinator.ClientLockCallback);

    method @RequiresPermission(android.Manifest.permission.BLUETOOTH_PRIVILEGED) public boolean groupUnlock(@NonNull java.util.UUID);

    method @Nullable @RequiresPermission(android.Manifest.permission.BLUETOOTH_PRIVILEGED) public java.util.UUID lockGroup(int, @NonNull java.util.concurrent.Executor, @NonNull android.bluetooth.BluetoothCsipSetCoordinator.ClientLockCallback);

    method @RequiresPermission(android.Manifest.permission.BLUETOOTH_PRIVILEGED) public boolean setConnectionPolicy(@Nullable android.bluetooth.BluetoothDevice, int);

    method @RequiresPermission(android.Manifest.permission.BLUETOOTH_PRIVILEGED) public boolean unlockGroup(@NonNull java.util.UUID);

    field @RequiresPermission(android.Manifest.permission.BLUETOOTH_PRIVILEGED) public static final String ACTION_CSIS_DEVICE_AVAILABLE = "android.bluetooth.action.CSIS_DEVICE_AVAILABLE";

    field @RequiresPermission(android.Manifest.permission.BLUETOOTH_PRIVILEGED) public static final String ACTION_CSIS_SET_MEMBER_AVAILABLE = "android.bluetooth.action.CSIS_SET_MEMBER_AVAILABLE";

    field public static final String EXTRA_CSIS_GROUP_ID = "android.bluetooth.extra.CSIS_GROUP_ID";
@@ -384,7 +384,7 @@ package android.bluetooth { 


  public final class BluetoothLeBroadcast implements java.lang.AutoCloseable android.bluetooth.BluetoothProfile {

    method @NonNull @RequiresPermission(allOf={android.Manifest.permission.BLUETOOTH_CONNECT, android.Manifest.permission.BLUETOOTH_PRIVILEGED}) public java.util.List<android.bluetooth.BluetoothLeBroadcastMetadata> getAllBroadcastMetadata();

    method @RequiresPermission(android.Manifest.permission.BLUETOOTH_PRIVILEGED) public int getMaximumNumberOfBroadcast();

    method @RequiresPermission(android.Manifest.permission.BLUETOOTH_PRIVILEGED) public int getMaximumNumberOfBroadcasts();

    method @RequiresPermission(allOf={android.Manifest.permission.BLUETOOTH_CONNECT, android.Manifest.permission.BLUETOOTH_PRIVILEGED}) public boolean isPlaying(int);

    method @RequiresPermission(allOf={android.Manifest.permission.BLUETOOTH_CONNECT, android.Manifest.permission.BLUETOOTH_PRIVILEGED}) public void registerCallback(@NonNull java.util.concurrent.Executor, @NonNull android.bluetooth.BluetoothLeBroadcast.Callback);

    method @RequiresPermission(allOf={android.Manifest.permission.BLUETOOTH_CONNECT, android.Manifest.permission.BLUETOOTH_PRIVILEGED}) public void startBroadcast(@NonNull android.bluetooth.BluetoothLeAudioContentMetadata, @Nullable byte[]);