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

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

VolumeControl: Enforce missing Privilege 

Bug: 319174144
Test: m Bluetooth
Flag: Exempt, simple permission check
Change-Id: I0010ed4793e4b89180327742b9860e6f29fa89e2
parent f41566df

android/app/aidl/android/bluetooth/IBluetoothVolumeControl.aidl

+3 −3
Original line number Diff line number Diff line
@@ -48,9 +48,9 @@ oneway interface IBluetoothVolumeControl { 
    @JavaPassthrough(annotation="@android.annotation.RequiresPermission(allOf={android.Manifest.permission.BLUETOOTH_CONNECT,android.Manifest.permission.BLUETOOTH_PRIVILEGED})")

    void getConnectionPolicy(in BluetoothDevice device, in AttributionSource attributionSource, in SynchronousResultReceiver receiver);



    @JavaPassthrough(annotation="@android.annotation.RequiresPermission(android.Manifest.permission.BLUETOOTH_CONNECT)")

    @JavaPassthrough(annotation="@android.annotation.RequiresPermission(allOf={android.Manifest.permission.BLUETOOTH_CONNECT,android.Manifest.permission.BLUETOOTH_PRIVILEGED})")

    void isVolumeOffsetAvailable(in BluetoothDevice device, in AttributionSource attributionSource, in SynchronousResultReceiver receiver);

    @JavaPassthrough(annotation="@android.annotation.RequiresPermission(android.Manifest.permission.BLUETOOTH_CONNECT)")

    @JavaPassthrough(annotation="@android.annotation.RequiresPermission(allOf={android.Manifest.permission.BLUETOOTH_CONNECT,android.Manifest.permission.BLUETOOTH_PRIVILEGED})")

    void setVolumeOffset(in BluetoothDevice device, int volumeOffset, in AttributionSource attributionSource, in SynchronousResultReceiver receiver);

    @JavaPassthrough(annotation="@android.annotation.RequiresPermission(android.Manifest.permission.BLUETOOTH_CONNECT)")

    void setGroupVolume(int group_id, int volume, in AttributionSource attributionSource, in SynchronousResultReceiver receiver);
@@ -58,7 +58,7 @@ oneway interface IBluetoothVolumeControl { 
    void getGroupVolume(int group_id, in AttributionSource attributionSource, in SynchronousResultReceiver receiver);

    @JavaPassthrough(annotation="@android.annotation.RequiresPermission(android.Manifest.permission.BLUETOOTH_CONNECT)")

    void setGroupActive(int group_id, boolean active, in AttributionSource attributionSource, in SynchronousResultReceiver receiver);

    @JavaPassthrough(annotation="@android.annotation.RequiresPermission(android.Manifest.permission.BLUETOOTH_CONNECT)")

    @JavaPassthrough(annotation="@android.annotation.RequiresPermission(allOf={android.Manifest.permission.BLUETOOTH_CONNECT,android.Manifest.permission.BLUETOOTH_PRIVILEGED})")

    void setDeviceVolume(in BluetoothDevice device, int volume, boolean isGroupOp, in AttributionSource attributionSource, in SynchronousResultReceiver receiver);



    @JavaPassthrough(annotation="@android.annotation.RequiresPermission(android.Manifest.permission.BLUETOOTH_CONNECT)")

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

+3 −0
Original line number Diff line number Diff line
@@ -1570,6 +1570,7 @@ public class VolumeControlService extends ProfileService { 
                boolean defaultValue = false;

                VolumeControlService service = getService(source);

                if (service != null) {

                    enforceBluetoothPrivilegedPermission(service);

                    defaultValue = service.isVolumeOffsetAvailable(device);

                }

                receiver.send(defaultValue);
@@ -1588,6 +1589,7 @@ public class VolumeControlService extends ProfileService { 


                VolumeControlService service = getService(source);

                if (service != null) {

                    enforceBluetoothPrivilegedPermission(service);

                    service.setVolumeOffset(device, volumeOffset);

                }

                receiver.send(null);
@@ -1610,6 +1612,7 @@ public class VolumeControlService extends ProfileService { 


                VolumeControlService service = getService(source);

                if (service != null) {

                    enforceBluetoothPrivilegedPermission(service);

                    service.setDeviceVolume(device, volume, isGroupOp);

                }

                receiver.send(null);