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

Commit 95b4e6a7 authored by Jeff Sharkey's avatar Jeff Sharkey Committed by Android (Google) Code Review
Browse files

Merge "Add missing Bluetooth API permission enforcement." into sc-dev

parents 20ea7bab 655d691d

core/java/android/bluetooth/BluetoothA2dpSink.java

+8 −0
Original line number Diff line number Diff line
@@ -187,6 +187,8 @@ public final class BluetoothA2dpSink implements BluetoothProfile { 
     * @hide

     */

    @Override

    @RequiresBluetoothConnectPermission

    @RequiresPermission(android.Manifest.permission.BLUETOOTH_CONNECT)

    public List<BluetoothDevice> getConnectedDevices() {

        if (VDBG) log("getConnectedDevices()");

        final IBluetoothA2dpSink service = getService();
@@ -208,6 +210,8 @@ public final class BluetoothA2dpSink implements BluetoothProfile { 
     * @hide

     */

    @Override

    @RequiresBluetoothConnectPermission

    @RequiresPermission(android.Manifest.permission.BLUETOOTH_CONNECT)

    public List<BluetoothDevice> getDevicesMatchingConnectionStates(int[] states) {

        if (VDBG) log("getDevicesMatchingStates()");

        final IBluetoothA2dpSink service = getService();
@@ -229,6 +233,8 @@ public final class BluetoothA2dpSink implements BluetoothProfile { 
     * @hide

     */

    @Override

    @RequiresBluetoothConnectPermission

    @RequiresPermission(android.Manifest.permission.BLUETOOTH_CONNECT)

    public int getConnectionState(BluetoothDevice device) {

        if (VDBG) log("getState(" + device + ")");

        final IBluetoothA2dpSink service = getService();
@@ -256,6 +262,8 @@ public final class BluetoothA2dpSink implements BluetoothProfile { 
     * @hide

     */

    @RequiresLegacyBluetoothPermission

    @RequiresBluetoothConnectPermission

    @RequiresPermission(android.Manifest.permission.BLUETOOTH_CONNECT)

    public BluetoothAudioConfig getAudioConfig(BluetoothDevice device) {

        if (VDBG) log("getAudioConfig(" + device + ")");

        final IBluetoothA2dpSink service = getService();

core/java/android/bluetooth/BluetoothAvrcpController.java

+12 −0
Original line number Diff line number Diff line
@@ -117,6 +117,8 @@ public final class BluetoothAvrcpController implements BluetoothProfile { 
     * {@inheritDoc}

     */

    @Override

    @RequiresBluetoothConnectPermission

    @RequiresPermission(android.Manifest.permission.BLUETOOTH_CONNECT)

    public List<BluetoothDevice> getConnectedDevices() {

        if (VDBG) log("getConnectedDevices()");

        final IBluetoothAvrcpController service =
@@ -137,6 +139,8 @@ public final class BluetoothAvrcpController implements BluetoothProfile { 
     * {@inheritDoc}

     */

    @Override

    @RequiresBluetoothConnectPermission

    @RequiresPermission(android.Manifest.permission.BLUETOOTH_CONNECT)

    public List<BluetoothDevice> getDevicesMatchingConnectionStates(int[] states) {

        if (VDBG) log("getDevicesMatchingStates()");

        final IBluetoothAvrcpController service =
@@ -157,6 +161,8 @@ public final class BluetoothAvrcpController implements BluetoothProfile { 
     * {@inheritDoc}

     */

    @Override

    @RequiresBluetoothConnectPermission

    @RequiresPermission(android.Manifest.permission.BLUETOOTH_CONNECT)

    public int getConnectionState(BluetoothDevice device) {

        if (VDBG) log("getState(" + device + ")");

        final IBluetoothAvrcpController service =
@@ -178,6 +184,8 @@ public final class BluetoothAvrcpController implements BluetoothProfile { 
     *

     * @return the {@link BluetoothAvrcpPlayerSettings} or {@link null} if there is an error.

     */

    @RequiresBluetoothConnectPermission

    @RequiresPermission(android.Manifest.permission.BLUETOOTH_CONNECT)

    public BluetoothAvrcpPlayerSettings getPlayerSettings(BluetoothDevice device) {

        if (DBG) Log.d(TAG, "getPlayerSettings");

        BluetoothAvrcpPlayerSettings settings = null;
@@ -198,6 +206,8 @@ public final class BluetoothAvrcpController implements BluetoothProfile { 
     * Sets the player app setting for current player.

     * returns true in case setting is supported by remote, false otherwise

     */

    @RequiresBluetoothConnectPermission

    @RequiresPermission(android.Manifest.permission.BLUETOOTH_CONNECT)

    public boolean setPlayerApplicationSetting(BluetoothAvrcpPlayerSettings plAppSetting) {

        if (DBG) Log.d(TAG, "setPlayerApplicationSetting");

        final IBluetoothAvrcpController service =
@@ -218,6 +228,8 @@ public final class BluetoothAvrcpController implements BluetoothProfile { 
     * Send Group Navigation Command to Remote.

     * possible keycode values: next_grp, previous_grp defined above

     */

    @RequiresBluetoothConnectPermission

    @RequiresPermission(android.Manifest.permission.BLUETOOTH_CONNECT)

    public void sendGroupNavigationCmd(BluetoothDevice device, int keyCode, int keyState) {

        Log.d(TAG, "sendGroupNavigationCmd dev = " + device + " key " + keyCode + " State = "

                + keyState);

core/java/android/bluetooth/BluetoothHeadsetClient.java

+8 −0
Original line number Diff line number Diff line
@@ -1038,6 +1038,8 @@ public final class BluetoothHeadsetClient implements BluetoothProfile { 
     * #EXTRA_AG_FEATURE_ATTACH_NUMBER_TO_VT}. This method invocation will fail silently when

     * feature is not supported.</p>

     */

    @RequiresBluetoothConnectPermission

    @RequiresPermission(android.Manifest.permission.BLUETOOTH_CONNECT)

    public boolean getLastVoiceTagNumber(BluetoothDevice device) {

        if (DBG) log("getLastVoiceTagNumber()");

        final IBluetoothHeadsetClient service =
@@ -1059,6 +1061,8 @@ public final class BluetoothHeadsetClient implements BluetoothProfile { 
     * Note: This is an internal function and shouldn't be exposed

     */

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

    @RequiresBluetoothConnectPermission

    @RequiresPermission(android.Manifest.permission.BLUETOOTH_CONNECT)

    public int getAudioState(BluetoothDevice device) {

        if (VDBG) log("getAudioState");

        final IBluetoothHeadsetClient service =
@@ -1083,6 +1087,8 @@ public final class BluetoothHeadsetClient implements BluetoothProfile { 
     * @param allowed if routing is allowed to the device Note: This is an internal function and

     * shouldn't be exposed

     */

    @RequiresBluetoothConnectPermission

    @RequiresPermission(android.Manifest.permission.BLUETOOTH_CONNECT)

    public void setAudioRouteAllowed(BluetoothDevice device, boolean allowed) {

        if (VDBG) log("setAudioRouteAllowed");

        final IBluetoothHeadsetClient service =
@@ -1106,6 +1112,8 @@ public final class BluetoothHeadsetClient implements BluetoothProfile { 
     * @return whether the command succeeded Note: This is an internal function and shouldn't be

     * exposed

     */

    @RequiresBluetoothConnectPermission

    @RequiresPermission(android.Manifest.permission.BLUETOOTH_CONNECT)

    public boolean getAudioRouteAllowed(BluetoothDevice device) {

        if (VDBG) log("getAudioRouteAllowed");

        final IBluetoothHeadsetClient service =

core/java/android/bluetooth/BluetoothHearingAid.java

+6 −0
Original line number Diff line number Diff line
@@ -497,6 +497,8 @@ public final class BluetoothHearingAid implements BluetoothProfile { 
     * @param volume Absolute volume to be set on remote

     * @hide

     */

    @RequiresBluetoothConnectPermission

    @RequiresPermission(android.Manifest.permission.BLUETOOTH_CONNECT)

    public void setVolume(int volume) {

        if (DBG) Log.d(TAG, "setVolume(" + volume + ")");
@@ -556,6 +558,8 @@ public final class BluetoothHearingAid implements BluetoothProfile { 
     * @hide

     */

    @RequiresLegacyBluetoothPermission

    @RequiresBluetoothConnectPermission

    @RequiresPermission(android.Manifest.permission.BLUETOOTH_CONNECT)

    public int getDeviceSide(BluetoothDevice device) {

        if (VDBG) {

            log("getDeviceSide(" + device + ")");
@@ -582,6 +586,8 @@ public final class BluetoothHearingAid implements BluetoothProfile { 
     * @hide

     */

    @RequiresLegacyBluetoothPermission

    @RequiresBluetoothConnectPermission

    @RequiresPermission(android.Manifest.permission.BLUETOOTH_CONNECT)

    public int getDeviceMode(BluetoothDevice device) {

        if (VDBG) {

            log("getDeviceMode(" + device + ")");

core/java/android/bluetooth/BluetoothLeAudio.java

+4 −0
Original line number Diff line number Diff line
@@ -325,6 +325,8 @@ public final class BluetoothLeAudio implements BluetoothProfile, AutoCloseable { 
     */

    @NonNull

    @RequiresLegacyBluetoothPermission

    @RequiresBluetoothConnectPermission

    @RequiresPermission(android.Manifest.permission.BLUETOOTH_CONNECT)

    public List<BluetoothDevice> getActiveDevices() {

        if (VDBG) log("getActiveDevices()");

        try {
@@ -348,6 +350,8 @@ public final class BluetoothLeAudio implements BluetoothProfile, AutoCloseable { 
     * @hide

     */

    @RequiresLegacyBluetoothPermission

    @RequiresBluetoothConnectPermission

    @RequiresPermission(android.Manifest.permission.BLUETOOTH_CONNECT)

    public int getGroupId(@NonNull BluetoothDevice device) {

        if (VDBG) log("getGroupId()");

        try {