summaryrefslogtreecommitdiffstats
path: root/packages
diff options
context:
space:
mode:
authorChristoph Studer <chstuder@google.com>2014-08-22 14:18:03 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2014-08-22 14:18:04 +0000
commit17cda4f80f7fd2ca644491ad13afda6ff4b8b206 (patch)
tree24ccd1ae4e48b7100619b2c57013749388b68eac /packages
parent076e72554d4367a0377047fe7eb2e3ea73c5baec (diff)
parent11840cdca9b5f63f61bcdc2ab143995e9a901c53 (diff)
downloadframeworks_base-17cda4f80f7fd2ca644491ad13afda6ff4b8b206.zip
frameworks_base-17cda4f80f7fd2ca644491ad13afda6ff4b8b206.tar.gz
frameworks_base-17cda4f80f7fd2ca644491ad13afda6ff4b8b206.tar.bz2
Merge "SysUI: Fix NotificationData dump" into lmp-dev
Diffstat (limited to 'packages')
-rw-r--r--packages/SystemUI/src/com/android/systemui/statusbar/NotificationData.java17
1 files changed, 10 insertions, 7 deletions
diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/NotificationData.java b/packages/SystemUI/src/com/android/systemui/statusbar/NotificationData.java
index 9408042..7fefa64 100644
--- a/packages/SystemUI/src/com/android/systemui/statusbar/NotificationData.java
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/NotificationData.java
@@ -252,18 +252,21 @@ public class NotificationData {
int N = mSortedAndFiltered.size();
pw.print(indent);
pw.println("active notifications: " + N);
- for (int i = 0; i < N; i++) {
- NotificationData.Entry e = mSortedAndFiltered.get(i);
- dumpEntry(pw, indent, i, e);
+ int active;
+ for (active = 0; active < N; active++) {
+ NotificationData.Entry e = mSortedAndFiltered.get(active);
+ dumpEntry(pw, indent, active, e);
}
int M = mEntries.size();
pw.print(indent);
- pw.println("inactive notifications: " + M);
+ pw.println("inactive notifications: " + (M - active));
+ int inactiveCount = 0;
for (int i = 0; i < M; i++) {
Entry entry = mEntries.valueAt(i);
if (!mSortedAndFiltered.contains(entry)) {
- dumpEntry(pw, indent, i, entry);
+ dumpEntry(pw, indent, inactiveCount, entry);
+ inactiveCount++;
}
}
}
@@ -273,8 +276,8 @@ public class NotificationData {
pw.println(" [" + i + "] key=" + e.key + " icon=" + e.icon);
StatusBarNotification n = e.notification;
pw.print(indent);
- pw.println(" pkg=" + n.getPackageName() + " id=" + n.getId() + " score=" + n
- .getScore());
+ pw.println(" pkg=" + n.getPackageName() + " id=" + n.getId() + " score=" +
+ n.getScore());
pw.print(indent);
pw.println(" notification=" + n.getNotification());
pw.print(indent);