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

Commit aa876f74 authored by Jeff Sharkey's avatar Jeff Sharkey
Browse files

Add missing Bluetooth API permission enforcement. 

Recent work has been using Error Prone rules and annotations to
reflect the current state of permission enforcement across the
Bluetooth stack, and we're now in a position were we can add new
permission enforcement that had been missing.

We've currently standardized on saying that APIs that return device
or Bluetooth state information (without sharing details about any
particular remote Bluetooth device) do not need to be permission
protected.

Bug: 183626724
Test: ./build/soong/soong_ui.bash --make-mode Bluetooth RUN_ERROR_PRONE=true
Change-Id: I83061527862ca8aad271a78c832e59bf904d9e0b
parent 03b2b7ec

system/binder/android/bluetooth/IBluetoothA2dpSink.aidl

+4 −0
Original line number Diff line number Diff line
@@ -29,9 +29,13 @@ interface IBluetoothA2dpSink { 
    boolean connect(in BluetoothDevice device);

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

    boolean disconnect(in BluetoothDevice device);

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

    List<BluetoothDevice> getConnectedDevices();

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

    List<BluetoothDevice> getDevicesMatchingConnectionStates(in int[] states);

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

    int getConnectionState(in BluetoothDevice device);

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

    BluetoothAudioConfig getAudioConfig(in BluetoothDevice device);

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

    boolean setConnectionPolicy(in BluetoothDevice device, int connectionPolicy);

system/binder/android/bluetooth/IBluetoothAvrcpController.aidl

+6 −0
Original line number Diff line number Diff line
@@ -27,10 +27,16 @@ import android.media.session.PlaybackState; 
 * @hide

 */

interface IBluetoothAvrcpController {

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

    List<BluetoothDevice> getConnectedDevices();

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

    List<BluetoothDevice> getDevicesMatchingConnectionStates(in int[] states);

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

    int getConnectionState(in BluetoothDevice device);

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

    BluetoothAvrcpPlayerSettings getPlayerSettings(in BluetoothDevice device);

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

    boolean setPlayerApplicationSetting(in BluetoothAvrcpPlayerSettings plAppSetting);

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

    void sendGroupNavigationCmd(in BluetoothDevice device, int keyCode, int keyState);

}

system/binder/android/bluetooth/IBluetoothHeadsetClient.aidl

+4 −0
Original line number Diff line number Diff line
@@ -71,14 +71,18 @@ interface IBluetoothHeadsetClient { 


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

    boolean sendDTMF(in BluetoothDevice device, byte code);

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

    boolean getLastVoiceTagNumber(in BluetoothDevice device);



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

    int getAudioState(in BluetoothDevice device);

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

    boolean connectAudio(in BluetoothDevice device);

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

    boolean disconnectAudio(in BluetoothDevice device);

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

    void setAudioRouteAllowed(in BluetoothDevice device, boolean allowed);

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

    boolean getAudioRouteAllowed(in BluetoothDevice device);

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

    boolean sendVendorAtCommand(in BluetoothDevice device, int vendorId, String atCommand);

system/binder/android/bluetooth/IBluetoothHearingAid.aidl

+3 −0
Original line number Diff line number Diff line
@@ -43,6 +43,7 @@ interface IBluetoothHearingAid { 
    boolean setConnectionPolicy(in BluetoothDevice device, int connectionPolicy);

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

    int getConnectionPolicy(in BluetoothDevice device);

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

    void setVolume(int volume);



    const int HI_SYNC_ID_INVALID = 0;
@@ -51,9 +52,11 @@ interface IBluetoothHearingAid { 


    const int SIDE_LEFT = 0;

    const int SIDE_RIGHT = 1;

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

    int getDeviceSide(in BluetoothDevice device);



    const int MODE_MONAURAL = 0;

    const int MODE_BINAURAL = 1;

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

    int getDeviceMode(in BluetoothDevice device);

}

system/binder/android/bluetooth/IBluetoothLeAudio.aidl

+2 −0
Original line number Diff line number Diff line
@@ -38,6 +38,7 @@ interface IBluetoothLeAudio { 
    int getConnectionState(in BluetoothDevice device);

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

    boolean setActiveDevice(in BluetoothDevice device);

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

    List<BluetoothDevice> getActiveDevices();

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

    boolean setConnectionPolicy(in BluetoothDevice device, int connectionPolicy);
@@ -50,6 +51,7 @@ interface IBluetoothLeAudio { 
     * Get device group id. Devices with same group id belong to same group (i.e left and right

     * earbud)

     */

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

    int getGroupId(in BluetoothDevice device);



}