Merge "Do not execute app transition too early" into qt-dev (34d1b5f4) · Commits · e / os / android_frameworks_base

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

+3 −2

Original line number	Diff line number	Diff line
		@@ -1174,8 +1174,9 @@ class RootActivityContainer extends ConfigurationContainer
		resumedOnDisplay \|= result;
		continue;
		}
		if (topRunningActivity.isState(RESUMED)) {
		// Kick off any lingering app transitions form the MoveTaskToFront operation.
		if (display.isTopStack(stack) && topRunningActivity.isState(RESUMED)) {
		// Kick off any lingering app transitions form the MoveTaskToFront operation,
		// but only consider the top task and stack on that display.
		stack.executeAppTransition(targetOptions);
		} else {
		resumedOnDisplay \|= topRunningActivity.makeActiveIfNeeded(target);

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

+47 −0

Original line number	Diff line number	Diff line
		@@ -61,6 +61,7 @@ import android.util.Pair;
		import androidx.test.filters.MediumTest;

		import com.android.internal.app.ResolverActivity;
		import com.android.server.wm.ActivityStack.ActivityState;

		import org.junit.Before;
		import org.junit.Test;
		@@ -393,6 +394,52 @@ public class RootActivityContainerTests extends ActivityTestsBase {
		eq(activity), eq(null /* targetOptions */));
		}

		/**
		* Verify that a lingering transition is being executed in case the activity to be resumed is
		* already resumed
		*/
		@Test
		public void testResumeActivityLingeringTransition() {
		// Create a stack at top.
		final ActivityDisplay display = mRootActivityContainer.getDefaultDisplay();
		final ActivityStack targetStack = spy(display.createStack(WINDOWING_MODE_FULLSCREEN,
		ACTIVITY_TYPE_STANDARD, false /* onTop */));
		final TaskRecord task = new TaskBuilder(mSupervisor).setStack(targetStack).build();
		final ActivityRecord activity = new ActivityBuilder(mService).setTask(task).build();
		activity.setState(ActivityState.RESUMED, "test");

		// Assume the stack is at the topmost position
		assertTrue(targetStack.isTopStackOnDisplay());

		// Use the stack as target to resume.
		mRootActivityContainer.resumeFocusedStacksTopActivities();

		// Verify the lingering app transition is being executed because it's already resumed
		verify(targetStack, times(1)).executeAppTransition(any());
		}

		@Test
		public void testResumeActivityLingeringTransition_notExecuted() {
		// Create a stack at bottom.
		final ActivityDisplay display = mRootActivityContainer.getDefaultDisplay();
		final ActivityStack targetStack = spy(display.createStack(WINDOWING_MODE_FULLSCREEN,
		ACTIVITY_TYPE_STANDARD, false /* onTop */));
		final TaskRecord task = new TaskBuilder(mSupervisor).setStack(targetStack).build();
		final ActivityRecord activity = new ActivityBuilder(mService).setTask(task).build();
		activity.setState(ActivityState.RESUMED, "test");
		display.positionChildAtBottom(targetStack);

		// Assume the stack is at the topmost position
		assertFalse(targetStack.isTopStackOnDisplay());
		doReturn(targetStack).when(mRootActivityContainer).getTopDisplayFocusedStack();

		// Use the stack as target to resume.
		mRootActivityContainer.resumeFocusedStacksTopActivities();

		// Verify the lingering app transition is being executed because it's already resumed
		verify(targetStack, never()).executeAppTransition(any());
		}

		/**
		* Tests that home activities can be started on the displays that supports system decorations.
		*/