Merge change 21929 into eclair

* changes:
  Fix device address check when profile state changes.
diff --git a/src/com/android/settings/bluetooth/CachedBluetoothDevice.java b/src/com/android/settings/bluetooth/CachedBluetoothDevice.java
index a4e3004..d13f77c 100644
--- a/src/com/android/settings/bluetooth/CachedBluetoothDevice.java
+++ b/src/com/android/settings/bluetooth/CachedBluetoothDevice.java
@@ -231,7 +231,7 @@
             BluetoothJob job = workQueue.peek();
             if (job == null) {
                 return;
-            } else if (job.cachedDevice.mDevice.equals(mDevice)) {
+            } else if (!job.cachedDevice.mDevice.equals(mDevice)) {
                 // This can happen in 2 cases: 1) BT device initiated pairing and
                 // 2) disconnects of one headset that's triggered by connects of
                 // another.