Merge "Fixes getting the wrong app transition going home after minimized (1/2)" into oc-dr1-dev (eb36d839) · Commits · e / os / android_frameworks_base

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

+4 −2

Original line number	Diff line number	Diff line
		@@ -937,8 +937,6 @@ class AppWindowToken extends WindowToken implements WindowManagerService.AppFree
		// Update keyguard flags upon finishing relaunch.
		checkKeyguardFlagsChanged();
		}

		updateAllDrawn();
		}

		void clearRelaunching() {
		@@ -1344,6 +1342,10 @@ class AppWindowToken extends WindowToken implements WindowManagerService.AppFree
		}
		}

		/**
		* Determines if the token has finished drawing. This should only be called from
		* {@link DisplayContent#applySurfaceChangesTransaction}
		*/
		void updateAllDrawn() {
		if (!allDrawn) {
		// Number of drawn windows can be less when a window is being relaunched, wait for