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

Commit 221ccdf4 authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "API Review: Update api for S+: Throw / Privileged" am: 2987f418 am:... 

Merge "API Review: Update api for S+: Throw / Privileged" am: 2987f418 am: 5c984657 am: 48e2221a am: 3d8f9642

Original change: https://android-review.googlesource.com/c/platform/packages/modules/Bluetooth/+/2038685



Change-Id: I419e4e048f5094594072cecd10ef3daeda35c2a4
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents c6a2a961 3d8f9642

android/app/src/com/android/bluetooth/a2dp/A2dpService.java

+33 −2
Original line number Diff line number Diff line
@@ -18,6 +18,7 @@ package com.android.bluetooth.a2dp; 


import static android.Manifest.permission.BLUETOOTH_CONNECT;



import static com.android.bluetooth.Utils.checkCallerTargetSdk;

import static com.android.bluetooth.Utils.enforceBluetoothPrivilegedPermission;



import android.annotation.RequiresPermission;
@@ -38,6 +39,7 @@ import android.content.Intent; 
import android.content.IntentFilter;

import android.media.AudioManager;

import android.media.BluetoothProfileConnectionInfo;

import android.os.Build;

import android.os.HandlerThread;

import android.util.Log;
@@ -1428,6 +1430,7 @@ public class A2dpService extends ProfileService { 
            if (service == null) {

                return;

            }

            enforceBluetoothPrivilegedPermission(service);

            service.setAvrcpAbsoluteVolume(volume);

        }
