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

Commit 68e41e54 authored by Xin Li's avatar Xin Li
Browse files

Merge Android 12 

Bug: 202323961
Merged-In: Iba1443da42161f4a41830081f2e1985b30444cc0
Change-Id: I2bebe60bb7114706a3ba6af35522268cdf031f41
parents 7151fef2 faffc6e4

framework/java/android/bluetooth/BluetoothA2dp.java

+133 −54
Original line number Diff line number Diff line
@@ -20,11 +20,17 @@ import android.Manifest; 
import android.annotation.IntDef;

import android.annotation.NonNull;

import android.annotation.Nullable;

import android.annotation.RequiresNoPermission;

import android.annotation.RequiresPermission;

import android.annotation.SdkConstant;

import android.annotation.SdkConstant.SdkConstantType;

import android.annotation.SystemApi;

import android.bluetooth.annotations.RequiresBluetoothConnectPermission;

import android.bluetooth.annotations.RequiresLegacyBluetoothAdminPermission;

import android.bluetooth.annotations.RequiresLegacyBluetoothPermission;

import android.compat.annotation.UnsupportedAppUsage;

import android.content.Attributable;

import android.content.AttributionSource;

import android.content.Context;

import android.os.Binder;

import android.os.Build;
@@ -69,10 +75,10 @@ public final class BluetoothA2dp implements BluetoothProfile { 
     * <p>{@link #EXTRA_STATE} or {@link #EXTRA_PREVIOUS_STATE} can be any of

     * {@link #STATE_DISCONNECTED}, {@link #STATE_CONNECTING},

     * {@link #STATE_CONNECTED}, {@link #STATE_DISCONNECTING}.

     *

     * <p>Requires {@link android.Manifest.permission#BLUETOOTH} permission to

     * receive.

     */

    @RequiresLegacyBluetoothPermission

    @RequiresBluetoothConnectPermission

    @RequiresPermission(android.Manifest.permission.BLUETOOTH_CONNECT)

    @SdkConstant(SdkConstantType.BROADCAST_INTENT_ACTION)

    public static final String ACTION_CONNECTION_STATE_CHANGED =

            "android.bluetooth.a2dp.profile.action.CONNECTION_STATE_CHANGED";
@@ -90,15 +96,17 @@ public final class BluetoothA2dp implements BluetoothProfile { 
     *

     * <p>{@link #EXTRA_STATE} or {@link #EXTRA_PREVIOUS_STATE} can be any of

     * {@link #STATE_PLAYING}, {@link #STATE_NOT_PLAYING},

     *

     * <p>Requires {@link android.Manifest.permission#BLUETOOTH} permission to

     * receive.

     */

    @RequiresLegacyBluetoothPermission

    @RequiresBluetoothConnectPermission

    @RequiresPermission(android.Manifest.permission.BLUETOOTH_CONNECT)

    @SdkConstant(SdkConstantType.BROADCAST_INTENT_ACTION)

    public static final String ACTION_PLAYING_STATE_CHANGED =

            "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";
@@ -112,11 +120,11 @@ public final class BluetoothA2dp implements BluetoothProfile { 
     * be null if no device is active. </li>

     * </ul>

     *

     * <p>Requires {@link android.Manifest.permission#BLUETOOTH} permission to

     * receive.

     *

     * @hide

     */

    @RequiresLegacyBluetoothPermission

    @RequiresBluetoothConnectPermission

    @RequiresPermission(android.Manifest.permission.BLUETOOTH_CONNECT)

    @SdkConstant(SdkConstantType.BROADCAST_INTENT_ACTION)

    @UnsupportedAppUsage(trackingBug = 171933273)

    public static final String ACTION_ACTIVE_DEVICE_CHANGED =
@@ -133,11 +141,11 @@ public final class BluetoothA2dp implements BluetoothProfile { 
     * connected, otherwise it is not included.</li>

     * </ul>

     *

     * <p>Requires {@link android.Manifest.permission#BLUETOOTH} permission to

     * receive.

     *

     * @hide

     */

    @RequiresLegacyBluetoothPermission

    @RequiresBluetoothConnectPermission

    @RequiresPermission(android.Manifest.permission.BLUETOOTH_CONNECT)

    @SdkConstant(SdkConstantType.BROADCAST_INTENT_ACTION)

    @UnsupportedAppUsage(trackingBug = 181103983)

    public static final String ACTION_CODEC_CONFIG_CHANGED =
@@ -258,7 +266,8 @@ public final class BluetoothA2dp implements BluetoothProfile { 
    @SystemApi

    public static final int DYNAMIC_BUFFER_SUPPORT_A2DP_SOFTWARE_ENCODING = 2;



    private BluetoothAdapter mAdapter;

    private final BluetoothAdapter mAdapter;

    private final AttributionSource mAttributionSource;

    private final BluetoothProfileConnector<IBluetoothA2dp> mProfileConnector =

            new BluetoothProfileConnector(this, BluetoothProfile.A2DP, "BluetoothA2dp",

                    IBluetoothA2dp.class.getName()) {
@@ -272,8 +281,10 @@ public final class BluetoothA2dp implements BluetoothProfile { 
     * Create a BluetoothA2dp proxy object for interacting with the local

     * Bluetooth A2DP service.

     */

    /*package*/ BluetoothA2dp(Context context, ServiceListener listener) {

        mAdapter = BluetoothAdapter.getDefaultAdapter();

    /* package */ BluetoothA2dp(Context context, ServiceListener listener,

            BluetoothAdapter adapter) {

        mAdapter = adapter;

        mAttributionSource = adapter.getAttributionSource();

        mProfileConnector.connect(context, listener);

    }
@@ -307,7 +318,9 @@ public final class BluetoothA2dp implements BluetoothProfile { 
     * @return false on immediate error, true otherwise

     * @hide

     */

    @RequiresPermission(Manifest.permission.BLUETOOTH_ADMIN)

    @RequiresLegacyBluetoothAdminPermission

    @RequiresBluetoothConnectPermission

    @RequiresPermission(android.Manifest.permission.BLUETOOTH_CONNECT)

    @UnsupportedAppUsage

    public boolean connect(BluetoothDevice device) {

        if (DBG) log("connect(" + device + ")");
@@ -347,7 +360,9 @@ public final class BluetoothA2dp implements BluetoothProfile { 
     * @return false on immediate error, true otherwise

     * @hide

     */

    @RequiresPermission(Manifest.permission.BLUETOOTH_ADMIN)

    @RequiresLegacyBluetoothAdminPermission

    @RequiresBluetoothConnectPermission

    @RequiresPermission(android.Manifest.permission.BLUETOOTH_CONNECT)

    @UnsupportedAppUsage

    public boolean disconnect(BluetoothDevice device) {

        if (DBG) log("disconnect(" + device + ")");
@@ -368,12 +383,16 @@ public final class BluetoothA2dp implements BluetoothProfile { 
     * {@inheritDoc}

     */

    @Override

    @RequiresBluetoothConnectPermission

    @RequiresPermission(android.Manifest.permission.BLUETOOTH_CONNECT)

    public List<BluetoothDevice> getConnectedDevices() {

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

        try {

            final IBluetoothA2dp service = getService();

            if (service != null && isEnabled()) {

                return service.getConnectedDevices();

                return Attributable.setAttributionSource(

                        service.getConnectedDevicesWithAttribution(mAttributionSource),

                        mAttributionSource);

            }

            if (service == null) Log.w(TAG, "Proxy not attached to service");

            return new ArrayList<BluetoothDevice>();
@@ -387,12 +406,17 @@ public final class BluetoothA2dp implements BluetoothProfile { 
     * {@inheritDoc}

     */

    @Override

    @RequiresBluetoothConnectPermission

    @RequiresPermission(android.Manifest.permission.BLUETOOTH_CONNECT)

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

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

        try {

            final IBluetoothA2dp service = getService();

            if (service != null && isEnabled()) {

                return service.getDevicesMatchingConnectionStates(states);

                return Attributable.setAttributionSource(

                        service.getDevicesMatchingConnectionStatesWithAttribution(states,

                                mAttributionSource),

                        mAttributionSource);

            }

            if (service == null) Log.w(TAG, "Proxy not attached to service");

            return new ArrayList<BluetoothDevice>();
@@ -406,6 +430,8 @@ public final class BluetoothA2dp implements BluetoothProfile { 
     * {@inheritDoc}

     */

    @Override

    @RequiresBluetoothConnectPermission

    @RequiresPermission(android.Manifest.permission.BLUETOOTH_CONNECT)

    public @BtProfileState int getConnectionState(BluetoothDevice device) {

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

        try {
@@ -441,7 +467,9 @@ public final class BluetoothA2dp implements BluetoothProfile { 
     * @return false on immediate error, true otherwise

     * @hide

     */

    @RequiresPermission(Manifest.permission.BLUETOOTH_ADMIN)

    @RequiresLegacyBluetoothAdminPermission

    @RequiresBluetoothConnectPermission

    @RequiresPermission(android.Manifest.permission.BLUETOOTH_CONNECT)

    @UnsupportedAppUsage(trackingBug = 171933273)

    public boolean setActiveDevice(@Nullable BluetoothDevice device) {

        if (DBG) log("setActiveDevice(" + device + ")");
@@ -449,7 +477,7 @@ public final class BluetoothA2dp implements BluetoothProfile { 
            final IBluetoothA2dp service = getService();

            if (service != null && isEnabled()

                    && ((device == null) || isValidDevice(device))) {

                return service.setActiveDevice(device);

                return service.setActiveDevice(device, mAttributionSource);

            }

            if (service == null) Log.w(TAG, "Proxy not attached to service");

            return false;
@@ -468,13 +496,16 @@ public final class BluetoothA2dp implements BluetoothProfile { 
     */

    @UnsupportedAppUsage(trackingBug = 171933273)

    @Nullable

    @RequiresPermission(Manifest.permission.BLUETOOTH)

    @RequiresLegacyBluetoothPermission

    @RequiresBluetoothConnectPermission

    @RequiresPermission(android.Manifest.permission.BLUETOOTH_CONNECT)

    public BluetoothDevice getActiveDevice() {

        if (VDBG) log("getActiveDevice()");

        try {

            final IBluetoothA2dp service = getService();

            if (service != null && isEnabled()) {

                return service.getActiveDevice();

                return Attributable.setAttributionSource(

                        service.getActiveDevice(mAttributionSource), mAttributionSource);

            }

            if (service == null) Log.w(TAG, "Proxy not attached to service");

            return null;
@@ -495,7 +526,11 @@ public final class BluetoothA2dp implements BluetoothProfile { 
     * @return true if priority is set, false on error

     * @hide

     */

    @RequiresPermission(Manifest.permission.BLUETOOTH_PRIVILEGED)

    @RequiresBluetoothConnectPermission

    @RequiresPermission(allOf = {

            android.Manifest.permission.BLUETOOTH_CONNECT,

            android.Manifest.permission.BLUETOOTH_PRIVILEGED,

    })

    public boolean setPriority(BluetoothDevice device, int priority) {

        if (DBG) log("setPriority(" + device + ", " + priority + ")");

        return setConnectionPolicy(device, BluetoothAdapter.priorityToConnectionPolicy(priority));
@@ -514,7 +549,11 @@ public final class BluetoothA2dp implements BluetoothProfile { 
     * @hide

     */

    @SystemApi

    @RequiresPermission(Manifest.permission.BLUETOOTH_PRIVILEGED)

    @RequiresBluetoothConnectPermission

    @RequiresPermission(allOf = {

            android.Manifest.permission.BLUETOOTH_CONNECT,

            android.Manifest.permission.BLUETOOTH_PRIVILEGED,

    })

    public boolean setConnectionPolicy(@NonNull BluetoothDevice device,

            @ConnectionPolicy int connectionPolicy) {

        if (DBG) log("setConnectionPolicy(" + device + ", " + connectionPolicy + ")");
@@ -526,7 +565,7 @@ public final class BluetoothA2dp implements BluetoothProfile { 
                        && connectionPolicy != BluetoothProfile.CONNECTION_POLICY_ALLOWED) {

                    return false;

                }

                return service.setConnectionPolicy(device, connectionPolicy);

                return service.setConnectionPolicy(device, connectionPolicy, mAttributionSource);

            }

            if (service == null) Log.w(TAG, "Proxy not attached to service");

            return false;
@@ -546,7 +585,9 @@ public final class BluetoothA2dp implements BluetoothProfile { 
     * @return priority of the device

     * @hide

     */

    @RequiresPermission(Manifest.permission.BLUETOOTH)

    @RequiresLegacyBluetoothPermission

    @RequiresBluetoothConnectPermission

    @RequiresPermission(android.Manifest.permission.BLUETOOTH_CONNECT)

    @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.P, trackingBug = 115609023)

    public int getPriority(BluetoothDevice device) {

        if (VDBG) log("getPriority(" + device + ")");
@@ -554,7 +595,8 @@ public final class BluetoothA2dp implements BluetoothProfile { 
            final IBluetoothA2dp service = getService();

            if (service != null && isEnabled()

                    && isValidDevice(device)) {

                return BluetoothAdapter.connectionPolicyToPriority(service.getPriority(device));

                return BluetoothAdapter.connectionPolicyToPriority(

                        service.getPriority(device, mAttributionSource));

            }

            if (service == null) Log.w(TAG, "Proxy not attached to service");

            return BluetoothProfile.PRIORITY_OFF;
@@ -576,14 +618,18 @@ public final class BluetoothA2dp implements BluetoothProfile { 
     * @hide

     */

    @SystemApi

    @RequiresPermission(Manifest.permission.BLUETOOTH_PRIVILEGED)

    @RequiresBluetoothConnectPermission

    @RequiresPermission(allOf = {

            android.Manifest.permission.BLUETOOTH_CONNECT,

            android.Manifest.permission.BLUETOOTH_PRIVILEGED,

    })

    public @ConnectionPolicy int getConnectionPolicy(@NonNull BluetoothDevice device) {

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

        try {

            final IBluetoothA2dp service = getService();

            if (service != null && isEnabled()

                    && isValidDevice(device)) {

                return service.getConnectionPolicy(device);

                return service.getConnectionPolicy(device, mAttributionSource);

            }

            if (service == null) Log.w(TAG, "Proxy not attached to service");

            return BluetoothProfile.CONNECTION_POLICY_FORBIDDEN;
@@ -599,6 +645,7 @@ public final class BluetoothA2dp implements BluetoothProfile { 
     * @return true if device supports absolute volume

     * @hide

     */

    @RequiresNoPermission

    public boolean isAvrcpAbsoluteVolumeSupported() {

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

        try {
@@ -620,12 +667,14 @@ public final class BluetoothA2dp implements BluetoothProfile { 
     * @param volume Absolute volume to be set on AVRCP side

     * @hide

     */

    @RequiresBluetoothConnectPermission

    @RequiresPermission(android.Manifest.permission.BLUETOOTH_CONNECT)

    public void setAvrcpAbsoluteVolume(int volume) {

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

        try {

            final IBluetoothA2dp service = getService();

            if (service != null && isEnabled()) {

                service.setAvrcpAbsoluteVolume(volume);

                service.setAvrcpAbsoluteVolume(volume, mAttributionSource);

            }

            if (service == null) Log.w(TAG, "Proxy not attached to service");

        } catch (RemoteException e) {
@@ -636,16 +685,17 @@ public final class BluetoothA2dp implements BluetoothProfile { 
    /**

     * Check if A2DP profile is streaming music.

     *

     * <p>Requires {@link android.Manifest.permission#BLUETOOTH} permission.

     *

     * @param device BluetoothDevice device

     */

    @RequiresLegacyBluetoothPermission

    @RequiresBluetoothConnectPermission

    @RequiresPermission(android.Manifest.permission.BLUETOOTH_CONNECT)

    public boolean isA2dpPlaying(BluetoothDevice device) {

        try {

            final IBluetoothA2dp service = getService();

            if (service != null && isEnabled()

                    && isValidDevice(device)) {

                return service.isA2dpPlaying(device);

                return service.isA2dpPlaying(device, mAttributionSource);

            }

            if (service == null) Log.w(TAG, "Proxy not attached to service");

            return false;
@@ -662,6 +712,8 @@ public final class BluetoothA2dp implements BluetoothProfile { 
     *

     * @hide

     */

    @RequiresBluetoothConnectPermission

    @RequiresPermission(android.Manifest.permission.BLUETOOTH_CONNECT)

    public boolean shouldSendVolumeKeys(BluetoothDevice device) {

        if (isEnabled() && isValidDevice(device)) {

            ParcelUuid[] uuids = device.getUuids();
@@ -686,14 +738,16 @@ public final class BluetoothA2dp implements BluetoothProfile { 
     */

    @UnsupportedAppUsage(trackingBug = 181103983)

    @Nullable

    @RequiresPermission(Manifest.permission.BLUETOOTH)

    @RequiresLegacyBluetoothPermission

    @RequiresBluetoothConnectPermission

    @RequiresPermission(android.Manifest.permission.BLUETOOTH_CONNECT)

    public BluetoothCodecStatus getCodecStatus(@NonNull BluetoothDevice device) {

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

        verifyDeviceNotNull(device, "getCodecStatus");

        try {

            final IBluetoothA2dp service = getService();

            if (service != null && isEnabled()) {

                return service.getCodecStatus(device);

                return service.getCodecStatus(device, mAttributionSource);

            }

            if (service == null) {

                Log.w(TAG, "Proxy not attached to service");
@@ -714,7 +768,9 @@ public final class BluetoothA2dp implements BluetoothProfile { 
     * @hide

     */

    @UnsupportedAppUsage(trackingBug = 181103983)

    @RequiresPermission(Manifest.permission.BLUETOOTH)

    @RequiresLegacyBluetoothPermission

    @RequiresBluetoothConnectPermission

    @RequiresPermission(android.Manifest.permission.BLUETOOTH_CONNECT)

    public void setCodecConfigPreference(@NonNull BluetoothDevice device,

                                         @NonNull BluetoothCodecConfig codecConfig) {

        if (DBG) Log.d(TAG, "setCodecConfigPreference(" + device + ")");
@@ -726,7 +782,7 @@ public final class BluetoothA2dp implements BluetoothProfile { 
        try {

            final IBluetoothA2dp service = getService();

            if (service != null && isEnabled()) {

                service.setCodecConfigPreference(device, codecConfig);

                service.setCodecConfigPreference(device, codecConfig, mAttributionSource);

            }

            if (service == null) Log.w(TAG, "Proxy not attached to service");

            return;
@@ -744,7 +800,9 @@ public final class BluetoothA2dp implements BluetoothProfile { 
     * @hide

     */

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

    @RequiresPermission(Manifest.permission.BLUETOOTH)

    @RequiresLegacyBluetoothPermission

    @RequiresBluetoothConnectPermission

    @RequiresPermission(android.Manifest.permission.BLUETOOTH_CONNECT)

    public void enableOptionalCodecs(@NonNull BluetoothDevice device) {

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

        verifyDeviceNotNull(device, "enableOptionalCodecs");
@@ -759,7 +817,9 @@ public final class BluetoothA2dp implements BluetoothProfile { 
     * @hide

     */

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

    @RequiresPermission(Manifest.permission.BLUETOOTH)

    @RequiresLegacyBluetoothPermission

    @RequiresBluetoothConnectPermission

    @RequiresPermission(android.Manifest.permission.BLUETOOTH_CONNECT)

    public void disableOptionalCodecs(@NonNull BluetoothDevice device) {

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

        verifyDeviceNotNull(device, "disableOptionalCodecs");
@@ -773,14 +833,15 @@ public final class BluetoothA2dp implements BluetoothProfile { 
     * active A2DP Bluetooth device.

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

     */

    @RequiresPermission(android.Manifest.permission.BLUETOOTH_CONNECT)

    private void enableDisableOptionalCodecs(BluetoothDevice device, boolean enable) {

        try {

            final IBluetoothA2dp service = getService();

            if (service != null && isEnabled()) {

                if (enable) {

                    service.enableOptionalCodecs(device);

                    service.enableOptionalCodecs(device, mAttributionSource);

                } else {

                    service.disableOptionalCodecs(device);

                    service.disableOptionalCodecs(device, mAttributionSource);

                }

            }

            if (service == null) Log.w(TAG, "Proxy not attached to service");
@@ -800,14 +861,16 @@ public final class BluetoothA2dp implements BluetoothProfile { 
     * @hide

     */

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

    @RequiresPermission(Manifest.permission.BLUETOOTH_ADMIN)

    @RequiresLegacyBluetoothAdminPermission

    @RequiresBluetoothConnectPermission

    @RequiresPermission(android.Manifest.permission.BLUETOOTH_CONNECT)

    @OptionalCodecsSupportStatus

    public int isOptionalCodecsSupported(@NonNull BluetoothDevice device) {

        verifyDeviceNotNull(device, "isOptionalCodecsSupported");

        try {

            final IBluetoothA2dp service = getService();

            if (service != null && isEnabled() && isValidDevice(device)) {

                return service.supportsOptionalCodecs(device);

                return service.supportsOptionalCodecs(device, mAttributionSource);

            }

            if (service == null) Log.w(TAG, "Proxy not attached to service");

            return OPTIONAL_CODECS_SUPPORT_UNKNOWN;
@@ -826,14 +889,16 @@ public final class BluetoothA2dp implements BluetoothProfile { 
     * @hide

     */

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

    @RequiresPermission(Manifest.permission.BLUETOOTH_ADMIN)

    @RequiresLegacyBluetoothAdminPermission

    @RequiresBluetoothConnectPermission

    @RequiresPermission(android.Manifest.permission.BLUETOOTH_CONNECT)

    @OptionalCodecsPreferenceStatus

    public int isOptionalCodecsEnabled(@NonNull BluetoothDevice device) {

        verifyDeviceNotNull(device, "isOptionalCodecsEnabled");

        try {

            final IBluetoothA2dp service = getService();

            if (service != null && isEnabled() && isValidDevice(device)) {

                return service.getOptionalCodecsEnabled(device);

                return service.getOptionalCodecsEnabled(device, mAttributionSource);

            }

            if (service == null) Log.w(TAG, "Proxy not attached to service");

            return OPTIONAL_CODECS_PREF_UNKNOWN;
@@ -853,7 +918,9 @@ public final class BluetoothA2dp implements BluetoothProfile { 
     * @hide

     */

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

    @RequiresPermission(Manifest.permission.BLUETOOTH_ADMIN)

    @RequiresLegacyBluetoothAdminPermission

    @RequiresBluetoothConnectPermission

    @RequiresPermission(android.Manifest.permission.BLUETOOTH_CONNECT)

    public void setOptionalCodecsEnabled(@NonNull BluetoothDevice device,

            @OptionalCodecsPreferenceStatus int value) {

        verifyDeviceNotNull(device, "setOptionalCodecsEnabled");
@@ -867,7 +934,7 @@ public final class BluetoothA2dp implements BluetoothProfile { 
            final IBluetoothA2dp service = getService();

            if (service != null && isEnabled()

                    && isValidDevice(device)) {

                service.setOptionalCodecsEnabled(device, value);

                service.setOptionalCodecsEnabled(device, value, mAttributionSource);

            }

            if (service == null) Log.w(TAG, "Proxy not attached to service");

            return;
@@ -889,13 +956,17 @@ public final class BluetoothA2dp implements BluetoothProfile { 
     * @hide

     */

    @SystemApi

    @RequiresPermission(Manifest.permission.BLUETOOTH_PRIVILEGED)

    @RequiresBluetoothConnectPermission

    @RequiresPermission(allOf = {

            android.Manifest.permission.BLUETOOTH_CONNECT,

            android.Manifest.permission.BLUETOOTH_PRIVILEGED,

    })

    public @Type int getDynamicBufferSupport() {

        if (VDBG) log("getDynamicBufferSupport()");

        try {

            final IBluetoothA2dp service = getService();

            if (service != null && isEnabled()) {

                return service.getDynamicBufferSupport();

                return service.getDynamicBufferSupport(mAttributionSource);

            }

            if (service == null) Log.w(TAG, "Proxy not attached to service");

            return DYNAMIC_BUFFER_SUPPORT_NONE;
@@ -916,13 +987,17 @@ public final class BluetoothA2dp implements BluetoothProfile { 
     * @hide

     */

    @SystemApi

    @RequiresPermission(Manifest.permission.BLUETOOTH_PRIVILEGED)

    @RequiresBluetoothConnectPermission

    @RequiresPermission(allOf = {

            android.Manifest.permission.BLUETOOTH_CONNECT,

            android.Manifest.permission.BLUETOOTH_PRIVILEGED,

    })

    public @Nullable BufferConstraints getBufferConstraints() {

        if (VDBG) log("getBufferConstraints()");

        try {

            final IBluetoothA2dp service = getService();

            if (service != null && isEnabled()) {

                return service.getBufferConstraints();

                return service.getBufferConstraints(mAttributionSource);

            }

            if (service == null) Log.w(TAG, "Proxy not attached to service");

            return null;
@@ -942,7 +1017,11 @@ public final class BluetoothA2dp implements BluetoothProfile { 
     * @hide

     */

    @SystemApi

    @RequiresPermission(Manifest.permission.BLUETOOTH_PRIVILEGED)

    @RequiresBluetoothConnectPermission

    @RequiresPermission(allOf = {

            android.Manifest.permission.BLUETOOTH_CONNECT,

            android.Manifest.permission.BLUETOOTH_PRIVILEGED,

    })

    public boolean setBufferLengthMillis(@BluetoothCodecConfig.SourceCodecType int codec,

            int value) {

        if (VDBG) log("setBufferLengthMillis(" + codec + ", " + value + ")");
@@ -953,7 +1032,7 @@ public final class BluetoothA2dp implements BluetoothProfile { 
        try {

            final IBluetoothA2dp service = getService();

            if (service != null && isEnabled()) {

                return service.setBufferLengthMillis(codec, value);

                return service.setBufferLengthMillis(codec, value, mAttributionSource);

            }

            if (service == null) Log.w(TAG, "Proxy not attached to service");

            return false;

framework/java/android/bluetooth/BluetoothA2dpSink.java

+70 −22

File changed.

Preview size limit exceeded, changes collapsed.

framework/java/android/bluetooth/BluetoothAdapter.java

+753 −458

File changed.

Preview size limit exceeded, changes collapsed.

framework/java/android/bluetooth/BluetoothAudioConfig.java

+2 −1
Original line number Diff line number Diff line
@@ -16,6 +16,7 @@ 


package android.bluetooth;



import android.annotation.Nullable;

import android.os.Parcel;

import android.os.Parcelable;
@@ -39,7 +40,7 @@ public final class BluetoothAudioConfig implements Parcelable { 
    }



    @Override

    public boolean equals(Object o) {

    public boolean equals(@Nullable Object o) {

        if (o instanceof BluetoothAudioConfig) {

            BluetoothAudioConfig bac = (BluetoothAudioConfig) o;

            return (bac.mSampleRate == mSampleRate && bac.mChannelConfig == mChannelConfig

framework/java/android/bluetooth/BluetoothAvrcpController.java

+42 −12
Original line number Diff line number Diff line
@@ -16,6 +16,14 @@ 


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.Attributable;

import android.content.AttributionSource;

import android.content.Context;

import android.os.Binder;

import android.os.IBinder;
@@ -54,10 +62,11 @@ public final class BluetoothAvrcpController implements BluetoothProfile { 
     * <p>{@link #EXTRA_STATE} or {@link #EXTRA_PREVIOUS_STATE} can be any of

     * {@link #STATE_DISCONNECTED}, {@link #STATE_CONNECTING},

     * {@link #STATE_CONNECTED}, {@link #STATE_DISCONNECTING}.

     *

     * <p>Requires {@link android.Manifest.permission#BLUETOOTH} permission to

     * receive.

     */

    @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";
@@ -70,13 +79,17 @@ 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";



    public static final String EXTRA_PLAYER_SETTING =

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



    private BluetoothAdapter mAdapter;

    private final BluetoothAdapter mAdapter;

    private final AttributionSource mAttributionSource;

    private final BluetoothProfileConnector<IBluetoothAvrcpController> mProfileConnector =

            new BluetoothProfileConnector(this, BluetoothProfile.AVRCP_CONTROLLER,

                    "BluetoothAvrcpController", IBluetoothAvrcpController.class.getName()) {
@@ -91,8 +104,10 @@ public final class BluetoothAvrcpController implements BluetoothProfile { 
     * Create a BluetoothAvrcpController proxy object for interacting with the local

     * Bluetooth AVRCP service.

     */

    /*package*/ BluetoothAvrcpController(Context context, ServiceListener listener) {

        mAdapter = BluetoothAdapter.getDefaultAdapter();

    /* package */ BluetoothAvrcpController(Context context, ServiceListener listener,

            BluetoothAdapter adapter) {

        mAdapter = adapter;

        mAttributionSource = adapter.getAttributionSource();

        mProfileConnector.connect(context, listener);

    }
@@ -113,13 +128,16 @@ 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 =

                getService();

        if (service != null && isEnabled()) {

            try {

                return service.getConnectedDevices();

                return Attributable.setAttributionSource(

                        service.getConnectedDevices(mAttributionSource), mAttributionSource);

            } catch (RemoteException e) {

                Log.e(TAG, "Stack:" + Log.getStackTraceString(new Throwable()));

                return new ArrayList<BluetoothDevice>();
@@ -133,13 +151,17 @@ 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 =

                getService();

        if (service != null && isEnabled()) {

            try {

                return service.getDevicesMatchingConnectionStates(states);

                return Attributable.setAttributionSource(

                        service.getDevicesMatchingConnectionStates(states, mAttributionSource),

                        mAttributionSource);

            } catch (RemoteException e) {

                Log.e(TAG, "Stack:" + Log.getStackTraceString(new Throwable()));

                return new ArrayList<BluetoothDevice>();
@@ -153,13 +175,15 @@ 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 =

                getService();

        if (service != null && isEnabled() && isValidDevice(device)) {

            try {

                return service.getConnectionState(device);

                return service.getConnectionState(device, mAttributionSource);

            } catch (RemoteException e) {

                Log.e(TAG, "Stack:" + Log.getStackTraceString(new Throwable()));

                return BluetoothProfile.STATE_DISCONNECTED;
@@ -174,6 +198,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;
@@ -181,7 +207,7 @@ public final class BluetoothAvrcpController implements BluetoothProfile { 
                getService();

        if (service != null && isEnabled()) {

            try {

                settings = service.getPlayerSettings(device);

                settings = service.getPlayerSettings(device, mAttributionSource);

            } catch (RemoteException e) {

                Log.e(TAG, "Error talking to BT service in getMetadata() " + e);

                return null;
@@ -194,13 +220,15 @@ 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 =

                getService();

        if (service != null && isEnabled()) {

            try {

                return service.setPlayerApplicationSetting(plAppSetting);

                return service.setPlayerApplicationSetting(plAppSetting, mAttributionSource);

            } catch (RemoteException e) {

                Log.e(TAG, "Error talking to BT service in setPlayerApplicationSetting() " + e);

                return false;
@@ -214,6 +242,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);
@@ -221,7 +251,7 @@ public final class BluetoothAvrcpController implements BluetoothProfile { 
                getService();

        if (service != null && isEnabled()) {

            try {

                service.sendGroupNavigationCmd(device, keyCode, keyState);

                service.sendGroupNavigationCmd(device, keyCode, keyState, mAttributionSource);

                return;

            } catch (RemoteException e) {

                Log.e(TAG, "Error talking to BT service in sendGroupNavigationCmd()", e);