Remove LocalBluetoothAdapter from CachedBluetoothDeviceManager::addDevice()

Bug: 111815935
Test: make -j50 RunSettingsRoboTests

Change-Id: I5294439853ce35bccd883ed2aa21b33802d76cb1

diff --git a/src/com/android/settings/bluetooth/BluetoothPermissionActivity.java b/src/com/android/settings/bluetooth/BluetoothPermissionActivity.java
index 74a5f24..5f17e5f 100644 (file)
--- a/src/com/android/settings/bluetooth/BluetoothPermissionActivity.java
+++ b/src/com/android/settings/bluetooth/BluetoothPermissionActivity.java
@@ -207,8 +207,7 @@ public class BluetoothPermissionActivity extends AlertActivity implements
                     bluetoothManager.getCachedDeviceManager();
             CachedBluetoothDevice cachedDevice = cachedDeviceManager.findDevice(mDevice);
             if (cachedDevice == null) {
-                cachedDevice = cachedDeviceManager.addDevice(bluetoothManager.getBluetoothAdapter(),
-                                                             mDevice);
+                cachedDevice = cachedDeviceManager.addDevice(mDevice);
             }
             always = cachedDevice.checkAndIncreaseMessageRejectionCount();
         }

diff --git a/src/com/android/settings/bluetooth/BluetoothPermissionRequest.java b/src/com/android/settings/bluetooth/BluetoothPermissionRequest.java
index bbf3fff..c452957 100644 (file)
--- a/src/com/android/settings/bluetooth/BluetoothPermissionRequest.java
+++ b/src/com/android/settings/bluetooth/BluetoothPermissionRequest.java
@@ -231,8 +231,7 @@ public final class BluetoothPermissionRequest extends BroadcastReceiver {
             bluetoothManager.getCachedDeviceManager();
         CachedBluetoothDevice cachedDevice = cachedDeviceManager.findDevice(mDevice);
         if (cachedDevice == null) {
-            cachedDevice = cachedDeviceManager.addDevice(bluetoothManager.getBluetoothAdapter(),
-                mDevice);
+            cachedDevice = cachedDeviceManager.addDevice(mDevice);
         }
 
         String intentName = BluetoothDevice.ACTION_CONNECTION_ACCESS_REPLY;