diff options
2 files changed, 28 insertions, 4 deletions
diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/notification/collection/ShadeListBuilder.java b/packages/SystemUI/src/com/android/systemui/statusbar/notification/collection/ShadeListBuilder.java index 3ae2545e4e10..65a21a4e2190 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/notification/collection/ShadeListBuilder.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/notification/collection/ShadeListBuilder.java @@ -1160,12 +1160,21 @@ public class ShadeListBuilder implements Dumpable, PipelineDumpable { mLogger.logParentChanged(mIterationCount, prev.getParent(), curr.getParent()); } - if (curr.getSuppressedChanges().getParent() != null) { - mLogger.logParentChangeSuppressed( + GroupEntry currSuppressedParent = curr.getSuppressedChanges().getParent(); + GroupEntry prevSuppressedParent = prev.getSuppressedChanges().getParent(); + if (currSuppressedParent != null && (prevSuppressedParent == null + || !prevSuppressedParent.getKey().equals(currSuppressedParent.getKey()))) { + mLogger.logParentChangeSuppressedStarted( mIterationCount, - curr.getSuppressedChanges().getParent(), + currSuppressedParent, curr.getParent()); } + if (prevSuppressedParent != null && currSuppressedParent == null) { + mLogger.logParentChangeSuppressedStopped( + mIterationCount, + prevSuppressedParent, + prev.getParent()); + } if (curr.getSuppressedChanges().getSection() != null) { mLogger.logSectionChangeSuppressed( diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/notification/collection/listbuilder/ShadeListBuilderLogger.kt b/packages/SystemUI/src/com/android/systemui/statusbar/notification/collection/listbuilder/ShadeListBuilderLogger.kt index 8e052c7dcc5d..4adc90aec0fb 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/notification/collection/listbuilder/ShadeListBuilderLogger.kt +++ b/packages/SystemUI/src/com/android/systemui/statusbar/notification/collection/listbuilder/ShadeListBuilderLogger.kt @@ -193,7 +193,7 @@ class ShadeListBuilderLogger @Inject constructor( }) } - fun logParentChangeSuppressed( + fun logParentChangeSuppressedStarted( buildId: Int, suppressedParent: GroupEntry?, keepingParent: GroupEntry? @@ -207,6 +207,21 @@ class ShadeListBuilderLogger @Inject constructor( }) } + fun logParentChangeSuppressedStopped( + buildId: Int, + previouslySuppressedParent: GroupEntry?, + previouslyKeptParent: GroupEntry? + ) { + buffer.log(TAG, INFO, { + long1 = buildId.toLong() + str1 = previouslySuppressedParent?.logKey + str2 = previouslyKeptParent?.logKey + }, { + "(Build $long1) Change of parent to '$str1' no longer suppressed; " + + "replaced parent '$str2'" + }) + } + fun logGroupPruningSuppressed( buildId: Int, keepingParent: GroupEntry? |