summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDaniel Sandler <dsandler@android.com>2010-08-16 12:22:29 -0700
committerAndroid (Google) Code Review <android-gerrit@google.com>2010-08-16 12:22:29 -0700
commit80810f86e93866674f3a4ca61f84887e7717aa63 (patch)
tree851e1b8871786eeb49becab5b9416507b35e188b
parenteff30e3d1b005fd0696390d1dd47ec4ff0c52784 (diff)
parentf8d5809eee3eb6c9e33bcc0363ac7d85559f6e08 (diff)
downloadframeworks_base-80810f86e93866674f3a4ca61f84887e7717aa63.zip
frameworks_base-80810f86e93866674f3a4ca61f84887e7717aa63.tar.gz
frameworks_base-80810f86e93866674f3a4ca61f84887e7717aa63.tar.bz2
Merge "Fix crash in status bar ticker." into gingerbread
-rw-r--r--packages/SystemUI/src/com/android/systemui/statusbar/Ticker.java4
1 files changed, 2 insertions, 2 deletions
diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/Ticker.java b/packages/SystemUI/src/com/android/systemui/statusbar/Ticker.java
index 07e8653..3a697a6 100644
--- a/packages/SystemUI/src/com/android/systemui/statusbar/Ticker.java
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/Ticker.java
@@ -185,11 +185,11 @@ public abstract class Ticker {
final Segment newSegment = new Segment(n, icon, n.notification.tickerText);
// If there's already a notification schedule for this package and id, remove it.
- for (int i=0; i<initialCount; i++) {
+ for (int i=0; i<mSegments.size(); i++) {
Segment seg = mSegments.get(i);
if (n.id == seg.notification.id && n.pkg.equals(seg.notification.pkg)) {
// just update that one to use this new data instead
- mSegments.remove(i);
+ mSegments.remove(i--); // restart iteration here
}
}