diff options
| author | Android (Google) Code Review <android-gerrit@google.com> | 2009-12-09 17:45:07 -0800 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2009-12-09 17:45:07 -0800 |
| commit | d70e205b4c6dbf9661b972aa208d5a42927bdd88 (patch) | |
| tree | b7965a7a4969170e955c78764e8a814fad7ddb96 /src | |
| parent | 1d5f14bd54490ccd4c93dfe350aa5abfbfe9ceda (diff) | |
| parent | 792edfcf12f669378f218c13f8fd4e54d587d87a (diff) | |
| download | packages_apps_settings-d70e205b4c6dbf9661b972aa208d5a42927bdd88.zip packages_apps_settings-d70e205b4c6dbf9661b972aa208d5a42927bdd88.tar.gz packages_apps_settings-d70e205b4c6dbf9661b972aa208d5a42927bdd88.tar.bz2 | |
Merge change I724fc8fd into eclair
* changes:
b/2317194 Synchronize command queue to prevent ConcurrentModificationException from happening
Diffstat (limited to 'src')
| -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 c3b97f6..53c1253 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 |