am d2c81986: b/2652059 Refresh UI after bond state change

Merge commit 'd2c81986c236ed680cfae5e420561028ae4cc0d2' into froyo-plus-aosp

* commit 'd2c81986c236ed680cfae5e420561028ae4cc0d2':
  b/2652059 Refresh UI after bond state change
This commit is contained in:
Michael Chan
2010-05-10 09:43:38 -07:00
committed by Android Git Automerger

View File

@@ -751,29 +751,28 @@ public class CachedBluetoothDevice implements Comparable<CachedBluetoothDevice>
mProfiles.clear();
BluetoothJob job = workQueue.peek();
if (job == null) {
return;
}
if (job != null) {
// Remove the first item and process the next one
if (job.command == BluetoothCommand.REMOVE_BOND
&& job.cachedDevice.mDevice.equals(mDevice)) {
workQueue.poll(); // dequeue
} else {
// Unexpected job
if (D) {
Log.d(TAG, "job.command = " + job.command);
Log.d(TAG, "mDevice:" + mDevice + " != head:" + job.toString());
}
// Remove the first item and process the next one
if (job.command == BluetoothCommand.REMOVE_BOND
&& job.cachedDevice.mDevice.equals(mDevice)) {
workQueue.poll(); // dequeue
} else {
// Unexpected job
if (D) {
Log.d(TAG, "job.command = " + job.command);
Log.d(TAG, "mDevice:" + mDevice + " != head:" + job.toString());
// Check to see if we need to remove the stale items from the queue
if (!pruneQueue(null)) {
// nothing in the queue was modify. Just ignore the notification and return.
refresh();
return;
}
}
// Check to see if we need to remove the stale items from the queue
if (!pruneQueue(null)) {
// nothing in the queue was modify. Just ignore the notification and return.
return;
}
processCommands();
}
processCommands();
}
refresh();