diff options
| author | Michael Chan <mchan@android.com> | 2009-12-10 17:49:40 -0800 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2009-12-10 17:49:40 -0800 |
| commit | ae03d202c65de85270a20900e1e80608692b815f (patch) | |
| tree | cd80a01e40f105fdd32ca145ea15fd1eef2f4645 | |
| parent | b37c4a09bbf9535db984b7165612184b4024a01e (diff) | |
| parent | c8559a526c1544d3b954dbb5522282edba7db9b6 (diff) | |
| download | packages_apps_settings-ae03d202c65de85270a20900e1e80608692b815f.zip packages_apps_settings-ae03d202c65de85270a20900e1e80608692b815f.tar.gz packages_apps_settings-ae03d202c65de85270a20900e1e80608692b815f.tar.bz2 | |
am c8559a52: am d70e205b: Merge change I724fc8fd into eclair
Merge commit 'c8559a526c1544d3b954dbb5522282edba7db9b6' into eclair-mr2-plus-aosp
* commit 'c8559a526c1544d3b954dbb5522282edba7db9b6':
b/2317194 Synchronize command queue to prevent ConcurrentModificationException from happening
| -rw-r--r-- | src/com/android/settings/bluetooth/CachedBluetoothDevice.java | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/com/android/settings/bluetooth/CachedBluetoothDevice.java b/src/com/android/settings/bluetooth/CachedBluetoothDevice.java index 8d80335..260cd8e 100644 --- a/src/com/android/settings/bluetooth/CachedBluetoothDevice.java +++ b/src/com/android/settings/bluetooth/CachedBluetoothDevice.java @@ -142,10 +142,10 @@ public class CachedBluetoothDevice implements Comparable<CachedBluetoothDevice> private static LinkedList<BluetoothJob> workQueue = new LinkedList<BluetoothJob>(); private void queueCommand(BluetoothJob job) { - if (D) { - Log.d(TAG, workQueue.toString()); - } synchronized (workQueue) { + if (D) { + Log.d(TAG, workQueue.toString()); + } boolean processNow = pruneQueue(job); // Add job to queue |