Merge "Add missing log for public singleline view in Row Content Binder" into main (27fd677a) · Commits · e / os / android_frameworks_base

packages/SystemUI/src/com/android/systemui/statusbar/notification/row/NotificationRowContentBinderLogger.kt

+12 −20

Original line number	Diff line number	Diff line
		@@ -19,13 +19,12 @@ package com.android.systemui.statusbar.notification.row
		import com.android.systemui.log.LogBuffer
		import com.android.systemui.log.core.LogLevel
		import com.android.systemui.log.dagger.NotifInflationLog
		import com.android.systemui.statusbar.notification.collection.NotificationEntry
		import com.android.systemui.statusbar.notification.logKey
		import com.android.systemui.statusbar.notification.row.NotificationRowContentBinder.FLAG_CONTENT_VIEW_ALL
		import com.android.systemui.statusbar.notification.row.NotificationRowContentBinder.FLAG_CONTENT_VIEW_CONTRACTED
		import com.android.systemui.statusbar.notification.row.NotificationRowContentBinder.FLAG_CONTENT_VIEW_EXPANDED
		import com.android.systemui.statusbar.notification.row.NotificationRowContentBinder.FLAG_CONTENT_VIEW_HEADS_UP
		import com.android.systemui.statusbar.notification.row.NotificationRowContentBinder.FLAG_CONTENT_VIEW_PUBLIC
		import com.android.systemui.statusbar.notification.row.NotificationRowContentBinder.FLAG_CONTENT_VIEW_PUBLIC_SINGLE_LINE
		import com.android.systemui.statusbar.notification.row.NotificationRowContentBinder.FLAG_CONTENT_VIEW_SINGLE_LINE
		import com.android.systemui.statusbar.notification.row.NotificationRowContentBinder.FLAG_GROUP_SUMMARY_HEADER
		import com.android.systemui.statusbar.notification.row.NotificationRowContentBinder.FLAG_LOW_PRIORITY_GROUP_SUMMARY_HEADER
		@@ -36,12 +35,7 @@ class NotificationRowContentBinderLogger
		@Inject
		constructor(@NotifInflationLog private val buffer: LogBuffer) {
		fun logNotBindingRowWasRemoved(entry: String) {
		buffer.log(
		TAG,
		LogLevel.INFO,
		{ str1 = entry },
		{ "not inflating $str1: row was removed" }
		)
		buffer.log(TAG, LogLevel.INFO, { str1 = entry }, { "not inflating $str1: row was removed" })
		}

		fun logBinding(entry: String, @InflationFlag flag: Int) {
		@@ -52,17 +46,12 @@ constructor(@NotifInflationLog private val buffer: LogBuffer) {
		str1 = entry
		int1 = flag
		},
		{ "binding views ${flagToString(int1)} for $str1" }
		{ "binding views ${flagToString(int1)} for $str1" },
		)
		}

		fun logCancelBindAbortedTask(entry: String) {
		buffer.log(
		TAG,
		LogLevel.INFO,
		{ str1 = entry },
		{ "aborted task to cancel binding $str1" }
		)
		buffer.log(TAG, LogLevel.INFO, { str1 = entry }, { "aborted task to cancel binding $str1" })
		}

		fun logUnbinding(entry: String, @InflationFlag flag: Int) {
		@@ -73,7 +62,7 @@ constructor(@NotifInflationLog private val buffer: LogBuffer) {
		str1 = entry
		int1 = flag
		},
		{ "unbinding views ${flagToString(int1)} for $str1" }
		{ "unbinding views ${flagToString(int1)} for $str1" },
		)
		}

		@@ -85,7 +74,7 @@ constructor(@NotifInflationLog private val buffer: LogBuffer) {
		str1 = entry
		str2 = progress
		},
		{ "async task for $str1: $str2" }
		{ "async task for $str1: $str2" },
		)
		}

		@@ -98,14 +87,14 @@ constructor(@NotifInflationLog private val buffer: LogBuffer) {
		str2 = logContext
		str3 = exception.stackTraceToString()
		},
		{ "async task for $str1 got exception $str2: $str3" }
		{ "async task for $str1 got exception $str2: $str3" },
		)
		}

		fun logInflateSingleLine(
		entry: String?,
		@InflationFlag inflationFlags: Int,
		isConversation: Boolean
		isConversation: Boolean,
		) {
		buffer.log(
		TAG,
		@@ -118,7 +107,7 @@ constructor(@NotifInflationLog private val buffer: LogBuffer) {
		{
		"inflateSingleLineView, inflationFlags: ${flagToString(int1)} for $str1, " +
		"isConversation: $bool1"
		}
		},
		)
		}

		@@ -147,6 +136,9 @@ constructor(@NotifInflationLog private val buffer: LogBuffer) {
		if (flag and FLAG_CONTENT_VIEW_SINGLE_LINE != 0) {
		l.add("SINGLE_LINE")
		}
		if (flag and FLAG_CONTENT_VIEW_PUBLIC_SINGLE_LINE != 0) {
		l.add("PUBLIC_SINGLE_LINE")
		}
		if (flag and FLAG_GROUP_SUMMARY_HEADER != 0) {
		l.add("GROUP_SUMMARY_HEADER")
		}