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

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

Merge "Fix LeAudioService permission check" am: 536195a1 

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



Change-Id: Ib06cf1c6adb1caacfa363e0c670c54e3ef196d6f
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents e49857d0 536195a1

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

+8 −1
Original line number Diff line number Diff line
@@ -2225,6 +2225,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);
@@ -2244,6 +2245,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);
@@ -2307,7 +2309,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) {
@@ -2467,6 +2468,7 @@ public class LeAudioService extends ProfileService { 
                byte[] broadcastCode, AttributionSource source) {

            LeAudioService service = getService(source);

            if (service != null) {

                enforceBluetoothPrivilegedPermission(service);

                service.createBroadcast(contentMetadata, broadcastCode);

            }

        }
@@ -2475,6 +2477,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);

            }

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

            LeAudioService service = getService(source);

            if (service != null) {

                enforceBluetoothPrivilegedPermission(service);

                service.updateBroadcast(broadcastId, contentMetadata);

            }

        }
@@ -2495,6 +2499,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);
@@ -2510,6 +2515,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);
@@ -2525,6 +2531,7 @@ public class LeAudioService extends ProfileService { 
                int result = 0;

                LeAudioService service = getService(source);

                if (service != null) {

                    enforceBluetoothPrivilegedPermission(service);

                    result = service.getMaximumNumberOfBroadcasts();

                }

                receiver.send(result);