Merge "Revert^2 "Defer destroy activity if it is in transition."" into main (db2b5f08) · Commits · e / os / android_frameworks_base

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

+1 −1

Original line number	Diff line number	Diff line
		@@ -3964,7 +3964,7 @@ final class ActivityRecord extends WindowToken implements WindowManagerService.A
		}

		if (isCurrentVisible) {
		if (isNextNotYetVisible \|\| delayRemoval) {
		if (isNextNotYetVisible \|\| delayRemoval \|\| (next != null && isInTransition())) {
		// Add this activity to the list of stopping activities. It will be processed and
		// destroyed when the next activity reports idle.
		addToStopping(false /* scheduleIdle /, false / idleDelayed */,