Merge "Prevent getting from transit when interesting window is exiting" (823e0ede) · Commits · e / os / android_frameworks_base

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

+22 −6

Original line number	Diff line number	Diff line
		@@ -517,15 +517,25 @@ class AppWindowToken extends WindowToken implements WindowManagerService.AppFree
		}

		WindowState findMainWindow() {
		return findMainWindow(true);
		}

		/**
		* Finds the main window that either has type base application or application starting if
		* requested.
		*
		* @param includeStartingApp Allow to search application-starting windows to also be returned.
		* @return The main window of type base application or application starting if requested.
		*/
		WindowState findMainWindow(boolean includeStartingApp) {
		WindowState candidate = null;
		int j = mChildren.size();
		while (j > 0) {
		j--;
		for (int j = mChildren.size() - 1; j >= 0; --j) {
		final WindowState win = mChildren.get(j);
		final int type = win.mAttrs.type;
		// No need to loop through child window as base application and starting types can't be
		// child windows.
		if (type == TYPE_BASE_APPLICATION \|\| type == TYPE_APPLICATION_STARTING) {
		if (type == TYPE_BASE_APPLICATION
		\|\| (includeStartingApp && type == TYPE_APPLICATION_STARTING)) {
		// In cases where there are multiple windows, we prefer the non-exiting window. This
		// happens for example when replacing windows during an activity relaunch. When
		// constructing the animation, we want the new window, not the exiting one.
		@@ -1373,8 +1383,11 @@ class AppWindowToken extends WindowToken implements WindowManagerService.AppFree

		if (mLastTransactionSequence != mService.mTransactionSequence) {
		mLastTransactionSequence = mService.mTransactionSequence;
		mNumInterestingWindows = mNumDrawnWindows = 0;
		mNumDrawnWindows = 0;
		startingDisplayed = false;

		// There is the main base application window, even if it is exiting, wait for it
		mNumInterestingWindows = findMainWindow(false /* includeStartingApp */) != null ? 1 : 0;
		}

		final WindowStateAnimator winAnimator = w.mWinAnimator;
		@@ -1396,7 +1409,10 @@ class AppWindowToken extends WindowToken implements WindowManagerService.AppFree

		if (w != startingWindow) {
		if (w.isInteresting()) {
		// Add non-main window as interesting since the main app has already been added
		if (findMainWindow(false /* includeStartingApp */) != w) {
		mNumInterestingWindows++;
		}
		if (w.isDrawnLw()) {
		mNumDrawnWindows++;