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"

Browse Source 
am: 3ef0315eb7

Change-Id: I05f7aaf1f0bdbffb6ef21e9250631633debb6b8b
This commit is contained in:
Jakub Pawlowski
2016-10-14 01:37:05 +00:00
committed by android-build-merger
parent 72510e6244 3ef0315eb7
commit bd1a923cac
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) { if (cachedDevice == null) {
Log.w(TAG, "CachedBluetoothDevice for device " + device + Log.w(TAG, "CachedBluetoothDevice for device " + device +
" not found, calling readPairedDevices()."); " not found, calling readPairedDevices().");
if (!readPairedDevices()) { if (readPairedDevices()) {
Log.e(TAG, "Got bonding state changed for " + device + cachedDevice = mDeviceManager.findDevice(device);
", but we have no record of that device.");
return;
} }
cachedDevice = mDeviceManager.findDevice(device);
if (cachedDevice == null) { if (cachedDevice == null) {
Log.e(TAG, "Got bonding state changed for " + device + Log.w(TAG, "Got bonding state changed for " + device +
", but device not added in cache."); ", but we have no record of that device.");
return;
cachedDevice = mDeviceManager.addDevice(mLocalAdapter, mProfileManager, device);
dispatchDeviceAdded(cachedDevice);
} }
} }