PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
Merge commit '15bb47545686395c0d94b54dd67c4f080fe625e5' into kraken

* commit '15bb47545686395c0d94b54dd67c4f080fe625e5':
  b/2652059 Refresh UI after bond state change
This commit is contained in:
Michael Chan
2010-05-10 09:50:04 -07:00
committed by Android Git Automerger
parent d4869a99df 15bb475456
commit c56a35e3c6
1 changed files with 18 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

37
src/com/android/settings/bluetooth/CachedBluetoothDevice.java
View File

@@ -751,29 +751,28 @@ public class CachedBluetoothDevice implements Comparable<CachedBluetoothDevice>
mProfiles.clear(); mProfiles.clear();
BluetoothJob job = workQueue.peek(); BluetoothJob job = workQueue.peek();
if (job == null) { if (job != null) {
return; // 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 // Check to see if we need to remove the stale items from the queue
if (job.command == BluetoothCommand.REMOVE_BOND if (!pruneQueue(null)) {
&& job.cachedDevice.mDevice.equals(mDevice)) { // nothing in the queue was modify. Just ignore the notification and return.
workQueue.poll(); // dequeue refresh();
} else { return;
// 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 processCommands();
if (!pruneQueue(null)) {
// nothing in the queue was modify. Just ignore the notification and return.
return;
}
} }
processCommands();
} }
refresh(); refresh();