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

Commit b10287b7 authored by William Escande's avatar William Escande Committed by Gerrit Code Review
Browse files

Merge changes I8f86ae8c,I0010ed47,Ia1db7171 into main 

* changes:
  VolumeControl: fix aidl permission annotation
  VolumeControl: Enforce missing Privilege
  VolumeControl: Enforce Privilege within binder
parents 41195410 686c9368

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

+6 −6
Original line number Diff line number Diff line
@@ -37,20 +37,20 @@ oneway interface IBluetoothVolumeControl { 
    void connect(in BluetoothDevice device, in AttributionSource attributionSource, in SynchronousResultReceiver receiver);

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

    void disconnect(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 getConnectedDevices(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 getDevicesMatchingConnectionStates(in int[] states, 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 getConnectionState(in BluetoothDevice device, in AttributionSource attributionSource, in SynchronousResultReceiver receiver);

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

    void setConnectionPolicy(in BluetoothDevice device, int connectionPolicy, in AttributionSource attributionSource, in SynchronousResultReceiver receiver);

    @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

+5 −9
Original line number Diff line number Diff line
@@ -426,10 +426,7 @@ public class VolumeControlService extends ProfileService { 
        return true;

    }



    @RequiresPermission(android.Manifest.permission.BLUETOOTH_PRIVILEGED)

    public List<BluetoothDevice> getConnectedDevices() {

        enforceCallingOrSelfPermission(BLUETOOTH_PRIVILEGED,

                "Need BLUETOOTH_PRIVILEGED permission");

        synchronized (mStateMachines) {

            List<BluetoothDevice> devices = new ArrayList<>();

            for (VolumeControlStateMachine sm : mStateMachines.values()) {
@@ -555,10 +552,7 @@ public class VolumeControlService extends ProfileService { 
     * @param connectionPolicy is the connection policy to set to for this profile

     * @return true on success, otherwise false

     */

    @RequiresPermission(android.Manifest.permission.BLUETOOTH_PRIVILEGED)

    public boolean setConnectionPolicy(BluetoothDevice device, int connectionPolicy) {

        enforceCallingOrSelfPermission(BLUETOOTH_PRIVILEGED,

                "Need BLUETOOTH_PRIVILEGED permission");

        if (DBG) {

            Log.d(TAG, "Saved connectionPolicy " + device + " = " + connectionPolicy);

        }
@@ -572,10 +566,7 @@ public class VolumeControlService extends ProfileService { 
        return true;

    }



    @RequiresPermission(android.Manifest.permission.BLUETOOTH_PRIVILEGED)

    public int getConnectionPolicy(BluetoothDevice device) {

        enforceCallingOrSelfPermission(BLUETOOTH_PRIVILEGED,

                "Need BLUETOOTH_PRIVILEGED permission");

        return mDatabaseManager.getProfileConnectionPolicy(device, BluetoothProfile.VOLUME_CONTROL);

    }
@@ -1539,6 +1530,7 @@ public class VolumeControlService extends ProfileService { 
                VolumeControlService service = getService(source);

                boolean defaultValue = false;

                if (service != null) {

                    enforceBluetoothPrivilegedPermission(service);

                    defaultValue = service.setConnectionPolicy(device, connectionPolicy);

                }

                receiver.send(defaultValue);
@@ -1558,6 +1550,7 @@ public class VolumeControlService extends ProfileService { 
                VolumeControlService service = getService(source);

                int defaultValue = BluetoothProfile.CONNECTION_POLICY_UNKNOWN;

                if (service != null) {

                    enforceBluetoothPrivilegedPermission(service);

                    defaultValue = service.getConnectionPolicy(device);

                }

                receiver.send(defaultValue);
@@ -1577,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);
@@ -1595,6 +1589,7 @@ public class VolumeControlService extends ProfileService { 


                VolumeControlService service = getService(source);

                if (service != null) {

                    enforceBluetoothPrivilegedPermission(service);

                    service.setVolumeOffset(device, volumeOffset);

                }

                receiver.send(null);
@@ -1617,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);