commit 5de9459c81bfedb5711946cf37278d017f060c39
author TreeHugger Robot <treehugger-gerrit@google.com> Thu Apr 19 20:55:49 2018 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Thu Apr 19 20:55:49 2018 +0000
tree ecd80dac06428aa74a71eb5d1b0f433d05abce8b
parent dd61c7e8e7736914c476a47627ca9f7a12588a83
parent ad23a8021d6f37c8da2c08d4fc046b57c842656d

Merge "Fix channels --stats dump" into pi-dev

services/core/java/com/android/server/notification/RankingHelper.java

diff --git a/services/core/java/com/android/server/notification/RankingHelper.java b/services/core/java/com/android/server/notification/RankingHelper.java
index 0c444cb..febce31 100644
--- a/services/core/java/com/android/server/notification/RankingHelper.java
+++ b/services/core/java/com/android/server/notification/RankingHelper.java
@@ -1284,12 +1284,16 @@
                         if (r.showBadge != DEFAULT_SHOW_BADGE) {
                             record.put("showBadge", Boolean.valueOf(r.showBadge));
                         }
+                        JSONArray channels = new JSONArray();
                         for (NotificationChannel channel : r.channels.values()) {
-                            record.put("channel", channel.toJson());
+                            channels.put(channel.toJson());
                         }
+                        record.put("channels", channels);
+                        JSONArray groups = new JSONArray();
                         for (NotificationChannelGroup group : r.groups.values()) {
-                            record.put("group", group.toJson());
+                            groups.put(group.toJson());
                         }
+                        record.put("groups", groups);
                     } catch (JSONException e) {
                         // pass
                     }