Merge "HUN Throttling: update logbuffers" into main (11a81469) · Commits · e / os / android_frameworks_base

packages/SystemUI/src/com/android/systemui/statusbar/policy/BaseHeadsUpManager.java

+12 −1

Original line number	Diff line number	Diff line
		@@ -165,6 +165,8 @@ public abstract class BaseHeadsUpManager implements HeadsUpManager {
		public void showNotification(@NonNull NotificationEntry entry) {
		HeadsUpEntry headsUpEntry = createHeadsUpEntry(entry);

		mLogger.logShowNotificationRequest(entry);

		Runnable runnable = () -> {
		// TODO(b/315362456) log outside runnable too
		mLogger.logShowNotification(entry);
		@@ -219,6 +221,8 @@ public abstract class BaseHeadsUpManager implements HeadsUpManager {
		*/
		public void updateNotification(@NonNull String key, boolean shouldHeadsUpAgain) {
		HeadsUpEntry headsUpEntry = mHeadsUpEntryMap.get(key);
		mLogger.logUpdateNotificationRequest(key, shouldHeadsUpAgain, headsUpEntry != null);

		Runnable runnable = () -> {
		updateNotificationInternal(key, shouldHeadsUpAgain);
		};
		@@ -378,8 +382,11 @@ public abstract class BaseHeadsUpManager implements HeadsUpManager {
		*/
		protected final void removeEntry(@NonNull String key) {
		HeadsUpEntry headsUpEntry = mHeadsUpEntryMap.get(key);
		mLogger.logRemoveEntryRequest(key);

		Runnable runnable = () -> {
		mLogger.logRemoveEntry(key);

		if (headsUpEntry == null) {
		return;
		}
		@@ -566,8 +573,10 @@ public abstract class BaseHeadsUpManager implements HeadsUpManager {
		public void unpinAll(boolean userUnPinned) {
		for (String key : mHeadsUpEntryMap.keySet()) {
		HeadsUpEntry headsUpEntry = getHeadsUpEntry(key);

		mLogger.logUnpinEntryRequest(key);
		Runnable runnable = () -> {
		mLogger.logUnpinEntry(key);

		setEntryPinned(headsUpEntry, false /* isPinned */);
		// maybe it got un sticky
		headsUpEntry.updateEntry(false /* updatePostTime */, "unpinAll");
		@@ -886,6 +895,7 @@ public abstract class BaseHeadsUpManager implements HeadsUpManager {
		* Clear any pending removal runnables.
		*/
		public void cancelAutoRemovalCallbacks(@Nullable String reason) {
		mLogger.logAutoRemoveCancelRequest(this.mEntry, reason);
		Runnable runnable = () -> {
		final boolean removed = cancelAutoRemovalCallbackInternal();

		@@ -900,6 +910,7 @@ public abstract class BaseHeadsUpManager implements HeadsUpManager {
		public void scheduleAutoRemovalCallback(FinishTimeUpdater finishTimeCalculator,
		@NonNull String reason) {

		mLogger.logAutoRemoveRequest(this.mEntry, reason);
		Runnable runnable = () -> {
		long delayMs = finishTimeCalculator.updateAndGetTimeRemaining();

packages/SystemUI/src/com/android/systemui/statusbar/policy/HeadsUpManagerLogger.kt

+68 −0

Original line number	Diff line number	Diff line
		@@ -58,6 +58,14 @@ class HeadsUpManagerLogger @Inject constructor(
		})
		}

		fun logShowNotificationRequest(entry: NotificationEntry) {
		buffer.log(TAG, INFO, {
		str1 = entry.logKey
		}, {
		"request: show notification $str1"
		})
		}

		fun logShowNotification(entry: NotificationEntry) {
		buffer.log(TAG, INFO, {
		str1 = entry.logKey
		@@ -76,6 +84,15 @@ class HeadsUpManagerLogger @Inject constructor(
		})
		}

		fun logAutoRemoveRequest(entry: NotificationEntry, reason: String) {
		buffer.log(TAG, INFO, {
		str1 = entry.logKey
		str2 = reason
		}, {
		"request: reschedule auto remove of $str1 reason: $str2"
		})
		}

		fun logAutoRemoveRescheduled(entry: NotificationEntry, delayMillis: Long, reason: String) {
		buffer.log(TAG, INFO, {
		str1 = entry.logKey
		@@ -86,6 +103,15 @@ class HeadsUpManagerLogger @Inject constructor(
		})
		}

		fun logAutoRemoveCancelRequest(entry: NotificationEntry, reason: String?) {
		buffer.log(TAG, INFO, {
		str1 = entry.logKey
		str2 = reason ?: "unknown"
		}, {
		"request: cancel auto remove of $str1 reason: $str2"
		})
		}

		fun logAutoRemoveCanceled(entry: NotificationEntry, reason: String?) {
		buffer.log(TAG, INFO, {
		str1 = entry.logKey
		@@ -95,6 +121,38 @@ class HeadsUpManagerLogger @Inject constructor(
		})
		}

		fun logRemoveEntryRequest(key: String) {
		buffer.log(TAG, INFO, {
		str1 = logKey(key)
		}, {
		"request: remove entry $str1"
		})
		}

		fun logRemoveEntry(key: String) {
		buffer.log(TAG, INFO, {
		str1 = logKey(key)
		}, {
		"remove entry $str1"
		})
		}

		fun logUnpinEntryRequest(key: String) {
		buffer.log(TAG, INFO, {
		str1 = logKey(key)
		}, {
		"request: unpin entry $str1"
		})
		}

		fun logUnpinEntry(key: String) {
		buffer.log(TAG, INFO, {
		str1 = logKey(key)
		}, {
		"unpin entry $str1"
		})
		}

		fun logRemoveNotification(key: String, releaseImmediately: Boolean) {
		buffer.log(TAG, INFO, {
		str1 = logKey(key)
		@@ -112,6 +170,16 @@ class HeadsUpManagerLogger @Inject constructor(
		})
		}

		fun logUpdateNotificationRequest(key: String, alert: Boolean, hasEntry: Boolean) {
		buffer.log(TAG, INFO, {
		str1 = logKey(key)
		bool1 = alert
		bool2 = hasEntry
		}, {
		"request: update notification $str1 alert: $bool1 hasEntry: $bool2 reason: $str2"
		})
		}

		fun logUpdateNotification(key: String, alert: Boolean, hasEntry: Boolean) {
		buffer.log(TAG, INFO, {
		str1 = logKey(key)