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

Commit d9d8604b authored by Sungsoo Lim's avatar Sungsoo Lim Committed by Automerger Merge Worker
Browse files

Merge "Fix LeAudioService permission check" am: 536195a1 am: f75dd2ac am:... 

Merge "Fix LeAudioService permission check" am: 536195a1 am: f75dd2ac am: 467ac216 am: c1254629

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



Change-Id: If9670f82119f669832c6eecfedeebf4c49f64117
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 921825aa c1254629

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

+8 −1
Original line number Diff line number Diff line
@@ -2268,6 +2268,7 @@ public class LeAudioService extends ProfileService { 
                LeAudioService service = getService(source);

                int result = BluetoothLeAudio.AUDIO_LOCATION_INVALID;

                if (service != null) {

                    enforceBluetoothPrivilegedPermission(service);

                    result = service.getAudioLocation(device);

                }

                receiver.send(result);
@@ -2287,6 +2288,7 @@ public class LeAudioService extends ProfileService { 
                LeAudioService service = getService(source);

                boolean result = false;

                if (service != null) {

                    enforceBluetoothPrivilegedPermission(service);

                    result = service.setConnectionPolicy(device, connectionPolicy);

                }

                receiver.send(result);
@@ -2350,7 +2352,6 @@ public class LeAudioService extends ProfileService { 
                if (service == null) {

                    throw new IllegalStateException("service is null");

                }

                enforceBluetoothPrivilegedPermission(service);

                result = service.getGroupId(device);

                receiver.send(result);

            } catch (RuntimeException e) {
@@ -2510,6 +2511,7 @@ public class LeAudioService extends ProfileService { 
                byte[] broadcastCode, AttributionSource source) {

            LeAudioService service = getService(source);

            if (service != null) {

                enforceBluetoothPrivilegedPermission(service);

                service.createBroadcast(contentMetadata, broadcastCode);

            }

        }
@@ -2518,6 +2520,7 @@ public class LeAudioService extends ProfileService { 
        public void stopBroadcast(int broadcastId, AttributionSource source) {

            LeAudioService service = getService(source);

            if (service != null) {

                enforceBluetoothPrivilegedPermission(service);

                service.stopBroadcast(broadcastId);

            }

        }
@@ -2527,6 +2530,7 @@ public class LeAudioService extends ProfileService { 
                BluetoothLeAudioContentMetadata contentMetadata, AttributionSource source) {

            LeAudioService service = getService(source);

            if (service != null) {

                enforceBluetoothPrivilegedPermission(service);

                service.updateBroadcast(broadcastId, contentMetadata);

            }

        }
@@ -2538,6 +2542,7 @@ public class LeAudioService extends ProfileService { 
                boolean result = false;

                LeAudioService service = getService(source);

                if (service != null) {

                    enforceBluetoothPrivilegedPermission(service);

                    result = service.isPlaying(broadcastId);

                }

                receiver.send(result);
@@ -2553,6 +2558,7 @@ public class LeAudioService extends ProfileService { 
                List<BluetoothLeBroadcastMetadata> result = new ArrayList<>();

                LeAudioService service = getService(source);

                if (service != null) {

                    enforceBluetoothPrivilegedPermission(service);

                    result = service.getAllBroadcastMetadata();

                }

                receiver.send(result);
@@ -2568,6 +2574,7 @@ public class LeAudioService extends ProfileService { 
                int result = 0;

                LeAudioService service = getService(source);

                if (service != null) {

                    enforceBluetoothPrivilegedPermission(service);

                    result = service.getMaximumNumberOfBroadcasts();

                }

                receiver.send(result);