Merge "Use the entry we already have instead of looking at the row" into main (b4d8c972) · Commits · e / os / android_frameworks_base

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

+5 −1

Original line number	Diff line number	Diff line
		@@ -1292,6 +1292,7 @@ constructor(
		runningInflations,
		e,
		row,
		entry,
		callback,
		logger,
		"applying view synchronously",
		@@ -1317,6 +1318,7 @@ constructor(
		runningInflations,
		InflationException(invalidReason),
		row,
		entry,
		callback,
		logger,
		"applied invalid view",
		@@ -1376,6 +1378,7 @@ constructor(
		runningInflations,
		e,
		row,
		entry,
		callback,
		logger,
		"applying view",
		@@ -1479,6 +1482,7 @@ constructor(
		runningInflations: HashMap<Int, CancellationSignal>,
		e: Exception,
		notification: ExpandableNotificationRow?,
		entry: NotificationEntry,
		callback: InflationCallback?,
		logger: NotificationRowContentBinderLogger,
		logContext: String,
		@@ -1486,7 +1490,7 @@ constructor(
		Assert.isMainThread()
		logger.logAsyncTaskException(notification?.loggingKey, logContext, e)
		runningInflations.values.forEach(Consumer { obj: CancellationSignal -> obj.cancel() })
		callback?.handleInflationException(notification?.entry, e)
		callback?.handleInflationException(entry, e)
		}

		/**