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

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

Annotations for Bluetooth broadcast intents. 

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: I53ac7a4fe1dea57316048c3cac4fa237b6ba3d38
parent 69a12631

framework/java/android/bluetooth/BluetoothA2dp.java

+2 −0
Original line number Diff line number Diff line
@@ -104,6 +104,8 @@ public final class BluetoothA2dp implements BluetoothProfile { 
            "android.bluetooth.a2dp.profile.action.PLAYING_STATE_CHANGED";



    /** @hide */

    @RequiresBluetoothConnectPermission

    @RequiresPermission(android.Manifest.permission.BLUETOOTH_CONNECT)

    @SdkConstant(SdkConstantType.BROADCAST_INTENT_ACTION)

    public static final String ACTION_AVRCP_CONNECTION_STATE_CHANGED =

            "android.bluetooth.a2dp.profile.action.AVRCP_CONNECTION_STATE_CHANGED";

framework/java/android/bluetooth/BluetoothA2dpSink.java

+5 −1
Original line number Diff line number Diff line
@@ -19,8 +19,10 @@ package android.bluetooth; 
import android.Manifest;

import android.annotation.NonNull;

import android.annotation.RequiresPermission;

import android.annotation.SdkConstant;

import android.annotation.SuppressLint;

import android.annotation.SystemApi;

import android.annotation.SdkConstant.SdkConstantType;

import android.bluetooth.annotations.RequiresBluetoothConnectPermission;

import android.bluetooth.annotations.RequiresLegacyBluetoothAdminPermission;

import android.bluetooth.annotations.RequiresLegacyBluetoothPermission;
@@ -70,7 +72,9 @@ public final class BluetoothA2dpSink implements BluetoothProfile { 
     */

    @SystemApi

    @SuppressLint("ActionValue")

    @RequiresPermission(Manifest.permission.BLUETOOTH_PRIVILEGED)

    @RequiresBluetoothConnectPermission

    @RequiresPermission(Manifest.permission.BLUETOOTH_CONNECT)

    @SdkConstant(SdkConstantType.BROADCAST_INTENT_ACTION)

    public static final String ACTION_CONNECTION_STATE_CHANGED =

            "android.bluetooth.a2dp-sink.profile.action.CONNECTION_STATE_CHANGED";

framework/java/android/bluetooth/BluetoothAdapter.java

+10 −0
Original line number Diff line number Diff line
@@ -604,6 +604,7 @@ public final class BluetoothAdapter { 
     *

     * @hide

     */

    @SdkConstant(SdkConstantType.BROADCAST_INTENT_ACTION)

    @SystemApi public static final String ACTION_BLE_STATE_CHANGED =

            "android.bluetooth.adapter.action.BLE_STATE_CHANGED";
@@ -618,6 +619,9 @@ public final class BluetoothAdapter { 
     *

     * @hide

     */

    @RequiresBluetoothConnectPermission

    @RequiresPermission(android.Manifest.permission.BLUETOOTH_CONNECT)

    @SdkConstant(SdkConstantType.BROADCAST_INTENT_ACTION)

    public static final String ACTION_BLUETOOTH_ADDRESS_CHANGED =

            "android.bluetooth.adapter.action.BLUETOOTH_ADDRESS_CHANGED";
@@ -642,6 +646,9 @@ public final class BluetoothAdapter { 
     *

     * @hide

     */

    @RequiresBluetoothConnectPermission

    @RequiresPermission(android.Manifest.permission.BLUETOOTH_CONNECT)

    @SdkConstant(SdkConstantType.BROADCAST_INTENT_ACTION)

    public static final String ACTION_BLE_ACL_CONNECTED =

            "android.bluetooth.adapter.action.BLE_ACL_CONNECTED";
@@ -656,6 +663,9 @@ public final class BluetoothAdapter { 
     *

     * @hide

     */

    @RequiresBluetoothConnectPermission

    @RequiresPermission(android.Manifest.permission.BLUETOOTH_CONNECT)

    @SdkConstant(SdkConstantType.BROADCAST_INTENT_ACTION)

    public static final String ACTION_BLE_ACL_DISCONNECTED =

            "android.bluetooth.adapter.action.BLE_ACL_DISCONNECTED";

framework/java/android/bluetooth/BluetoothAvrcpController.java

+6 −0
Original line number Diff line number Diff line
@@ -17,7 +17,9 @@ 
package android.bluetooth;



import android.annotation.RequiresPermission;

import android.annotation.SdkConstant;

import android.annotation.SuppressLint;

import android.annotation.SdkConstant.SdkConstantType;

import android.bluetooth.annotations.RequiresBluetoothConnectPermission;

import android.bluetooth.annotations.RequiresLegacyBluetoothPermission;

import android.content.Context;
@@ -62,6 +64,7 @@ public final class BluetoothAvrcpController implements BluetoothProfile { 
    @RequiresLegacyBluetoothPermission

    @RequiresBluetoothConnectPermission

    @RequiresPermission(android.Manifest.permission.BLUETOOTH_CONNECT)

    @SdkConstant(SdkConstantType.BROADCAST_INTENT_ACTION)

    public static final String ACTION_CONNECTION_STATE_CHANGED =

            "android.bluetooth.avrcp-controller.profile.action.CONNECTION_STATE_CHANGED";
@@ -74,6 +77,9 @@ public final class BluetoothAvrcpController implements BluetoothProfile { 
     * most recent player setting. </li>

     * </ul>

     */

    @RequiresBluetoothConnectPermission

    @RequiresPermission(android.Manifest.permission.BLUETOOTH_CONNECT)

    @SdkConstant(SdkConstantType.BROADCAST_INTENT_ACTION)

    public static final String ACTION_PLAYER_SETTING =

            "android.bluetooth.avrcp-controller.profile.action.PLAYER_SETTING";

framework/java/android/bluetooth/BluetoothDevice.java

+18 −4
Original line number Diff line number Diff line
@@ -389,6 +389,8 @@ public final class BluetoothDevice implements Parcelable { 




    /** @hide */

    @RequiresBluetoothConnectPermission

    @RequiresPermission(android.Manifest.permission.BLUETOOTH_CONNECT)

    @SdkConstant(SdkConstantType.BROADCAST_INTENT_ACTION)

    @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553)

    public static final String ACTION_SDP_RECORD =
@@ -663,13 +665,15 @@ public final class BluetoothDevice implements Parcelable { 
     * <p> Always contains the extra field {@link #EXTRA_UUID}

     */

    @RequiresLegacyBluetoothAdminPermission

    @RequiresBluetoothScanPermission

    @RequiresPermission(android.Manifest.permission.BLUETOOTH_SCAN)

    @RequiresBluetoothConnectPermission

    @RequiresPermission(android.Manifest.permission.BLUETOOTH_CONNECT)

    @SdkConstant(SdkConstantType.BROADCAST_INTENT_ACTION)

    public static final String ACTION_UUID =

            "android.bluetooth.device.action.UUID";



    /** @hide */

    @RequiresBluetoothConnectPermission

    @RequiresPermission(android.Manifest.permission.BLUETOOTH_CONNECT)

    @SdkConstant(SdkConstantType.BROADCAST_INTENT_ACTION)

    public static final String ACTION_MAS_INSTANCE =

            "android.bluetooth.device.action.MAS_INSTANCE";
@@ -693,28 +697,36 @@ public final class BluetoothDevice implements Parcelable { 
     * Broadcast Action: This intent is used to broadcast PAIRING REQUEST

     */

    @RequiresLegacyBluetoothAdminPermission

    @RequiresBluetoothScanPermission

    @RequiresPermission(android.Manifest.permission.BLUETOOTH_SCAN)

    @RequiresBluetoothConnectPermission

    @RequiresPermission(android.Manifest.permission.BLUETOOTH_CONNECT)

    @SdkConstant(SdkConstantType.BROADCAST_INTENT_ACTION)

    public static final String ACTION_PAIRING_REQUEST =

            "android.bluetooth.device.action.PAIRING_REQUEST";

    /** @hide */

    @RequiresBluetoothConnectPermission

    @RequiresPermission(android.Manifest.permission.BLUETOOTH_CONNECT)

    @SdkConstant(SdkConstantType.BROADCAST_INTENT_ACTION)

    @UnsupportedAppUsage

    public static final String ACTION_PAIRING_CANCEL =

            "android.bluetooth.device.action.PAIRING_CANCEL";



    /** @hide */

    @RequiresBluetoothConnectPermission

    @RequiresPermission(android.Manifest.permission.BLUETOOTH_CONNECT)

    @SdkConstant(SdkConstantType.BROADCAST_INTENT_ACTION)

    public static final String ACTION_CONNECTION_ACCESS_REQUEST =

            "android.bluetooth.device.action.CONNECTION_ACCESS_REQUEST";



    /** @hide */

    @RequiresBluetoothConnectPermission

    @RequiresPermission(android.Manifest.permission.BLUETOOTH_CONNECT)

    @SdkConstant(SdkConstantType.BROADCAST_INTENT_ACTION)

    public static final String ACTION_CONNECTION_ACCESS_REPLY =

            "android.bluetooth.device.action.CONNECTION_ACCESS_REPLY";



    /** @hide */

    @RequiresBluetoothConnectPermission

    @RequiresPermission(android.Manifest.permission.BLUETOOTH_CONNECT)

    @SdkConstant(SdkConstantType.BROADCAST_INTENT_ACTION)

    public static final String ACTION_CONNECTION_ACCESS_CANCEL =

            "android.bluetooth.device.action.CONNECTION_ACCESS_CANCEL";
@@ -725,6 +737,8 @@ public final class BluetoothDevice implements Parcelable { 
     *

     * @hide

     */

    @RequiresBluetoothConnectPermission

    @RequiresPermission(android.Manifest.permission.BLUETOOTH_CONNECT)

    @SdkConstant(SdkConstantType.BROADCAST_INTENT_ACTION)

    @SystemApi

    public static final String ACTION_SILENCE_MODE_CHANGED =