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

Commit 6a5be43d authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Force AttributionSource on all BluetoothDevice." into sc-dev am: 5fcd99fe 

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Bluetooth/+/15162448

Change-Id: I9af168695c280ebf19b8f13017ff492a79a62557
parents 737e31a0 5fcd99fe

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

+16 −0
Original line number Diff line number Diff line
@@ -31,6 +31,7 @@ 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;
@@ -1241,6 +1242,7 @@ 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;
@@ -1255,6 +1257,7 @@ 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;
@@ -1300,6 +1303,7 @@ 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;
@@ -1309,6 +1313,7 @@ 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;
@@ -1328,6 +1333,7 @@ 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;
@@ -1337,6 +1343,7 @@ 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;
@@ -1346,6 +1353,7 @@ 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;
@@ -1371,6 +1379,7 @@ 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;
@@ -1381,6 +1390,7 @@ 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;
@@ -1391,6 +1401,7 @@ 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;
@@ -1400,6 +1411,7 @@ 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;
@@ -1409,6 +1421,7 @@ 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;
@@ -1418,6 +1431,7 @@ 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;
@@ -1427,6 +1441,7 @@ 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;
@@ -1437,6 +1452,7 @@ 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;

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

+8 −0
Original line number Diff line number Diff line
@@ -21,6 +21,7 @@ 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;
@@ -206,6 +207,7 @@ 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;
@@ -215,6 +217,7 @@ 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;
@@ -243,6 +246,7 @@ 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;
@@ -253,6 +257,7 @@ 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;
@@ -262,6 +267,7 @@ 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;
@@ -271,6 +277,7 @@ 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;
@@ -281,6 +288,7 @@ 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;

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

+4 −0
Original line number Diff line number Diff line
@@ -22,6 +22,7 @@ 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;
@@ -387,6 +388,7 @@ 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;
@@ -397,6 +399,7 @@ 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;
@@ -418,6 +421,7 @@ 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;

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

+35 −0
Original line number Diff line number Diff line
@@ -58,6 +58,7 @@ 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.Context;
@@ -1570,6 +1571,7 @@ 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(
@@ -1589,6 +1591,7 @@ 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(
@@ -1606,6 +1609,7 @@ 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(
@@ -1629,6 +1633,7 @@ 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")) {
@@ -1642,6 +1647,7 @@ 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")) {
@@ -1682,6 +1688,7 @@ 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")) {
@@ -1693,6 +1700,7 @@ 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)) {
@@ -1719,6 +1727,7 @@ 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)
@@ -1731,6 +1740,7 @@ 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)
@@ -1752,6 +1762,7 @@ 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)
@@ -1772,6 +1783,7 @@ 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")
@@ -1785,6 +1797,7 @@ 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")
@@ -1805,6 +1818,7 @@ 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")
@@ -1820,6 +1834,7 @@ 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;
@@ -1850,6 +1865,7 @@ 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")
@@ -1865,6 +1881,7 @@ 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")
@@ -1884,6 +1901,7 @@ public class AdapterService extends Service { 
        @Override

        public boolean fetchRemoteUuidsWithAttribution(

                BluetoothDevice device, AttributionSource attributionSource) {

            Attributable.setAttributionSource(device, attributionSource);

            AdapterService service = getService();

            if (service == null

                    || !callerIsSystemOrActiveOrManagedUser(service, TAG, "fetchRemoteUuids")
@@ -1900,6 +1918,7 @@ 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(
@@ -1925,6 +1944,7 @@ 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(
@@ -1952,6 +1972,7 @@ 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)
@@ -1975,6 +1996,7 @@ 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)
@@ -1991,6 +2013,7 @@ 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)
@@ -2007,6 +2030,7 @@ 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(
@@ -2020,6 +2044,7 @@ 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)
@@ -2036,6 +2061,7 @@ 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(
@@ -2049,6 +2075,7 @@ 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)
@@ -2065,6 +2092,7 @@ 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(
@@ -2078,6 +2106,7 @@ 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)
@@ -2104,6 +2133,7 @@ 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(
@@ -2120,6 +2150,7 @@ 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(
@@ -2348,6 +2379,7 @@ 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)
@@ -2375,6 +2407,7 @@ 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)
@@ -2396,6 +2429,7 @@ 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)
@@ -2414,6 +2448,7 @@ 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)

src/com/android/bluetooth/hearingaid/HearingAidService.java

+10 −0

File changed.

Preview size limit exceeded, changes collapsed.