Merge "Allow to use snapshot starting window when launch translucent activity." into main (1144ba93) · Commits · e / os / android_frameworks_base

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

+5 −2

Original line number	Diff line number	Diff line
		@@ -2524,8 +2524,11 @@ final class ActivityRecord extends WindowToken implements WindowManagerService.A
		// trampoline that will be always created and finished immediately. Then give a chance to
		// see if the snapshot is usable for the current running activity so the transition will
		// look smoother, instead of showing a splash screen on the second launch.
		if (!newTask && taskSwitch && processRunning && !activityCreated && task.intent != null
		&& mActivityComponent.equals(task.intent.getComponent())) {
		if (!newTask && taskSwitch && !activityCreated && task.intent != null
		// Another case where snapshot is allowed to be used is if this activity has not yet
		// been created && is translucent or floating.
		// The component isn't necessary to be matched in this case.
		&& (!mOccludesParent \|\| mActivityComponent.equals(task.intent.getComponent()))) {
		final ActivityRecord topAttached = task.getActivity(ActivityRecord::attachedToProcess);
		if (topAttached != null) {
		if (topAttached.isSnapshotCompatible(snapshot)