Merge "Return early from finishIfDone if not done" into main (970dd095) · Commits · e / os / android_frameworks_base

packages/SystemUI/src/com/android/systemui/statusbar/notification/row/NotificationContentInflater.java

+117 −117

Original line number	Original line	Diff line number	Diff line
	@@ -833,9 +833,11 @@ public class NotificationContentInflater implements NotificationRowContentBinder
	@Nullable InflationCallback endListener, NotificationEntry entry,		@Nullable InflationCallback endListener, NotificationEntry entry,
	ExpandableNotificationRow row, NotificationContentInflaterLogger logger) {		ExpandableNotificationRow row, NotificationContentInflaterLogger logger) {
	Assert.isMainThread();		Assert.isMainThread();
			if (!runningInflations.isEmpty()) {
			return false;
			}
	NotificationContentView privateLayout = row.getPrivateLayout();		NotificationContentView privateLayout = row.getPrivateLayout();
	NotificationContentView publicLayout = row.getPublicLayout();		NotificationContentView publicLayout = row.getPublicLayout();
	if (runningInflations.isEmpty()) {
	logger.logAsyncTaskProgress(entry, "finishing");		logger.logAsyncTaskProgress(entry, "finishing");
	boolean setRepliesAndActions = true;		boolean setRepliesAndActions = true;
	if ((reInflateFlags & FLAG_CONTENT_VIEW_CONTRACTED) != 0) {		if ((reInflateFlags & FLAG_CONTENT_VIEW_CONTRACTED) != 0) {
	@@ -969,8 +971,6 @@ public class NotificationContentInflater implements NotificationRowContentBinder
	}		}
	return true;		return true;
	}		}
	return false;
	}

	private static RemoteViews createExpandedView(Notification.Builder builder,		private static RemoteViews createExpandedView(Notification.Builder builder,
	boolean isLowPriority) {		boolean isLowPriority) {