Merge "Log when child views are freed" into tm-qpr-dev (4355e016) · Commits · e / os / android_frameworks_base

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

+3 −2

Original line number	Diff line number	Diff line
		@@ -286,7 +286,7 @@ public class PreparationCoordinator implements Coordinator {
		if (isInflated(child)) {
		// TODO: May want to put an animation hint here so view manager knows to treat
		// this differently from a regular removal animation
		freeNotifViews(child);
		freeNotifViews(child, "Past last visible group child");
		}
		}
		}
		@@ -379,7 +379,8 @@ public class PreparationCoordinator implements Coordinator {
		mNotifInflatingFilter.invalidateList("onInflationFinished for " + logKey(entry));
		}

		private void freeNotifViews(NotificationEntry entry) {
		private void freeNotifViews(NotificationEntry entry, String reason) {
		mLogger.logFreeNotifViews(entry, reason);
		mViewBarn.removeViewForEntry(entry);
		mNotifInflater.releaseViews(entry);
		// TODO: clear the entry's row here, or even better, stop setting the row on the entry!

+12 −3

Original line number	Diff line number	Diff line
		@@ -31,7 +31,7 @@ class PreparationCoordinatorLogger @Inject constructor(
		buffer.log(TAG, LogLevel.DEBUG, {
		str1 = entry.logKey
		}, {
		"NOTIF INFLATED $str1"
		"Inflation completed for notif $str1"
		})
		}

		@@ -40,7 +40,16 @@ class PreparationCoordinatorLogger @Inject constructor(
		str1 = entry.logKey
		str2 = reason
		}, {
		"NOTIF INFLATION ABORTED $str1 reason=$str2"
		"Infation aborted for notif $str1 reason=$str2"
		})
		}

		fun logFreeNotifViews(entry: NotificationEntry, reason: String) {
		buffer.log(TAG, LogLevel.DEBUG, {
		str1 = entry.logKey
		str2 = reason
		}, {
		"Freeing content views for notif $str1 reason=$str2"
		})
		}