diff options
| author | Joe Onorato <joeo@google.com> | 2010-09-27 14:13:46 -0700 |
|---|---|---|
| committer | Joe Onorato <joeo@google.com> | 2010-09-27 14:13:46 -0700 |
| commit | 7ebd659dbf3aa672cd1a686938f3df22d429be1f (patch) | |
| tree | 8b20433831b23de28592f8022e65e89195e02b2c /packages/SystemUI/src/com/android/systemui | |
| parent | c18ac6ef8475bf0b4a200054f898498bc21e1534 (diff) | |
| parent | f9f9e248a034b3dd891a7bd9f476b1cad5f33779 (diff) | |
| download | frameworks_base-7ebd659dbf3aa672cd1a686938f3df22d429be1f.zip frameworks_base-7ebd659dbf3aa672cd1a686938f3df22d429be1f.tar.gz frameworks_base-7ebd659dbf3aa672cd1a686938f3df22d429be1f.tar.bz2 | |
Merge commit 'f9f9e248' into manualmerge
Conflicts:
packages/SystemUI/src/com/android/systemui/statusbar/StatusBarService.java
tests/StatusBar/src/com/android/statusbartest/StatusBarTest.java
Change-Id: Ibbb2fec2d8c6f5d41398272753d271dfae698100
Diffstat (limited to 'packages/SystemUI/src/com/android/systemui')
| -rw-r--r-- | packages/SystemUI/src/com/android/systemui/statusbar/CommandQueue.java | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/CommandQueue.java b/packages/SystemUI/src/com/android/systemui/statusbar/CommandQueue.java index 3ef12f9..81091e3 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/CommandQueue.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/CommandQueue.java @@ -175,8 +175,10 @@ public 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; |