summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAdam Powell <adamp@google.com>2010-04-07 09:48:28 -0700
committerAndroid (Google) Code Review <android-gerrit@google.com>2010-04-07 09:48:28 -0700
commitbdbb57b6ab58ce5e14ce5cb1cd3b5d0351d566c4 (patch)
tree3ea1dcdbbc25b6975400a10823fce6583524b9c7
parent6e29e07357cb733ff204de21bfb4bf45833d4861 (diff)
parent54f334489c5d057446e23e452f4fe80d17c5b68e (diff)
downloadpackages_apps_settings-bdbb57b6ab58ce5e14ce5cb1cd3b5d0351d566c4.zip
packages_apps_settings-bdbb57b6ab58ce5e14ce5cb1cd3b5d0351d566c4.tar.gz
packages_apps_settings-bdbb57b6ab58ce5e14ce5cb1cd3b5d0351d566c4.tar.bz2
Merge "Fix bug 2564450 - prevent deadlock in BT settings" into froyo
-rw-r--r--src/com/android/settings/bluetooth/CachedBluetoothDeviceManager.java1
1 files changed, 0 insertions, 1 deletions
diff --git a/src/com/android/settings/bluetooth/CachedBluetoothDeviceManager.java b/src/com/android/settings/bluetooth/CachedBluetoothDeviceManager.java
index 7906d79..4497480 100644
--- a/src/com/android/settings/bluetooth/CachedBluetoothDeviceManager.java
+++ b/src/com/android/settings/bluetooth/CachedBluetoothDeviceManager.java
@@ -43,7 +43,6 @@ public class CachedBluetoothDeviceManager {
public CachedBluetoothDeviceManager(LocalBluetoothManager localManager) {
mLocalManager = localManager;
mCallbacks = localManager.getCallbacks();
- readPairedDevices();
}
private synchronized boolean readPairedDevices() {