Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Fix Bluetooth OOB pairing not working for unseen devices" am: 3ef0315eb7

Browse Source 
am: bd1a923cac

Change-Id: I378f55d65663a1628ca53c1e2a63b850aac94845
This commit is contained in:
Jakub Pawlowski
2016-10-14 01:42:10 +00:00
committed by android-build-merger
parent 20b502a6b1 bd1a923cac
commit 08109a61d2
1 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
packages/SettingsLib/src/com/android/settingslib/bluetooth/BluetoothEventManager.java
View File

@@ -268,16 +268,16 @@ public final class BluetoothEventManager {
if (cachedDevice == null) {
Log.w(TAG, "CachedBluetoothDevice for device " + device +
" not found, calling readPairedDevices().");
if (!readPairedDevices()) {
Log.e(TAG, "Got bonding state changed for " + device +
", but we have no record of that device.");
return;
if (readPairedDevices()) {
cachedDevice = mDeviceManager.findDevice(device);
}
cachedDevice = mDeviceManager.findDevice(device);
if (cachedDevice == null) {
Log.e(TAG, "Got bonding state changed for " + device +
", but device not added in cache.");
return;
Log.w(TAG, "Got bonding state changed for " + device +
", but we have no record of that device.");
cachedDevice = mDeviceManager.addDevice(mLocalAdapter, mProfileManager, device);
dispatchDeviceAdded(cachedDevice);
}
}