Merge "Make the adjustment of stack consistent for finishing activity" (01c97697) · Commits · e / os / android_frameworks_base

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

+17 −11

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

		final ActivityStack stack = getActivityStack();
		final boolean mayAdjustFocus = (isState(RESUMED) \|\| stack.mResumedActivity == null)
		final boolean mayAdjustTop = (isState(RESUMED) \|\| stack.mResumedActivity == null)
		&& stack.isFocusedStackOnDisplay();
		final boolean shouldAdjustGlobalFocus = mayAdjustTop
		// It must be checked before {@link #makeFinishingLocked} is called, because a stack
		// is not visible if it only contains finishing activities.
		&& mRootActivityContainer.isTopDisplayFocusedStack(stack);
		@@ -2500,9 +2502,21 @@ final class ActivityRecord extends WindowToken implements WindowManagerService.A

		// We are finishing the top focused activity and its stack has nothing to be focused so
		// the next focusable stack should be focused.
		if (mayAdjustFocus
		if (mayAdjustTop
		&& (stack.topRunningActivityLocked() == null \|\| !stack.isFocusable())) {
		if (shouldAdjustGlobalFocus) {
		// Move the entire hierarchy to top with updating global top resumed activity
		// and focused application if needed.
		stack.adjustFocusToNextFocusableStack("finish-top");
		} else {
		// Only move the next stack to top in its display.
		final ActivityDisplay display = stack.getDisplay();
		final ActivityRecord next = display.topRunningActivity();
		if (next != null) {
		display.positionChildAtTop(next.getActivityStack(),
		false /* includingParents */, "finish-display-top");
		}
		}
		}

		finishActivityResults(resultCode, resultData);
		@@ -2632,20 +2646,12 @@ final class ActivityRecord extends WindowToken implements WindowManagerService.A
		// implied that the current finishing activity should be added into stopping list rather
		// than destroy immediately.
		final boolean isNextNotYetVisible = next != null && (!next.nowVisible \|\| !next.visible);
		final boolean notGlobalFocusedStack =
		getActivityStack() != mRootActivityContainer.getTopDisplayFocusedStack();
		if (isVisible && isNextNotYetVisible) {
		// 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 */,
		"completeFinishing");
		setState(STOPPING, "completeFinishing");
		if (notGlobalFocusedStack) {
		// Ensuring visibility and configuration only for non-focused stacks since this
		// method call is relatively expensive and not necessary for focused stacks.
		mRootActivityContainer.ensureVisibilityAndConfig(next, getDisplayId(),
		false /* markFrozenIfConfigChanged /, true / deferResume */);
		}
		} else if (addToFinishingAndWaitForIdle()) {
		// We added this activity to the finishing list and something else is becoming resumed.
		// The activity will complete finishing when the next activity reports idle. No need to

services/tests/wmtests/src/com/android/server/wm/ActivityRecordTests.java

+29 −0

Original line number	Diff line number	Diff line
		@@ -994,6 +994,35 @@ public class ActivityRecordTests extends ActivityTestsBase {
		verify(mActivity, never()).destroyIfPossible(anyString());
		}

		/**
		* Verify that finish request won't change the state of next top activity if the current
		* finishing activity doesn't need to be destroyed immediately. The case is usually like
		* from {@link ActivityStack#completePauseLocked(boolean, ActivityRecord)} to
		* {@link ActivityRecord#completeFinishing(String)}, so the complete-pause should take the
		* responsibility to resume the next activity with updating the state.
		*/
		@Test
		public void testCompleteFinishing_keepStateOfNextInvisible() {
		final ActivityRecord currentTop = mActivity;
		currentTop.visible = currentTop.nowVisible = true;

		// Simulates that {@code currentTop} starts an existing activity from background (so its
		// state is stopped) and the starting flow just goes to place it at top.
		final ActivityStack nextStack = new StackBuilder(mRootActivityContainer).build();
		final ActivityRecord nextTop = nextStack.getTopActivity();
		nextTop.setState(STOPPED, "test");

		mStack.mPausingActivity = currentTop;
		currentTop.finishing = true;
		currentTop.setState(PAUSED, "test");
		currentTop.completeFinishing("completePauseLocked");

		// Current top becomes stopping because it is visible and the next is invisible.
		assertEquals(STOPPING, currentTop.getState());
		// The state of next activity shouldn't be changed.
		assertEquals(STOPPED, nextTop.getState());
		}

		/**
		* Verify that complete finish request for visible activity must be delayed before the next one
		* becomes visible.