diff options
| author | Jaikumar Ganesh <jaikumar@google.com> | 2009-08-19 12:36:15 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2009-08-19 12:36:15 -0700 |
| commit | a7f08942a85a7307884f092b2c8ed15c06f99c70 (patch) | |
| tree | fa645b5c78e94e8a719b19706ccae5f50f14cb67 /src/com | |
| parent | 74d9c353edd240bbd8959b0341adf7582fcd3595 (diff) | |
| parent | 3b94f097567ac7a95e9cb180cc63771a5bc08289 (diff) | |
| download | packages_apps_Settings-a7f08942a85a7307884f092b2c8ed15c06f99c70.zip packages_apps_Settings-a7f08942a85a7307884f092b2c8ed15c06f99c70.tar.gz packages_apps_Settings-a7f08942a85a7307884f092b2c8ed15c06f99c70.tar.bz2 | |
am 3b94f097: Merge change 21929 into eclair
Merge commit '3b94f097567ac7a95e9cb180cc63771a5bc08289'
* commit '3b94f097567ac7a95e9cb180cc63771a5bc08289':
Fix device address check when profile state changes.
Diffstat (limited to 'src/com')
| -rw-r--r-- | src/com/android/settings/bluetooth/CachedBluetoothDevice.java | 2 |
1 files changed, 1 insertions, 1 deletions
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 @@ public class CachedBluetoothDevice implements Comparable<CachedBluetoothDevice> 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. |