Merge "Prevent dismissing starting window when reopening app" into qt-dev am: 94f7f39a01 (6a5b828f) · Commits · e / os / android_frameworks_base

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

+8 −0

Original line number	Diff line number	Diff line
		@@ -540,6 +540,14 @@ class AppWindowToken extends WindowToken implements WindowManagerService.AppFree
		// If the app was already visible, don't reset the waitingToShow state.
		if (isHidden()) {
		waitingToShow = true;

		// Let's reset the draw state in order to prevent the starting window to be
		// immediately dismissed when the app still has the surface.
		forAllWindows(w -> {
		if (w.mAttrs.type != TYPE_APPLICATION_STARTING) {
		w.mWinAnimator.resetDrawState();
		}
		}, true /* traverseTopToBottom */);
		}
		}