Merge "Reduce showing starting window from a task trampoline" into main (6d868bce) · Commits · e / os / android_frameworks_base

services/core/java/com/android/server/wm/ActivityRecord.java

+13 −0

Original line number	Diff line number	Diff line
		@@ -2538,6 +2538,19 @@ final class ActivityRecord extends WindowToken implements WindowManagerService.A
		}
		}
		if (!activityAllDrawn && !isActivityHome) {
		// Only check the special case of a fragment host task because the starting window
		// may not be visible if the client organizer delays the transition ready.
		if (task.mTaskFragmentHostProcessName != null) {
		// It may be launched from a task trampoline that already has a starting window.
		// Return NONE because 2 consecutive splashes may not look smooth in visual.
		final Task prevTask = task.getParent().getTaskBelow(task);
		if (prevTask != null) {
		final ActivityRecord prevTaskTop = prevTask.getTopMostActivity();
		if (prevTaskTop != null && prevTaskTop.hasStartingWindow()) {
		return STARTING_WINDOW_TYPE_NONE;
		}
		}
		}
		return STARTING_WINDOW_TYPE_SPLASH_SCREEN;
		}
		}