Merge "Fix Bluetooth OOB pairing not working for unseen devices" am:... (be15b964) · Commits · e / os / android_frameworks_base

packages/SettingsLib/src/com/android/settingslib/bluetooth/BluetoothEventManager.java

+8 −8

Original line number	Diff line number	Diff line
		@@ -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);
		}

		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);
		}
		}