am 6e6d2362: Merge change I25f2afba into eclair

Merge commit '6e6d2362ccd119e51839a4f306c26783f634ab15' into eclair-plus-aosp

* commit '6e6d2362ccd119e51839a4f306c26783f634ab15':
  Check if a device is added to the cache before returning.
This commit is contained in:
Jaikumar Ganesh
2009-10-07 11:32:19 -07:00
committed by Android Git Automerger

View File

@@ -172,8 +172,14 @@ public class CachedBluetoothDeviceManager {
if (!readPairedDevices()) {
Log.e(TAG, "Got bonding state changed for " + device +
", but we have no record of that device.");
return;
}
cachedDevice = findDevice(device);
if (cachedDevice == null) {
Log.e(TAG, "Got bonding state changed for " + device +
"but device not added in cache");
return;
}
return;
}
cachedDevice.onBondingStateChanged(bondState);