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

Commit 579a2e2c authored by Jeff DeCew's avatar Jeff DeCew Committed by Automerger Merge Worker
Browse files

Merge "Clean up NotifCollection logging slightly." into tm-qpr-dev am: ecb49e9d 

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18914148



Change-Id: Ifbba8ea06c07d1f4be30819f643d1bfc5e5b24fa
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents ffd0aa81 ecb49e9d

packages/SystemUI/src/com/android/systemui/statusbar/notification/collection/ListDumper.java

+2 −1
Original line number Diff line number Diff line
@@ -115,6 +115,7 @@ public class ListDumper { 
    ) {

        sb.append(indent)

                .append("[").append(index).append("] ")

                .append(index.length() == 1 ? " " : "")

                .append(entry.getKey());



        if (includeParent) {
@@ -192,7 +193,7 @@ public class ListDumper { 
            if (notifEntry.getAttachState().getSuppressedChanges().getSection() != null) {

                rksb.append("suppressedSection=")

                        .append(notifEntry.getAttachState().getSuppressedChanges()

                                .getSection())

                                .getSection().getLabel())

                        .append(" ");

            }

packages/SystemUI/src/com/android/systemui/statusbar/notification/collection/NotifCollection.java

+3 −4
Original line number Diff line number Diff line
@@ -104,6 +104,7 @@ import java.util.ArrayDeque; 
import java.util.ArrayList;

import java.util.Collection;

import java.util.Collections;

import java.util.Comparator;

import java.util.HashMap;

import java.util.List;

import java.util.Map;
@@ -829,11 +830,9 @@ public class NotifCollection implements Dumpable { 
    @Override

    public void dump(PrintWriter pw, @NonNull String[] args) {

        final List<NotificationEntry> entries = new ArrayList<>(getAllNotifs());

        entries.sort(Comparator.comparing(NotificationEntry::getKey));



        pw.println("\t" + TAG + " unsorted/unfiltered notifications:");

        if (entries.size() == 0) {

            pw.println("\t\t None");

        }

        pw.println("\t" + TAG + " unsorted/unfiltered notifications: " + entries.size());

        pw.println(

                ListDumper.dumpList(

                        entries,