PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Remove LocalBluetoothAdapter from CachedBluetoothDeviceManager::addDevice()"

Browse Source
This commit is contained in:
TreeHugger Robot
2018-08-17 08:51:17 +00:00
committed by Android (Google) Code Review
parent 8b4b27efb3 f5c0145912
commit 090d9b22df
2 changed files with 2 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/com/android/settings/bluetooth/BluetoothPermissionActivity.java
View File

@@ -207,8 +207,7 @@ public class BluetoothPermissionActivity extends AlertActivity implements
bluetoothManager.getCachedDeviceManager(); bluetoothManager.getCachedDeviceManager();
CachedBluetoothDevice cachedDevice = cachedDeviceManager.findDevice(mDevice); CachedBluetoothDevice cachedDevice = cachedDeviceManager.findDevice(mDevice);
if (cachedDevice == null) { if (cachedDevice == null) {
cachedDevice = cachedDeviceManager.addDevice(bluetoothManager.getBluetoothAdapter(), cachedDevice = cachedDeviceManager.addDevice(mDevice);
mDevice);
} }
always = cachedDevice.checkAndIncreaseMessageRejectionCount(); always = cachedDevice.checkAndIncreaseMessageRejectionCount();
} }

3
src/com/android/settings/bluetooth/BluetoothPermissionRequest.java
View File

@@ -231,8 +231,7 @@ public final class BluetoothPermissionRequest extends BroadcastReceiver {
bluetoothManager.getCachedDeviceManager(); bluetoothManager.getCachedDeviceManager();
CachedBluetoothDevice cachedDevice = cachedDeviceManager.findDevice(mDevice); CachedBluetoothDevice cachedDevice = cachedDeviceManager.findDevice(mDevice);
if (cachedDevice == null) { if (cachedDevice == null) {
cachedDevice = cachedDeviceManager.addDevice(bluetoothManager.getBluetoothAdapter(), cachedDevice = cachedDeviceManager.addDevice(mDevice);
mDevice);
} }
String intentName = BluetoothDevice.ACTION_CONNECTION_ACCESS_REPLY; String intentName = BluetoothDevice.ACTION_CONNECTION_ACCESS_REPLY;