Merge change I25f2afba into eclair

* changes:
  Check if a device is added to the cache before returning.

src/com/android/settings/bluetooth/CachedBluetoothDeviceManager.java

@@ -172,9 +172,15 @@ 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;
+            }
+        }
 
         cachedDevice.onBondingStateChanged(bondState);