From 11840cdca9b5f63f61bcdc2ab143995e9a901c53 Mon Sep 17 00:00:00 2001
From: Christoph Studer <chstuder@google.com>
Date: Thu, 21 Aug 2014 16:41:45 +0200
Subject: [PATCH] SysUI: Fix NotificationData dump

Inactive notification count and indices were off.

Change-Id: I6e8555fe7dcaf6e7f999f09fb4cda56622928b07
---
 .../systemui/statusbar/NotificationData.java    | 17 ++++++++++-------
 1 file 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 94080425032cc..7fefa64f6a812 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);