@@ -1453,6 +1456,10 @@ public class A2dpService extends ProfileService { 
                A2dpService service = getService(source);

                BluetoothCodecStatus codecStatus = null;

                if (service != null) {

                    if (checkCallerTargetSdk(mService, source.getPackageName(),

                                Build.VERSION_CODES.TIRAMISU)) {

                        enforceBluetoothPrivilegedPermission(service);

                    }

                    codecStatus = service.getCodecStatus(device);

                }

                receiver.send(codecStatus);
@@ -1468,6 +1475,10 @@ public class A2dpService extends ProfileService { 
            if (service == null) {

                return;

            }

            if (checkCallerTargetSdk(mService, source.getPackageName(),

                        Build.VERSION_CODES.TIRAMISU)) {

                enforceBluetoothPrivilegedPermission(service);

            }

            service.setCodecConfigPreference(device, codecConfig);

        }
@@ -1477,6 +1488,10 @@ public class A2dpService extends ProfileService { 
            if (service == null) {

                return;

            }

            if (checkCallerTargetSdk(mService, source.getPackageName(),

                        Build.VERSION_CODES.TIRAMISU)) {

                enforceBluetoothPrivilegedPermission(service);

            }

            service.enableOptionalCodecs(device);

        }
@@ -1486,16 +1501,24 @@ public class A2dpService extends ProfileService { 
            if (service == null) {

                return;

            }

            if (checkCallerTargetSdk(mService, source.getPackageName(),

                        Build.VERSION_CODES.TIRAMISU)) {

                enforceBluetoothPrivilegedPermission(service);

            }

            service.disableOptionalCodecs(device);

        }



        @Override

        public void supportsOptionalCodecs(BluetoothDevice device, AttributionSource source,

        public void isOptionalCodecsSupported(BluetoothDevice device, AttributionSource source,

                SynchronousResultReceiver receiver) {

            try {

                A2dpService service = getService(source);

                int codecSupport = BluetoothA2dp.OPTIONAL_CODECS_SUPPORT_UNKNOWN;

                if (service != null) {

                    if (checkCallerTargetSdk(mService, source.getPackageName(),

                                Build.VERSION_CODES.TIRAMISU)) {

                        enforceBluetoothPrivilegedPermission(service);

                    }

                    codecSupport = service.getSupportsOptionalCodecs(device);

                }

                receiver.send(codecSupport);
@@ -1505,12 +1528,16 @@ public class A2dpService extends ProfileService { 
        }



        @Override

        public void getOptionalCodecsEnabled(BluetoothDevice device, AttributionSource source,

        public void isOptionalCodecsEnabled(BluetoothDevice device, AttributionSource source,

                SynchronousResultReceiver receiver) {

            try {

                A2dpService service = getService(source);

                int optionalCodecEnabled = BluetoothA2dp.OPTIONAL_CODECS_PREF_UNKNOWN;

                if (service != null) {

                    if (checkCallerTargetSdk(mService, source.getPackageName(),

                                Build.VERSION_CODES.TIRAMISU)) {

                        enforceBluetoothPrivilegedPermission(service);

                    }

                    optionalCodecEnabled = service.getOptionalCodecsEnabled(device);

                }

                receiver.send(optionalCodecEnabled);
@@ -1526,6 +1553,10 @@ public class A2dpService extends ProfileService { 
            if (service == null) {

                return;

            }

            if (checkCallerTargetSdk(mService, source.getPackageName(),

                        Build.VERSION_CODES.TIRAMISU)) {

                enforceBluetoothPrivilegedPermission(service);

            }

            service.setOptionalCodecsEnabled(device, value);

        }

framework/api/system-current.txt

+7 −7
Original line number Diff line number Diff line
@@ -2,19 +2,19 @@ 
package android.bluetooth {



  public final class BluetoothA2dp implements android.bluetooth.BluetoothProfile {

    method @RequiresPermission(android.Manifest.permission.BLUETOOTH_CONNECT) public void disableOptionalCodecs(@NonNull android.bluetooth.BluetoothDevice);

    method @RequiresPermission(android.Manifest.permission.BLUETOOTH_CONNECT) public void enableOptionalCodecs(@NonNull android.bluetooth.BluetoothDevice);

    method @RequiresPermission(allOf={android.Manifest.permission.BLUETOOTH_CONNECT, android.Manifest.permission.BLUETOOTH_PRIVILEGED}) public void disableOptionalCodecs(@NonNull android.bluetooth.BluetoothDevice);

    method @RequiresPermission(allOf={android.Manifest.permission.BLUETOOTH_CONNECT, android.Manifest.permission.BLUETOOTH_PRIVILEGED}) public void enableOptionalCodecs(@NonNull android.bluetooth.BluetoothDevice);

    method @Nullable @RequiresPermission(allOf={android.Manifest.permission.BLUETOOTH_CONNECT, android.Manifest.permission.BLUETOOTH_PRIVILEGED}) public android.bluetooth.BufferConstraints getBufferConstraints();

    method @Nullable @RequiresPermission(android.Manifest.permission.BLUETOOTH_CONNECT) public android.bluetooth.BluetoothCodecStatus getCodecStatus(@NonNull android.bluetooth.BluetoothDevice);

    method @Nullable @RequiresPermission(allOf={android.Manifest.permission.BLUETOOTH_CONNECT, android.Manifest.permission.BLUETOOTH_PRIVILEGED}) public android.bluetooth.BluetoothCodecStatus getCodecStatus(@NonNull android.bluetooth.BluetoothDevice);

    method @RequiresPermission(allOf={android.Manifest.permission.BLUETOOTH_CONNECT, android.Manifest.permission.BLUETOOTH_PRIVILEGED}) public int getConnectionPolicy(@NonNull android.bluetooth.BluetoothDevice);

    method @RequiresPermission(allOf={android.Manifest.permission.BLUETOOTH_CONNECT, android.Manifest.permission.BLUETOOTH_PRIVILEGED}) public int getDynamicBufferSupport();

    method @RequiresPermission(android.Manifest.permission.BLUETOOTH_CONNECT) public int isOptionalCodecsEnabled(@NonNull android.bluetooth.BluetoothDevice);

    method @RequiresPermission(android.Manifest.permission.BLUETOOTH_CONNECT) public int isOptionalCodecsSupported(@NonNull android.bluetooth.BluetoothDevice);

    method @RequiresPermission(allOf={android.Manifest.permission.BLUETOOTH_CONNECT, android.Manifest.permission.BLUETOOTH_PRIVILEGED}) public int isOptionalCodecsEnabled(@NonNull android.bluetooth.BluetoothDevice);

    method @RequiresPermission(allOf={android.Manifest.permission.BLUETOOTH_CONNECT, android.Manifest.permission.BLUETOOTH_PRIVILEGED}) public int isOptionalCodecsSupported(@NonNull android.bluetooth.BluetoothDevice);

    method @RequiresPermission(allOf={android.Manifest.permission.BLUETOOTH_CONNECT, android.Manifest.permission.BLUETOOTH_PRIVILEGED}) public void setAvrcpAbsoluteVolume(int);

    method @RequiresPermission(allOf={android.Manifest.permission.BLUETOOTH_CONNECT, android.Manifest.permission.BLUETOOTH_PRIVILEGED}) public boolean setBufferLengthMillis(int, int);

    method @RequiresPermission(android.Manifest.permission.BLUETOOTH_CONNECT) public void setCodecConfigPreference(@NonNull android.bluetooth.BluetoothDevice, @NonNull android.bluetooth.BluetoothCodecConfig);

    method @RequiresPermission(allOf={android.Manifest.permission.BLUETOOTH_CONNECT, android.Manifest.permission.BLUETOOTH_PRIVILEGED}) public void setCodecConfigPreference(@NonNull android.bluetooth.BluetoothDevice, @NonNull android.bluetooth.BluetoothCodecConfig);

    method @RequiresPermission(allOf={android.Manifest.permission.BLUETOOTH_CONNECT, android.Manifest.permission.BLUETOOTH_PRIVILEGED}) public boolean setConnectionPolicy(@NonNull android.bluetooth.BluetoothDevice, int);

    method @RequiresPermission(android.Manifest.permission.BLUETOOTH_CONNECT) public void setOptionalCodecsEnabled(@NonNull android.bluetooth.BluetoothDevice, int);

    method @RequiresPermission(allOf={android.Manifest.permission.BLUETOOTH_CONNECT, android.Manifest.permission.BLUETOOTH_PRIVILEGED}) public void setOptionalCodecsEnabled(@NonNull android.bluetooth.BluetoothDevice, int);

    field @RequiresPermission(android.Manifest.permission.BLUETOOTH_CONNECT) public static final String ACTION_ACTIVE_DEVICE_CHANGED = "android.bluetooth.a2dp.profile.action.ACTIVE_DEVICE_CHANGED";

    field @RequiresPermission(android.Manifest.permission.BLUETOOTH_CONNECT) public static final String ACTION_CODEC_CONFIG_CHANGED = "android.bluetooth.a2dp.profile.action.CODEC_CONFIG_CHANGED";

    field public static final int DYNAMIC_BUFFER_SUPPORT_A2DP_OFFLOAD = 1; // 0x1

framework/java/android/bluetooth/BluetoothA2dp.java

+37 −10
Original line number Diff line number Diff line
@@ -780,7 +780,10 @@ public final class BluetoothA2dp implements BluetoothProfile { 
    @Nullable

    @RequiresLegacyBluetoothPermission

    @RequiresBluetoothConnectPermission

    @RequiresPermission(android.Manifest.permission.BLUETOOTH_CONNECT)

    @RequiresPermission(allOf = {

            android.Manifest.permission.BLUETOOTH_CONNECT,

            android.Manifest.permission.BLUETOOTH_PRIVILEGED,

    })

    public BluetoothCodecStatus getCodecStatus(@NonNull BluetoothDevice device) {

        if (DBG) Log.d(TAG, "getCodecStatus(" + device + ")");

        verifyDeviceNotNull(device, "getCodecStatus");
@@ -812,7 +815,10 @@ public final class BluetoothA2dp implements BluetoothProfile { 
    @SystemApi

    @RequiresLegacyBluetoothPermission

    @RequiresBluetoothConnectPermission

    @RequiresPermission(android.Manifest.permission.BLUETOOTH_CONNECT)

    @RequiresPermission(allOf = {

            android.Manifest.permission.BLUETOOTH_CONNECT,

            android.Manifest.permission.BLUETOOTH_PRIVILEGED,

    })

    public void setCodecConfigPreference(@NonNull BluetoothDevice device,

                                         @NonNull BluetoothCodecConfig codecConfig) {

        if (DBG) Log.d(TAG, "setCodecConfigPreference(" + device + ")");
@@ -848,7 +854,10 @@ public final class BluetoothA2dp implements BluetoothProfile { 
    @SystemApi

    @RequiresLegacyBluetoothPermission

    @RequiresBluetoothConnectPermission

    @RequiresPermission(android.Manifest.permission.BLUETOOTH_CONNECT)

    @RequiresPermission(allOf = {

            android.Manifest.permission.BLUETOOTH_CONNECT,

            android.Manifest.permission.BLUETOOTH_PRIVILEGED,

    })

    public void enableOptionalCodecs(@NonNull BluetoothDevice device) {

        if (DBG) Log.d(TAG, "enableOptionalCodecs(" + device + ")");

        verifyDeviceNotNull(device, "enableOptionalCodecs");
@@ -870,7 +879,10 @@ public final class BluetoothA2dp implements BluetoothProfile { 
    @SystemApi

    @RequiresLegacyBluetoothPermission

    @RequiresBluetoothConnectPermission

    @RequiresPermission(android.Manifest.permission.BLUETOOTH_CONNECT)

    @RequiresPermission(allOf = {

            android.Manifest.permission.BLUETOOTH_CONNECT,

            android.Manifest.permission.BLUETOOTH_PRIVILEGED,

    })

    public void disableOptionalCodecs(@NonNull BluetoothDevice device) {

        if (DBG) Log.d(TAG, "disableOptionalCodecs(" + device + ")");

        verifyDeviceNotNull(device, "disableOptionalCodecs");
@@ -883,7 +895,10 @@ public final class BluetoothA2dp implements BluetoothProfile { 
     * @param device the remote Bluetooth device.

     * @param enable if true, enable the optional codecs, otherwise disable them

     */

    @RequiresPermission(android.Manifest.permission.BLUETOOTH_CONNECT)

    @RequiresPermission(allOf = {

            android.Manifest.permission.BLUETOOTH_CONNECT,

            android.Manifest.permission.BLUETOOTH_PRIVILEGED,

    })

    private void enableDisableOptionalCodecs(BluetoothDevice device, boolean enable) {

        final IBluetoothA2dp service = getService();

        if (service == null) {
@@ -914,7 +929,10 @@ public final class BluetoothA2dp implements BluetoothProfile { 
    @SystemApi

    @RequiresLegacyBluetoothAdminPermission

    @RequiresBluetoothConnectPermission

    @RequiresPermission(android.Manifest.permission.BLUETOOTH_CONNECT)

    @RequiresPermission(allOf = {

            android.Manifest.permission.BLUETOOTH_CONNECT,

            android.Manifest.permission.BLUETOOTH_PRIVILEGED,

    })

    public @OptionalCodecsSupportStatus int isOptionalCodecsSupported(

            @NonNull BluetoothDevice device) {

        if (DBG) log("isOptionalCodecsSupported(" + device + ")");
@@ -927,7 +945,7 @@ public final class BluetoothA2dp implements BluetoothProfile { 
        } else if (isEnabled() && isValidDevice(device)) {

            try {

                final SynchronousResultReceiver<Integer> recv = new SynchronousResultReceiver();

                service.supportsOptionalCodecs(device, mAttributionSource, recv);

                service.isOptionalCodecsSupported(device, mAttributionSource, recv);

                return recv.awaitResultNoInterrupt(getSyncTimeout()).getValue(defaultValue);

            } catch (RemoteException | TimeoutException e) {

                Log.e(TAG, e.toString() + "\n" + Log.getStackTraceString(new Throwable()));
@@ -948,7 +966,10 @@ public final class BluetoothA2dp implements BluetoothProfile { 
    @SystemApi

    @RequiresLegacyBluetoothAdminPermission

    @RequiresBluetoothConnectPermission

    @RequiresPermission(android.Manifest.permission.BLUETOOTH_CONNECT)

    @RequiresPermission(allOf = {

            android.Manifest.permission.BLUETOOTH_CONNECT,

            android.Manifest.permission.BLUETOOTH_PRIVILEGED,

    })

    public @OptionalCodecsPreferenceStatus int isOptionalCodecsEnabled(

            @NonNull BluetoothDevice device) {

        if (DBG) log("isOptionalCodecsEnabled(" + device + ")");
@@ -961,7 +982,7 @@ public final class BluetoothA2dp implements BluetoothProfile { 
        } else if (isEnabled() && isValidDevice(device)) {

            try {

                final SynchronousResultReceiver<Integer> recv = new SynchronousResultReceiver();

                service.getOptionalCodecsEnabled(device, mAttributionSource, recv);

                service.isOptionalCodecsEnabled(device, mAttributionSource, recv);

                return recv.awaitResultNoInterrupt(getSyncTimeout()).getValue(defaultValue);

            } catch (RemoteException | TimeoutException e) {

                Log.e(TAG, e.toString() + "\n" + Log.getStackTraceString(new Throwable()));
@@ -983,7 +1004,10 @@ public final class BluetoothA2dp implements BluetoothProfile { 
    @SystemApi

    @RequiresLegacyBluetoothAdminPermission

    @RequiresBluetoothConnectPermission

    @RequiresPermission(android.Manifest.permission.BLUETOOTH_CONNECT)

    @RequiresPermission(allOf = {

            android.Manifest.permission.BLUETOOTH_CONNECT,

            android.Manifest.permission.BLUETOOTH_PRIVILEGED,

    })

    public void setOptionalCodecsEnabled(@NonNull BluetoothDevice device,

            @OptionalCodecsPreferenceStatus int value) {

        if (DBG) log("setOptionalCodecsEnabled(" + device + ")");
@@ -992,6 +1016,9 @@ public final class BluetoothA2dp implements BluetoothProfile { 
                && value != BluetoothA2dp.OPTIONAL_CODECS_PREF_DISABLED

                && value != BluetoothA2dp.OPTIONAL_CODECS_PREF_ENABLED) {

            Log.e(TAG, "Invalid value passed to setOptionalCodecsEnabled: " + value);

            if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.TIRAMISU) {

                throw new IllegalArgumentException("Invalid codec preference");

            }

            return;

        }

        final IBluetoothA2dp service = getService();

system/binder/android/bluetooth/IBluetoothA2dp.aidl

+10 −10
Original line number Diff line number Diff line
@@ -66,23 +66,23 @@ oneway interface IBluetoothA2dp { 
    void getConnectionPolicy(in BluetoothDevice device, in AttributionSource attributionSource, in SynchronousResultReceiver receiver);

    @JavaPassthrough(annotation="@android.annotation.RequiresNoPermission")

    void isAvrcpAbsoluteVolumeSupported(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})")

    oneway void setAvrcpAbsoluteVolume(int volume, in AttributionSource attributionSource);

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

    void isA2dpPlaying(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 getCodecStatus(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})")

    oneway void setCodecConfigPreference(in BluetoothDevice device, in BluetoothCodecConfig codecConfig, in AttributionSource attributionSource);

    @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})")

    oneway void enableOptionalCodecs(in BluetoothDevice device, in AttributionSource attributionSource);

    @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})")

    oneway void disableOptionalCodecs(in BluetoothDevice device, in AttributionSource attributionSource);

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

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

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

    void getOptionalCodecsEnabled(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 isOptionalCodecsSupported(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 isOptionalCodecsEnabled(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})")

    oneway void setOptionalCodecsEnabled(in BluetoothDevice device, int value, in AttributionSource attributionSource);

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

    void getDynamicBufferSupport(in AttributionSource attributionSource, in SynchronousResultReceiver receiver);