diff options
| author | Joe Onorato <joeo@android.com> | 2010-09-27 11:34:46 -0700 |
|---|---|---|
| committer | Joe Onorato <joeo@android.com> | 2010-09-27 11:34:46 -0700 |
| commit | 795f2840b4a70bf188c2f24c8c06f73a492b338c (patch) | |
| tree | 97017469832ff5a7c875a38fb31456528c12e92b /packages | |
| parent | 4e9751f0770c8bfe6f7d57465cba754af5aa942b (diff) | |
| download | frameworks_base-795f2840b4a70bf188c2f24c8c06f73a492b338c.zip frameworks_base-795f2840b4a70bf188c2f24c8c06f73a492b338c.tar.gz frameworks_base-795f2840b4a70bf188c2f24c8c06f73a492b338c.tar.bz2 | |
If an icon add remove get coalesced, don't remove some other icon.
Also adds a test case and turns off the extra logging we added to debug this.
Change-Id: I8640938ae4d1e75c88213177888f363e05ce0fa0
Diffstat (limited to 'packages')
| -rw-r--r-- | packages/SystemUI/src/com/android/systemui/statusbar/CommandQueue.java | 6 | ||||
| -rw-r--r-- | packages/SystemUI/src/com/android/systemui/statusbar/StatusBarService.java | 2 |
2 files changed, 5 insertions, 3 deletions
diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/CommandQueue.java b/packages/SystemUI/src/com/android/systemui/statusbar/CommandQueue.java index f9347b1..4f080d5 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/CommandQueue.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/CommandQueue.java @@ -165,8 +165,10 @@ class CommandQueue extends IStatusBar.Stub { break; } case OP_REMOVE_ICON: - mList.removeIcon(index); - mCallbacks.removeIcon(mList.getSlot(index), index, viewIndex); + if (mList.getIcon(index) != null) { + mList.removeIcon(index); + mCallbacks.removeIcon(mList.getSlot(index), index, viewIndex); + } break; } break; diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/StatusBarService.java b/packages/SystemUI/src/com/android/systemui/statusbar/StatusBarService.java index fece5ce..ea54656 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/StatusBarService.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/StatusBarService.java @@ -82,7 +82,7 @@ import com.android.systemui.statusbar.policy.StatusBarPolicy; public class StatusBarService extends Service implements CommandQueue.Callbacks { static final String TAG = "StatusBarService"; - static final boolean SPEW_ICONS = true; + static final boolean SPEW_ICONS = false; static final boolean SPEW = false; public static final String ACTION_STATUSBAR_START |