Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit a5b76650 authored by Julia Reynolds's avatar Julia Reynolds Committed by android-build-merger
Browse files

Merge "Merge "Fix channels --stats dump" into pi-dev am: 5de9459c" into pi-dev-plus-aosp 

am: acc6c957

Change-Id: I170d8472d8b330caeba25ce1c4ebcc5d36a4fbeb
parents 4ad7fa90 acc6c957

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

+6 −2
Original line number Diff line number Diff line
@@ -1284,12 +1284,16 @@ public class RankingHelper implements RankingConfig { 
                        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

                    }