Merge changes from topic "btapiattribution" into sc-dev

* changes:
  More AttributionSource plumbing.
  Pass attribution source to BT APIs.

1 files changed, 74 insertions, 70 deletions

diff --git a/framework/java/android/bluetooth/BluetoothAdapter.java b/framework/java/android/bluetooth/BluetoothAdapter.java
index 2426ead810..18e6356d82 100644
--- a/framework/java/android/bluetooth/BluetoothAdapter.java
+++ b/framework/java/android/bluetooth/BluetoothAdapter.java
@@ -706,11 +706,13 @@ public final class BluetoothAdapter {
      */
     private static BluetoothAdapter sAdapter;
 
-    private static BluetoothLeScanner sBluetoothLeScanner;
-    private static BluetoothLeAdvertiser sBluetoothLeAdvertiser;
-    private static PeriodicAdvertisingManager sPeriodicAdvertisingManager;
+    private BluetoothLeScanner mBluetoothLeScanner;
+    private BluetoothLeAdvertiser mBluetoothLeAdvertiser;
+    private PeriodicAdvertisingManager mPeriodicAdvertisingManager;
 
     private final IBluetoothManager mManagerService;
+    private final AttributionSource mAttributionSource;
+
     @UnsupportedAppUsage
     private IBluetooth mService;
     private final ReentrantReadWriteLock mServiceLock = new ReentrantReadWriteLock();
@@ -722,8 +724,6 @@ public final class BluetoothAdapter {
     private final Map<BluetoothConnectionCallback, Executor>
             mBluetoothConnectionCallbackExecutorMap = new HashMap<>();
 
-    private AttributionSource mAttributionSource;
-
     /**
      * Bluetooth metadata listener. Overrides the default BluetoothMetadataListener
      * implementation.
@@ -752,27 +752,33 @@ public final class BluetoothAdapter {
 
     /**
      * Get a handle to the default local Bluetooth adapter.
-     * <p>Currently Android only supports one Bluetooth adapter, but the API
-     * could be extended to support more. This will always return the default
-     * adapter.
+     * <p>
+     * Currently Android only supports one Bluetooth adapter, but the API could
+     * be extended to support more. This will always return the default adapter.
      * </p>
      *
-     * @return the default local adapter, or null if Bluetooth is not supported on this hardware
-     * platform
+     * @return the default local adapter, or null if Bluetooth is not supported
+     *         on this hardware platform
+     * @deprecated this method will continue to work, but developers are
+     *             strongly encouraged to migrate to using
+     *             {@link BluetoothManager#getAdapter()}, since that approach
+     *             enables support for {@link Context#createAttributionContext}.
      */
+    @Deprecated
     @RequiresNoPermission
     public static synchronized BluetoothAdapter getDefaultAdapter() {
         if (sAdapter == null) {
-            sAdapter = createAdapter();
+            sAdapter = createAdapter(BluetoothManager.resolveAttributionSource(null));
         }
         return sAdapter;
     }
 
     /** {@hide} */
-    public static BluetoothAdapter createAdapter() {
+    public static BluetoothAdapter createAdapter(AttributionSource attributionSource) {
         IBinder binder = ServiceManager.getService(BLUETOOTH_MANAGER_SERVICE);
         if (binder != null) {
-            return new BluetoothAdapter(IBluetoothManager.Stub.asInterface(binder));
+            return new BluetoothAdapter(IBluetoothManager.Stub.asInterface(binder),
+                    attributionSource);
         } else {
             Log.e(TAG, "Bluetooth binder is null");
             return null;
@@ -782,7 +788,7 @@ public final class BluetoothAdapter {
     /**
      * Use {@link #getDefaultAdapter} to get the BluetoothAdapter instance.
      */
-    BluetoothAdapter(IBluetoothManager managerService) {
+    BluetoothAdapter(IBluetoothManager managerService, AttributionSource attributionSource) {
         if (managerService == null) {
             throw new IllegalArgumentException("bluetooth manager service is null");
         }
@@ -794,20 +800,12 @@ public final class BluetoothAdapter {
         } finally {
             mServiceLock.writeLock().unlock();
         }
-        mManagerService = managerService;
+        mManagerService = Objects.requireNonNull(managerService);
+        mAttributionSource = Objects.requireNonNull(attributionSource);
         mLeScanClients = new HashMap<LeScanCallback, ScanCallback>();
         mToken = new Binder();
     }
 
-    void setAttributionSource(AttributionSource attributionSource) {
-        mAttributionSource = attributionSource;
-    }
-
-    private AttributionSource resolveAttributionSource() {
-        return (mAttributionSource != null) ? mAttributionSource
-                : ActivityThread.currentAttributionSource();
-    }
-
     /**
      * Get a {@link BluetoothDevice} object for the given Bluetooth hardware
      * address.
@@ -864,11 +862,11 @@ public final class BluetoothAdapter {
             return null;
         }
         synchronized (mLock) {
-            if (sBluetoothLeAdvertiser == null) {
-                sBluetoothLeAdvertiser = new BluetoothLeAdvertiser(mManagerService);
+            if (mBluetoothLeAdvertiser == null) {
+                mBluetoothLeAdvertiser = new BluetoothLeAdvertiser(this);
             }
+            return mBluetoothLeAdvertiser;
         }
-        return sBluetoothLeAdvertiser;
     }
 
     /**
@@ -892,11 +890,11 @@ public final class BluetoothAdapter {
         }
 
         synchronized (mLock) {
-            if (sPeriodicAdvertisingManager == null) {
-                sPeriodicAdvertisingManager = new PeriodicAdvertisingManager(mManagerService);
+            if (mPeriodicAdvertisingManager == null) {
+                mPeriodicAdvertisingManager = new PeriodicAdvertisingManager(this);
             }
+            return mPeriodicAdvertisingManager;
         }
-        return sPeriodicAdvertisingManager;
     }
 
     /**
@@ -908,12 +906,11 @@ public final class BluetoothAdapter {
             return null;
         }
         synchronized (mLock) {
-            if (sBluetoothLeScanner == null) {
-                sBluetoothLeScanner =
-                        new BluetoothLeScanner(mManagerService, resolveAttributionSource());
+            if (mBluetoothLeScanner == null) {
+                mBluetoothLeScanner = new BluetoothLeScanner(this);
             }
+            return mBluetoothLeScanner;
         }
-        return sBluetoothLeScanner;
     }
 
     /**
@@ -1349,7 +1346,7 @@ public final class BluetoothAdapter {
         try {
             mServiceLock.readLock().lock();
             if (mService != null) {
-                return mService.getUuids(resolveAttributionSource());
+                return mService.getUuids(mAttributionSource);
             }
         } catch (RemoteException e) {
             Log.e(TAG, "", e);
@@ -1383,7 +1380,7 @@ public final class BluetoothAdapter {
         try {
             mServiceLock.readLock().lock();
             if (mService != null) {
-                return mService.setName(name, resolveAttributionSource());
+                return mService.setName(name, mAttributionSource);
             }
         } catch (RemoteException e) {
             Log.e(TAG, "", e);
@@ -1411,7 +1408,7 @@ public final class BluetoothAdapter {
         try {
             mServiceLock.readLock().lock();
             if (mService != null) {
-                return mService.getBluetoothClass(resolveAttributionSource());
+                return mService.getBluetoothClass(mAttributionSource);
             }
         } catch (RemoteException e) {
             Log.e(TAG, "", e);
@@ -1467,7 +1464,7 @@ public final class BluetoothAdapter {
         if (getState() != STATE_ON) return BluetoothAdapter.IO_CAPABILITY_UNKNOWN;
         try {
             mServiceLock.readLock().lock();
-            if (mService != null) return mService.getIoCapability(resolveAttributionSource());
+            if (mService != null) return mService.getIoCapability(mAttributionSource);
         } catch (RemoteException e) {
             Log.e(TAG, e.getMessage(), e);
         } finally {
@@ -1520,7 +1517,7 @@ public final class BluetoothAdapter {
         if (getState() != STATE_ON) return BluetoothAdapter.IO_CAPABILITY_UNKNOWN;
         try {
             mServiceLock.readLock().lock();
-            if (mService != null) return mService.getLeIoCapability(resolveAttributionSource());
+            if (mService != null) return mService.getLeIoCapability(mAttributionSource);
         } catch (RemoteException e) {
             Log.e(TAG, e.getMessage(), e);
         } finally {
@@ -1582,7 +1579,7 @@ public final class BluetoothAdapter {
         try {
             mServiceLock.readLock().lock();
             if (mService != null) {
-                return mService.getScanMode(resolveAttributionSource());
+                return mService.getScanMode(mAttributionSource);
             }
         } catch (RemoteException e) {
             Log.e(TAG, "", e);
@@ -1631,7 +1628,7 @@ public final class BluetoothAdapter {
             mServiceLock.readLock().lock();
             if (mService != null) {
                 int durationSeconds = Math.toIntExact(durationMillis / 1000);
-                return mService.setScanMode(mode, durationSeconds, resolveAttributionSource());
+                return mService.setScanMode(mode, durationSeconds, mAttributionSource);
             }
         } catch (RemoteException e) {
             Log.e(TAG, "", e);
@@ -1681,7 +1678,7 @@ public final class BluetoothAdapter {
         try {
             mServiceLock.readLock().lock();
             if (mService != null) {
-                return mService.setScanMode(mode, getDiscoverableTimeout(), resolveAttributionSource());
+                return mService.setScanMode(mode, getDiscoverableTimeout(), mAttributionSource);
             }
         } catch (RemoteException e) {
             Log.e(TAG, "", e);
@@ -1702,7 +1699,7 @@ public final class BluetoothAdapter {
         try {
             mServiceLock.readLock().lock();
             if (mService != null) {
-                return mService.getDiscoverableTimeout(resolveAttributionSource());
+                return mService.getDiscoverableTimeout(mAttributionSource);
             }
         } catch (RemoteException e) {
             Log.e(TAG, "", e);
@@ -1723,7 +1720,7 @@ public final class BluetoothAdapter {
         try {
             mServiceLock.readLock().lock();
             if (mService != null) {
-                mService.setDiscoverableTimeout(timeout, resolveAttributionSource());
+                mService.setDiscoverableTimeout(timeout, mAttributionSource);
             }
         } catch (RemoteException e) {
             Log.e(TAG, "", e);
@@ -1796,7 +1793,7 @@ public final class BluetoothAdapter {
         try {
             mServiceLock.readLock().lock();
             if (mService != null) {
-                return mService.startDiscovery(resolveAttributionSource());
+                return mService.startDiscovery(mAttributionSource);
             }
         } catch (RemoteException e) {
             Log.e(TAG, "", e);
@@ -1832,7 +1829,7 @@ public final class BluetoothAdapter {
         try {
             mServiceLock.readLock().lock();
             if (mService != null) {
-                return mService.cancelDiscovery(resolveAttributionSource());
+                return mService.cancelDiscovery(mAttributionSource);
             }
         } catch (RemoteException e) {
             Log.e(TAG, "", e);
@@ -1870,7 +1867,7 @@ public final class BluetoothAdapter {
         try {
             mServiceLock.readLock().lock();
             if (mService != null) {
-                return mService.isDiscovering(resolveAttributionSource());
+                return mService.isDiscovering(mAttributionSource);
             }
         } catch (RemoteException e) {
             Log.e(TAG, "", e);
@@ -2307,7 +2304,7 @@ public final class BluetoothAdapter {
         try {
             mServiceLock.readLock().lock();
             if (mService != null) {
-                return mService.getMaxConnectedAudioDevices(resolveAttributionSource());
+                return mService.getMaxConnectedAudioDevices(mAttributionSource);
             }
         } catch (RemoteException e) {
             Log.e(TAG, "failed to get getMaxConnectedAudioDevices, error: ", e);
@@ -2335,7 +2332,7 @@ public final class BluetoothAdapter {
                 // BLE is not supported
                 return false;
             }
-            return (iGatt.numHwTrackFiltersAvailable() != 0);
+            return (iGatt.numHwTrackFiltersAvailable(mAttributionSource) != 0);
         } catch (RemoteException e) {
             Log.e(TAG, "", e);
         }
@@ -2419,7 +2416,7 @@ public final class BluetoothAdapter {
         try {
             mServiceLock.readLock().lock();
             if (mService != null) {
-                return mService.getMostRecentlyConnectedDevices(resolveAttributionSource());
+                return mService.getMostRecentlyConnectedDevices(mAttributionSource);
             }
         } catch (RemoteException e) {
             Log.e(TAG, "", e);
@@ -2449,7 +2446,7 @@ public final class BluetoothAdapter {
         try {
             mServiceLock.readLock().lock();
             if (mService != null) {
-                return toDeviceSet(mService.getBondedDevices(resolveAttributionSource()));
+                return toDeviceSet(mService.getBondedDevices(mAttributionSource));
             }
             return toDeviceSet(new BluetoothDevice[0]);
         } catch (RemoteException e) {
@@ -2974,50 +2971,51 @@ public final class BluetoothAdapter {
         }
 
         if (profile == BluetoothProfile.HEADSET) {
-            BluetoothHeadset headset = new BluetoothHeadset(context, listener);
+            BluetoothHeadset headset = new BluetoothHeadset(context, listener, this);
             return true;
         } else if (profile == BluetoothProfile.A2DP) {
-            BluetoothA2dp a2dp = new BluetoothA2dp(context, listener);
+            BluetoothA2dp a2dp = new BluetoothA2dp(context, listener, this);
             return true;
         } else if (profile == BluetoothProfile.A2DP_SINK) {
-            BluetoothA2dpSink a2dpSink = new BluetoothA2dpSink(context, listener);
+            BluetoothA2dpSink a2dpSink = new BluetoothA2dpSink(context, listener, this);
             return true;
         } else if (profile == BluetoothProfile.AVRCP_CONTROLLER) {
-            BluetoothAvrcpController avrcp = new BluetoothAvrcpController(context, listener);
+            BluetoothAvrcpController avrcp = new BluetoothAvrcpController(context, listener, this);
             return true;
         } else if (profile == BluetoothProfile.HID_HOST) {
-            BluetoothHidHost iDev = new BluetoothHidHost(context, listener);
+            BluetoothHidHost iDev = new BluetoothHidHost(context, listener, this);
             return true;
         } else if (profile == BluetoothProfile.PAN) {
-            BluetoothPan pan = new BluetoothPan(context, listener);
+            BluetoothPan pan = new BluetoothPan(context, listener, this);
             return true;
         } else if (profile == BluetoothProfile.PBAP) {
-            BluetoothPbap pbap = new BluetoothPbap(context, listener);
+            BluetoothPbap pbap = new BluetoothPbap(context, listener, this);
             return true;
         } else if (profile == BluetoothProfile.HEALTH) {
             Log.e(TAG, "getProfileProxy(): BluetoothHealth is deprecated");
             return false;
         } else if (profile == BluetoothProfile.MAP) {
-            BluetoothMap map = new BluetoothMap(context, listener);
+            BluetoothMap map = new BluetoothMap(context, listener, this);
             return true;
         } else if (profile == BluetoothProfile.HEADSET_CLIENT) {
-            BluetoothHeadsetClient headsetClient = new BluetoothHeadsetClient(context, listener);
+            BluetoothHeadsetClient headsetClient =
+                    new BluetoothHeadsetClient(context, listener, this);
             return true;
         } else if (profile == BluetoothProfile.SAP) {
-            BluetoothSap sap = new BluetoothSap(context, listener);
+            BluetoothSap sap = new BluetoothSap(context, listener, this);
             return true;
         } else if (profile == BluetoothProfile.PBAP_CLIENT) {
-            BluetoothPbapClient pbapClient = new BluetoothPbapClient(context, listener);
+            BluetoothPbapClient pbapClient = new BluetoothPbapClient(context, listener, this);
             return true;
         } else if (profile == BluetoothProfile.MAP_CLIENT) {
-            BluetoothMapClient mapClient = new BluetoothMapClient(context, listener);
+            BluetoothMapClient mapClient = new BluetoothMapClient(context, listener, this);
             return true;
         } else if (profile == BluetoothProfile.HID_DEVICE) {
-            BluetoothHidDevice hidDevice = new BluetoothHidDevice(context, listener);
+            BluetoothHidDevice hidDevice = new BluetoothHidDevice(context, listener, this);
             return true;
         } else if (profile == BluetoothProfile.HEARING_AID) {
             if (isHearingAidProfileSupported()) {
-                BluetoothHearingAid hearingAid = new BluetoothHearingAid(context, listener);
+                BluetoothHearingAid hearingAid = new BluetoothHearingAid(context, listener, this);
                 return true;
             }
             return false;
@@ -3171,11 +3169,11 @@ public final class BluetoothAdapter {
                         if (mLeScanClients != null) {
                             mLeScanClients.clear();
                         }
-                        if (sBluetoothLeAdvertiser != null) {
-                            sBluetoothLeAdvertiser.cleanup();
+                        if (mBluetoothLeAdvertiser != null) {
+                            mBluetoothLeAdvertiser.cleanup();
                         }
-                        if (sBluetoothLeScanner != null) {
-                            sBluetoothLeScanner.cleanup();
+                        if (mBluetoothLeScanner != null) {
+                            mBluetoothLeScanner.cleanup();
                         }
                     } finally {
                         mServiceLock.writeLock().unlock();
@@ -3514,11 +3512,17 @@ public final class BluetoothAdapter {
                 && (Integer.parseInt(address.split(":")[5], 16) & 0b11) == 0b11;
     }
 
+    /** {@hide} */
     @UnsupportedAppUsage
-    /*package*/ IBluetoothManager getBluetoothManager() {
+    public IBluetoothManager getBluetoothManager() {
         return mManagerService;
     }
 
+    /** {@hide} */
+    public AttributionSource getAttributionSource() {
+        return mAttributionSource;
+    }
+
     private final ArrayList<IBluetoothManagerCallback> mProxyServiceStateCallbacks =
             new ArrayList<IBluetoothManagerCallback>();