Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Don't spam consecutive parent suppressions in NotifLog." into tm-qpr-dev am: 7ab95c8470

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

Change-Id: I4c1639e11ea984f14c11310b7dbff5215c1992ec
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Ioana Alexandru
2022-11-21 08:22:32 +00:00
committed by Automerger Merge Worker
parent 8ea64075b9 7ab95c8470
commit f1ae1b3acb
2 changed files with 28 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
packages/SystemUI/src/com/android/systemui/statusbar/notification/collection/ShadeListBuilder.java
View File

@@ -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(

17
packages/SystemUI/src/com/android/systemui/statusbar/notification/collection/listbuilder/ShadeListBuilderLogger.kt
View File

@@ -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?