Merge "Do not look for in-process activities if contains other process activities" into udc-dev (6bed003b) · Commits · e / os / android_frameworks_base

libs/WindowManager/Jetpack/src/androidx/window/extensions/embedding/SplitController.java

+4 −1

Original line number	Diff line number	Diff line
		@@ -1000,7 +1000,10 @@ public class SplitController implements JetpackTaskFragmentOrganizer.TaskFragmen
		Activity findActivityBelow(@NonNull Activity activity) {
		Activity activityBelow = null;
		final TaskFragmentContainer container = getContainerWithActivity(activity);
		if (container != null) {
		// Looking for the activity below from the information we already have if the container
		// only embeds activities of the same process because activities of other processes are not
		// available in this embedding host process for security concern.
		if (container != null && !container.hasCrossProcessActivities()) {
		final List<Activity> containerActivities = container.collectNonFinishingActivities();
		final int index = containerActivities.indexOf(activity);
		if (index > 0) {

+18 −0

Original line number	Diff line number	Diff line
		@@ -152,6 +152,11 @@ class TaskFragmentContainer {
		@Nullable
		Runnable mAppearEmptyTimeout;

		/**
		* Whether this TaskFragment contains activities of another process/package.
		*/
		private boolean mHasCrossProcessActivities;

		/**
		* Creates a container with an existing activity that will be re-parented to it in a window
		* container transaction.
		@@ -418,10 +423,18 @@ class TaskFragmentContainer {
		mAppearEmptyTimeout = null;
		}

		mHasCrossProcessActivities = false;
		mInfo = info;
		if (mInfo == null \|\| mInfo.isEmpty()) {
		return;
		}

		// Contains activities of another process if the activities size is not matched to the
		// running activity count
		if (mInfo.getRunningActivityCount() != mInfo.getActivities().size()) {
		mHasCrossProcessActivities = true;
		}

		// Only track the pending Intent when the container is empty.
		mPendingAppearedIntent = null;
		if (mPendingAppearedActivities.isEmpty()) {
		@@ -751,6 +764,11 @@ class TaskFragmentContainer {
		return mPendingAppearedInRequestedTaskFragmentActivities.contains(activityToken);
		}

		/** Whether contains activities of another process */
		boolean hasCrossProcessActivities() {
		return mHasCrossProcessActivities;
		}

		/** Gets the parent leaf Task id. */
		int getTaskId() {
		return mTaskContainer.getTaskId();

+19 −0

Original line number	Diff line number	Diff line
		@@ -1013,6 +1013,25 @@ public class SplitControllerTest {
		verify(mSplitPresenter, never()).createNewSplitContainer(any(), any(), any(), any());
		}

		@Test
		public void testFindActivityBelow() {
		// Create a container with two activities
		final TaskFragmentContainer container = createMockTaskFragmentContainer(mActivity);
		final Activity pendingAppearedActivity = createMockActivity();
		container.addPendingAppearedActivity(pendingAppearedActivity);

		// Ensure the activity below matches
		assertEquals(mActivity,
		mSplitController.findActivityBelow(pendingAppearedActivity));

		// Ensure that the activity look up won't search for the in-process activities and should
		// IPC to WM core to get the activity below. It should be `null` for this mock test.
		spyOn(container);
		doReturn(true).when(container).hasCrossProcessActivities();
		assertNotEquals(mActivity,
		mSplitController.findActivityBelow(pendingAppearedActivity));
		}

		@Test
		public void testResolveActivityToContainer_inUnknownTaskFragment() {
		doReturn(new Binder()).when(mSplitController)