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

Commit 4819cdbd authored by William Escande's avatar William Escande
Browse files

BT_MAINLINE remove setAttributionSource 

Following of ag/15275356, it allow us to not need the
setAttributionSource call

Bug: 195144968
Tag: #refactor
Ignore-AOSP-First: No such thing on aosp
Test: atest BluetoothInstrumentationTests
Change-Id: I8410ba9bcac9f1f06c1ce7fe98d2d9a05b061733
parent 176cc169

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

+0 −16
Original line number Diff line number Diff line
@@ -31,7 +31,6 @@ import android.bluetooth.BluetoothProfile; 
import android.bluetooth.BluetoothUuid;

import android.bluetooth.BufferConstraints;

import android.bluetooth.IBluetoothA2dp;

import android.content.Attributable;

import android.content.AttributionSource;

import android.content.BroadcastReceiver;

import android.content.Context;
@@ -1245,7 +1244,6 @@ public class A2dpService extends ProfileService { 


        @Override

        public boolean connectWithAttribution(BluetoothDevice device, AttributionSource source) {

            Attributable.setAttributionSource(device, source);

            A2dpService service = getService(source);

            if (service == null) {

                return false;
@@ -1264,7 +1262,6 @@ public class A2dpService extends ProfileService { 


        @Override

        public boolean disconnectWithAttribution(BluetoothDevice device, AttributionSource source) {

            Attributable.setAttributionSource(device, source);

            A2dpService service = getService(source);

            if (service == null) {

                return false;
@@ -1321,7 +1318,6 @@ public class A2dpService extends ProfileService { 
        @Override

        public int getConnectionStateWithAttribution(BluetoothDevice device,

                AttributionSource source) {

            Attributable.setAttributionSource(device, source);

            A2dpService service = getService(source);

            if (service == null) {

                return BluetoothProfile.STATE_DISCONNECTED;
@@ -1331,7 +1327,6 @@ public class A2dpService extends ProfileService { 


        @Override

        public boolean setActiveDevice(BluetoothDevice device, AttributionSource source) {

            Attributable.setAttributionSource(device, source);

            A2dpService service = getService(source);

            if (service == null) {

                return false;
@@ -1351,7 +1346,6 @@ public class A2dpService extends ProfileService { 
        @Override

        public boolean setConnectionPolicy(BluetoothDevice device, int connectionPolicy,

                AttributionSource source) {

            Attributable.setAttributionSource(device, source);

            A2dpService service = getService(source);

            if (service == null) {

                return false;
@@ -1361,7 +1355,6 @@ public class A2dpService extends ProfileService { 


        @Override

        public int getPriority(BluetoothDevice device, AttributionSource source) {

            Attributable.setAttributionSource(device, source);

            A2dpService service = getService(source);

            if (service == null) {

                return BluetoothProfile.CONNECTION_POLICY_UNKNOWN;
@@ -1371,7 +1364,6 @@ public class A2dpService extends ProfileService { 


        @Override

        public int getConnectionPolicy(BluetoothDevice device, AttributionSource source) {

            Attributable.setAttributionSource(device, source);

            A2dpService service = getService(source);

            if (service == null) {

                return BluetoothProfile.CONNECTION_POLICY_UNKNOWN;
@@ -1397,7 +1389,6 @@ public class A2dpService extends ProfileService { 


        @Override

        public boolean isA2dpPlaying(BluetoothDevice device, AttributionSource source) {

            Attributable.setAttributionSource(device, source);

            A2dpService service = getService(source);

            if (service == null) {

                return false;
@@ -1408,7 +1399,6 @@ public class A2dpService extends ProfileService { 
        @Override

        public BluetoothCodecStatus getCodecStatus(BluetoothDevice device,

                AttributionSource source) {

            Attributable.setAttributionSource(device, source);

            A2dpService service = getService(source);

            if (service == null) {

                return null;
@@ -1419,7 +1409,6 @@ public class A2dpService extends ProfileService { 
        @Override

        public void setCodecConfigPreference(BluetoothDevice device,

                BluetoothCodecConfig codecConfig, AttributionSource source) {

            Attributable.setAttributionSource(device, source);

            A2dpService service = getService(source);

            if (service == null) {

                return;
@@ -1429,7 +1418,6 @@ public class A2dpService extends ProfileService { 


        @Override

        public void enableOptionalCodecs(BluetoothDevice device, AttributionSource source) {

            Attributable.setAttributionSource(device, source);

            A2dpService service = getService(source);

            if (service == null) {

                return;
@@ -1439,7 +1427,6 @@ public class A2dpService extends ProfileService { 


        @Override

        public void disableOptionalCodecs(BluetoothDevice device, AttributionSource source) {

            Attributable.setAttributionSource(device, source);

            A2dpService service = getService(source);

            if (service == null) {

                return;
@@ -1449,7 +1436,6 @@ public class A2dpService extends ProfileService { 


        @Override

        public int supportsOptionalCodecs(BluetoothDevice device, AttributionSource source) {

            Attributable.setAttributionSource(device, source);

            A2dpService service = getService(source);

            if (service == null) {

                return BluetoothA2dp.OPTIONAL_CODECS_SUPPORT_UNKNOWN;
@@ -1459,7 +1445,6 @@ public class A2dpService extends ProfileService { 


        @Override

        public int getOptionalCodecsEnabled(BluetoothDevice device, AttributionSource source) {

            Attributable.setAttributionSource(device, source);

            A2dpService service = getService(source);

            if (service == null) {

                return BluetoothA2dp.OPTIONAL_CODECS_PREF_UNKNOWN;
@@ -1470,7 +1455,6 @@ public class A2dpService extends ProfileService { 
        @Override

        public void setOptionalCodecsEnabled(BluetoothDevice device, int value,

                AttributionSource source) {

            Attributable.setAttributionSource(device, source);

            A2dpService service = getService(source);

            if (service == null) {

                return;

android/app/src/com/android/bluetooth/a2dpsink/A2dpSinkService.java

+0 −8
Original line number Diff line number Diff line
@@ -21,7 +21,6 @@ import android.bluetooth.BluetoothAudioConfig; 
import android.bluetooth.BluetoothDevice;

import android.bluetooth.BluetoothProfile;

import android.bluetooth.IBluetoothA2dpSink;

import android.content.Attributable;

import android.content.AttributionSource;

import android.media.AudioManager;

import android.util.Log;
@@ -207,7 +206,6 @@ public class A2dpSinkService extends ProfileService { 


        @Override

        public boolean connect(BluetoothDevice device, AttributionSource source) {

            Attributable.setAttributionSource(device, source);

            A2dpSinkService service = getService(source);

            if (service == null) {

                return false;
@@ -217,7 +215,6 @@ public class A2dpSinkService extends ProfileService { 


        @Override

        public boolean disconnect(BluetoothDevice device, AttributionSource source) {

            Attributable.setAttributionSource(device, source);

            A2dpSinkService service = getService(source);

            if (service == null) {

                return false;
@@ -246,7 +243,6 @@ public class A2dpSinkService extends ProfileService { 


        @Override

        public int getConnectionState(BluetoothDevice device, AttributionSource source) {

            Attributable.setAttributionSource(device, source);

            A2dpSinkService service = getService(source);

            if (service == null) {

                return BluetoothProfile.STATE_DISCONNECTED;
@@ -257,7 +253,6 @@ public class A2dpSinkService extends ProfileService { 
        @Override

        public boolean setConnectionPolicy(BluetoothDevice device, int connectionPolicy,

                AttributionSource source) {

            Attributable.setAttributionSource(device, source);

            A2dpSinkService service = getService(source);

            if (service == null) {

                return false;
@@ -267,7 +262,6 @@ public class A2dpSinkService extends ProfileService { 


        @Override

        public int getConnectionPolicy(BluetoothDevice device, AttributionSource source) {

            Attributable.setAttributionSource(device, source);

            A2dpSinkService service = getService(source);

            if (service == null) {

                return BluetoothProfile.CONNECTION_POLICY_UNKNOWN;
@@ -277,7 +271,6 @@ public class A2dpSinkService extends ProfileService { 


        @Override

        public boolean isA2dpPlaying(BluetoothDevice device, AttributionSource source) {

            Attributable.setAttributionSource(device, source);

            A2dpSinkService service = getService(source);

            if (service == null) {

                return false;
@@ -288,7 +281,6 @@ public class A2dpSinkService extends ProfileService { 
        @Override

        public BluetoothAudioConfig getAudioConfig(BluetoothDevice device,

                AttributionSource source) {

            Attributable.setAttributionSource(device, source);

            A2dpSinkService service = getService(source);

            if (service == null) {

                return null;

android/app/src/com/android/bluetooth/avrcpcontroller/AvrcpControllerService.java

+0 −6
Original line number Diff line number Diff line
@@ -22,7 +22,6 @@ import android.bluetooth.BluetoothAvrcpPlayerSettings; 
import android.bluetooth.BluetoothDevice;

import android.bluetooth.BluetoothProfile;

import android.bluetooth.IBluetoothAvrcpController;

import android.content.Attributable;

import android.content.AttributionSource;

import android.content.Intent;

import android.support.v4.media.MediaBrowserCompat.MediaItem;
@@ -37,10 +36,8 @@ import com.android.bluetooth.btservice.ProfileService; 


import java.util.ArrayList;

import java.util.Arrays;

import java.util.Collections;

import java.util.List;

import java.util.Map;

import java.util.Set;

import java.util.UUID;

import java.util.concurrent.ConcurrentHashMap;
@@ -388,7 +385,6 @@ public class AvrcpControllerService extends ProfileService { 


        @Override

        public int getConnectionState(BluetoothDevice device, AttributionSource source) {

            Attributable.setAttributionSource(device, source);

            AvrcpControllerService service = getService(source);

            if (service == null) {

                return BluetoothProfile.STATE_DISCONNECTED;
@@ -399,7 +395,6 @@ public class AvrcpControllerService extends ProfileService { 
        @Override

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

                AttributionSource source) {

            Attributable.setAttributionSource(device, source);

            AvrcpControllerService service = getService(source);

            if (service == null) {

                return;
@@ -421,7 +416,6 @@ public class AvrcpControllerService extends ProfileService { 
        @Override

        public BluetoothAvrcpPlayerSettings getPlayerSettings(BluetoothDevice device,

                AttributionSource source) {

            Attributable.setAttributionSource(device, source);

            AvrcpControllerService service = getService(source);

            if (service == null) {

                return null;

android/app/src/com/android/bluetooth/btservice/AdapterService.java

+0 −35
Original line number Diff line number Diff line
@@ -59,7 +59,6 @@ import android.bluetooth.IBluetoothSocketManager; 
import android.bluetooth.OobData;

import android.bluetooth.UidTraffic;

import android.companion.CompanionDeviceManager;

import android.content.Attributable;

import android.content.AttributionSource;

import android.content.BroadcastReceiver;

import android.content.ComponentName;
@@ -1563,7 +1562,6 @@ public class AdapterService extends Service { 
        @Override

        public boolean createBond(BluetoothDevice device, int transport, OobData remoteP192Data,

                OobData remoteP256Data, AttributionSource attributionSource) {

            Attributable.setAttributionSource(device, attributionSource);

            AdapterService service = getService();

            if (service == null || !callerIsSystemOrActiveOrManagedUser(service, TAG, "createBond")

                    || !Utils.checkConnectPermissionForDataDelivery(
@@ -1583,7 +1581,6 @@ public class AdapterService extends Service { 
        @Override

        public boolean cancelBondProcess(

                BluetoothDevice device, AttributionSource attributionSource) {

            Attributable.setAttributionSource(device, attributionSource);

            AdapterService service = getService();

            if (service == null || !callerIsSystemOrActiveUser(TAG, "cancelBondProcess")

                    || !Utils.checkConnectPermissionForDataDelivery(
@@ -1601,7 +1598,6 @@ public class AdapterService extends Service { 


        @Override

        public boolean removeBond(BluetoothDevice device, AttributionSource attributionSource) {

            Attributable.setAttributionSource(device, attributionSource);

            AdapterService service = getService();

            if (service == null || !callerIsSystemOrActiveUser(TAG, "removeBond")

                    || !Utils.checkConnectPermissionForDataDelivery(
@@ -1625,7 +1621,6 @@ public class AdapterService extends Service { 
        @Override

        public int getBondState(BluetoothDevice device, AttributionSource attributionSource) {

            // don't check caller, may be called from system UI

            Attributable.setAttributionSource(device, attributionSource);

            AdapterService service = getService();

            if (service == null || !Utils.checkConnectPermissionForDataDelivery(

                    service, attributionSource, "AdapterService getBondState")) {
@@ -1639,7 +1634,6 @@ public class AdapterService extends Service { 
        public boolean isBondingInitiatedLocally(

                BluetoothDevice device, AttributionSource attributionSource) {

            // don't check caller, may be called from system UI

            Attributable.setAttributionSource(device, attributionSource);

            AdapterService service = getService();

            if (service == null || !Utils.checkConnectPermissionForDataDelivery(

                    service, attributionSource, "AdapterService isBondingInitiatedLocally")) {
@@ -1684,7 +1678,6 @@ public class AdapterService extends Service { 
        @Override

        public int getConnectionStateWithAttribution(

                BluetoothDevice device, AttributionSource attributionSource) {

            Attributable.setAttributionSource(device, attributionSource);

            AdapterService service = getService();

            if (service == null || !Utils.checkConnectPermissionForDataDelivery(

                    service, attributionSource, "AdapterService getConnectionState")) {
@@ -1696,7 +1689,6 @@ public class AdapterService extends Service { 


        @Override

        public boolean canBondWithoutDialog(BluetoothDevice device, AttributionSource source) {

            Attributable.setAttributionSource(device, source);

            AdapterService service = getService();

            if (service == null

                    || !Utils.checkConnectPermissionForDataDelivery(service, source, TAG)) {
@@ -1723,7 +1715,6 @@ public class AdapterService extends Service { 
        @Override

        public boolean setActiveDevice(BluetoothDevice device, @ActiveDeviceUse int profiles,

                AttributionSource source) {

            Attributable.setAttributionSource(device, source);

            AdapterService service = getService();

            if (service == null

                    || !Utils.checkCallerIsSystemOrActiveUser(TAG)
@@ -1736,7 +1727,6 @@ public class AdapterService extends Service { 
        @Override

        public boolean connectAllEnabledProfiles(BluetoothDevice device,

                AttributionSource source) {

            Attributable.setAttributionSource(device, source);

            AdapterService service = getService();

            if (service == null

                    || !Utils.checkCallerIsSystemOrActiveUser(TAG)
@@ -1758,7 +1748,6 @@ public class AdapterService extends Service { 
        @Override

        public boolean disconnectAllEnabledProfiles(BluetoothDevice device,

                AttributionSource source) {

            Attributable.setAttributionSource(device, source);

            AdapterService service = getService();

            if (service == null

                    || !Utils.checkCallerIsSystemOrActiveUser(TAG)
@@ -1779,7 +1768,6 @@ public class AdapterService extends Service { 


        @Override

        public String getRemoteName(BluetoothDevice device, AttributionSource attributionSource) {

            Attributable.setAttributionSource(device, attributionSource);

            AdapterService service = getService();

            if (service == null

                    || !callerIsSystemOrActiveOrManagedUser(service, TAG, "getRemoteName")
@@ -1793,7 +1781,6 @@ public class AdapterService extends Service { 


        @Override

        public int getRemoteType(BluetoothDevice device, AttributionSource attributionSource) {

            Attributable.setAttributionSource(device, attributionSource);

            AdapterService service = getService();

            if (service == null

                    || !callerIsSystemOrActiveOrManagedUser(service, TAG, "getRemoteType")
@@ -1819,7 +1806,6 @@ public class AdapterService extends Service { 
        @Override

        public String getRemoteAliasWithAttribution(

                BluetoothDevice device, AttributionSource attributionSource) {

            Attributable.setAttributionSource(device, attributionSource);

            AdapterService service = getService();

            if (service == null

                    || !callerIsSystemOrActiveOrManagedUser(service, TAG, "getRemoteAlias")
@@ -1835,7 +1821,6 @@ public class AdapterService extends Service { 
        @Override

        public int setRemoteAlias(BluetoothDevice device, String name,

                AttributionSource attributionSource) {

            Attributable.setAttributionSource(device, attributionSource);

            AdapterService service = getService();

            if (service == null) {

                return BluetoothStatusCodes.ERROR_BLUETOOTH_NOT_ENABLED;
@@ -1866,7 +1851,6 @@ public class AdapterService extends Service { 


        @Override

        public int getRemoteClass(BluetoothDevice device, AttributionSource attributionSource) {

            Attributable.setAttributionSource(device, attributionSource);

            AdapterService service = getService();

            if (service == null

                    || !callerIsSystemOrActiveOrManagedUser(service, TAG, "getRemoteClass")
@@ -1882,7 +1866,6 @@ public class AdapterService extends Service { 
        @Override

        public ParcelUuid[] getRemoteUuids(

                BluetoothDevice device, AttributionSource attributionSource) {

            Attributable.setAttributionSource(device, attributionSource);

            AdapterService service = getService();

            if (service == null

                    || !callerIsSystemOrActiveOrManagedUser(service, TAG, "getRemoteUuids")
@@ -1906,7 +1889,6 @@ public class AdapterService extends Service { 
        @Override

        public boolean fetchRemoteUuidsWithAttribution(

                BluetoothDevice device, int transport, AttributionSource attributionSource) {

            Attributable.setAttributionSource(device, attributionSource);

            AdapterService service = getService();

            if (service == null

                    || !callerIsSystemOrActiveOrManagedUser(service, TAG, "fetchRemoteUuids")
@@ -1926,7 +1908,6 @@ public class AdapterService extends Service { 
        @Override

        public boolean setPin(BluetoothDevice device, boolean accept, int len, byte[] pinCode,

                AttributionSource attributionSource) {

            Attributable.setAttributionSource(device, attributionSource);

            AdapterService service = getService();

            if (service == null || !callerIsSystemOrActiveUser(TAG, "setPin")

                    || !Utils.checkConnectPermissionForDataDelivery(
@@ -1952,7 +1933,6 @@ public class AdapterService extends Service { 
        @Override

        public boolean setPasskey(BluetoothDevice device, boolean accept, int len, byte[] passkey,

                AttributionSource attributionSource) {

            Attributable.setAttributionSource(device, attributionSource);

            AdapterService service = getService();

            if (service == null || !callerIsSystemOrActiveUser(TAG, "setPasskey")

                    || !Utils.checkConnectPermissionForDataDelivery(
@@ -1980,7 +1960,6 @@ public class AdapterService extends Service { 
        @Override

        public boolean setPairingConfirmation(BluetoothDevice device, boolean accept,

                AttributionSource source) {

            Attributable.setAttributionSource(device, source);

            AdapterService service = getService();

            if (service == null

                    || !Utils.checkCallerIsSystemOrActiveUser(TAG)
@@ -2004,7 +1983,6 @@ public class AdapterService extends Service { 


        @Override

        public boolean getSilenceMode(BluetoothDevice device, AttributionSource source) {

            Attributable.setAttributionSource(device, source);

            AdapterService service = getService();

            if (service == null

                    || !Utils.checkCallerIsSystemOrActiveUser(TAG)
@@ -2021,7 +1999,6 @@ public class AdapterService extends Service { 
        @Override

        public boolean setSilenceMode(BluetoothDevice device, boolean silence,

                AttributionSource source) {

            Attributable.setAttributionSource(device, source);

            AdapterService service = getService();

            if (service == null

                    || !Utils.checkCallerIsSystemOrActiveUser(TAG)
@@ -2038,7 +2015,6 @@ public class AdapterService extends Service { 
        @Override

        public int getPhonebookAccessPermission(

                BluetoothDevice device, AttributionSource attributionSource) {

            Attributable.setAttributionSource(device, attributionSource);

            AdapterService service = getService();

            if (service == null || !callerIsSystemOrActiveUser(TAG, "getPhonebookAccessPermission")

                    || !Utils.checkConnectPermissionForDataDelivery(
@@ -2052,7 +2028,6 @@ public class AdapterService extends Service { 
        @Override

        public boolean setPhonebookAccessPermission(BluetoothDevice device, int value,

                AttributionSource source) {

            Attributable.setAttributionSource(device, source);

            AdapterService service = getService();

            if (service == null

                    || !Utils.checkCallerIsSystemOrActiveUser(TAG)
@@ -2069,7 +2044,6 @@ public class AdapterService extends Service { 
        @Override

        public int getMessageAccessPermission(

                BluetoothDevice device, AttributionSource attributionSource) {

            Attributable.setAttributionSource(device, attributionSource);

            AdapterService service = getService();

            if (service == null || !callerIsSystemOrActiveUser(TAG, "getMessageAccessPermission")

                    || !Utils.checkConnectPermissionForDataDelivery(
@@ -2083,7 +2057,6 @@ public class AdapterService extends Service { 
        @Override

        public boolean setMessageAccessPermission(BluetoothDevice device, int value,

                AttributionSource source) {

            Attributable.setAttributionSource(device, source);

            AdapterService service = getService();

            if (service == null

                    || !Utils.checkCallerIsSystemOrActiveUser(TAG)
@@ -2100,7 +2073,6 @@ public class AdapterService extends Service { 
        @Override

        public int getSimAccessPermission(

                BluetoothDevice device, AttributionSource attributionSource) {

            Attributable.setAttributionSource(device, attributionSource);

            AdapterService service = getService();

            if (service == null || !callerIsSystemOrActiveUser(TAG, "getSimAccessPermission")

                    || !Utils.checkConnectPermissionForDataDelivery(
@@ -2114,7 +2086,6 @@ public class AdapterService extends Service { 
        @Override

        public boolean setSimAccessPermission(BluetoothDevice device, int value,

                AttributionSource source) {

            Attributable.setAttributionSource(device, source);

            AdapterService service = getService();

            if (service == null

                    || !Utils.checkCallerIsSystemOrActiveUser(TAG)
@@ -2141,7 +2112,6 @@ public class AdapterService extends Service { 
        @Override

        public boolean sdpSearch(

                BluetoothDevice device, ParcelUuid uuid, AttributionSource attributionSource) {

            Attributable.setAttributionSource(device, attributionSource);

            AdapterService service = getService();

            if (service == null || !callerIsSystemOrActiveUser(TAG, "sdpSearch")

                    || !Utils.checkConnectPermissionForDataDelivery(
@@ -2158,7 +2128,6 @@ public class AdapterService extends Service { 


        @Override

        public int getBatteryLevel(BluetoothDevice device, AttributionSource attributionSource) {

            Attributable.setAttributionSource(device, attributionSource);

            AdapterService service = getService();

            if (service == null || !callerIsSystemOrActiveUser(TAG, "getBatteryLevel")

                    || !Utils.checkConnectPermissionForDataDelivery(
@@ -2387,7 +2356,6 @@ public class AdapterService extends Service { 
        @Override

        public boolean registerMetadataListener(IBluetoothMetadataListener listener,

                BluetoothDevice device, AttributionSource source) {

            Attributable.setAttributionSource(device, source);

            AdapterService service = getService();

            if (service == null

                    || !Utils.checkCallerIsSystemOrActiveUser(TAG)
@@ -2415,7 +2383,6 @@ public class AdapterService extends Service { 
        @Override

        public boolean unregisterMetadataListener(BluetoothDevice device,

                AttributionSource source) {

            Attributable.setAttributionSource(device, source);

            AdapterService service = getService();

            if (service == null

                    || !Utils.checkCallerIsSystemOrActiveUser(TAG)
@@ -2437,7 +2404,6 @@ public class AdapterService extends Service { 
        @Override

        public boolean setMetadata(BluetoothDevice device, int key, byte[] value,

                AttributionSource source) {

            Attributable.setAttributionSource(device, source);

            AdapterService service = getService();

            if (service == null

                    || !Utils.checkCallerIsSystemOrActiveUser(TAG)
@@ -2456,7 +2422,6 @@ public class AdapterService extends Service { 
        @Override

        public byte[] getMetadata(BluetoothDevice device, int key,

                AttributionSource source) {

            Attributable.setAttributionSource(device, source);

            AdapterService service = getService();

            if (service == null

                    || !Utils.checkCallerIsSystemOrActiveUser(TAG)

android/app/src/com/android/bluetooth/btservice/BondStateMachine.java

+0 −6
Original line number Diff line number Diff line
@@ -20,14 +20,12 @@ import static android.Manifest.permission.BLUETOOTH_CONNECT; 


import android.annotation.RequiresPermission;

import android.app.Activity;

import android.app.ActivityThread;

import android.bluetooth.BluetoothAdapter;

import android.bluetooth.BluetoothClass;

import android.bluetooth.BluetoothDevice;

import android.bluetooth.BluetoothProfile;

import android.bluetooth.BluetoothProtoEnums;

import android.bluetooth.OobData;

import android.content.Attributable;

import android.content.Intent;

import android.os.Build;

import android.os.Message;
@@ -133,8 +131,6 @@ final class BondStateMachine extends StateMachine { 
        public synchronized boolean processMessage(Message msg) {



            BluetoothDevice dev = (BluetoothDevice) msg.obj;

            Attributable.setAttributionSource(dev,

                    ActivityThread.currentAttributionSource());



            switch (msg.what) {
@@ -188,8 +184,6 @@ final class BondStateMachine extends StateMachine { 
        @Override

        public synchronized boolean processMessage(Message msg) {

            BluetoothDevice dev = (BluetoothDevice) msg.obj;

            Attributable.setAttributionSource(dev,

                    ActivityThread.currentAttributionSource());



            DeviceProperties devProp = mRemoteDevices.getDeviceProperties(dev);

            boolean result = false;