Merge "Don't spam consecutive parent suppressions in NotifLog." into tm-qpr-dev (7ab95c84) · Commits · e / os / android_frameworks_base

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

+12 −3

Original line number	Diff line number	Diff line
		@@ -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(

+16 −1

Original line number	Diff line number	Diff line
		@@ -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?