From f5c0145912e292e628d594510e34f973ff9e0d4c Mon Sep 17 00:00:00 2001
From: timhypeng <timhypeng@google.com>
Date: Tue, 31 Jul 2018 15:15:10 +0800
Subject: [PATCH] Remove LocalBluetoothAdapter from
 CachedBluetoothDeviceManager::addDevice()

Bug: 111815935
Test: make -j50 RunSettingsRoboTests

Change-Id: I5294439853ce35bccd883ed2aa21b33802d76cb1
---
 .../settings/bluetooth/BluetoothPermissionActivity.java        | 3 +--
 .../android/settings/bluetooth/BluetoothPermissionRequest.java | 3 +--
 2 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/src/com/android/settings/bluetooth/BluetoothPermissionActivity.java b/src/com/android/settings/bluetooth/BluetoothPermissionActivity.java
index 74a5f246fce..5f17e5f2ae6 100644
--- 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 bbf3fffc6c7..c452957bc14 100644
--- 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;