Merge "Revert "Prevent activity being launched on a display where canHostTasks()"" into main (d2d95ba2) · Commits · e / os / android_frameworks_base

core/java/android/app/ActivityOptions.java

+2 −4

Original line number	Diff line number	Diff line
		@@ -1793,10 +1793,8 @@ public class ActivityOptions extends ComponentOptions {
		/**
		* Sets the id of the display where the activity should be launched.
		* An app can launch activities on public displays or displays where the app already has
		* activities. Otherwise, trying to launch on a display for which
		* {@link android.app.ActivityManager#isActivityStartAllowedOnDisplay(Context, int, Intent)}
		* returns {@code false} (such as a private display or providing an invalid display id) will
		* result in an exception.
		* activities. Otherwise, trying to launch on a private display or providing an invalid display
		* id will result in an exception.
		* <p>
		* Setting launch display id will be ignored on devices that don't have
		* {@link android.content.pm.PackageManager#FEATURE_ACTIVITIES_ON_SECONDARY_DISPLAYS}.

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

+0 −8

Original line number	Diff line number	Diff line
		@@ -1280,14 +1280,6 @@ public class ActivityTaskSupervisor implements RecentTasks.Callbacks {
		return false;
		}

		if (DesktopExperienceFlags.ENABLE_MIRROR_DISPLAY_NO_ACTIVITY.isTrue()) {
		if (!displayContent.mDisplay.canHostTasks()) {
		Slog.w(TAG, "Launch on display check: activity launch is not allowed on a "
		+ "display that cannot host tasks");
		return false;
		}
		}

		// Check if the caller has enough privileges to embed activities and launch to private
		// displays.
		final int startAnyPerm = mService.checkPermission(INTERNAL_SYSTEM_WINDOW, callingPid,

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

+1 −26

Original line number	Diff line number	Diff line
		@@ -334,7 +334,7 @@ public class ActivityTaskSupervisorTests extends WindowTestsBase {
		* Ensures that a trusted display can launch arbitrary activity and an untrusted display can't.
		*/
		@Test
		public void testDisplayCanLaunchActivities_trustedDisplay() {
		public void testDisplayCanLaunchActivities() {
		final Display display = mDisplayContent.mDisplay;
		// An empty info without FLAG_ALLOW_EMBEDDED.
		final ActivityInfo activityInfo = new ActivityInfo();
		@@ -355,31 +355,6 @@ public class ActivityTaskSupervisorTests extends WindowTestsBase {
		assertThat(allowedOnUntrusted).isFalse();
		}

		/**
		* Ensures that an arbitrary activity can be launched on a display the can host tasks, and
		* cannot be launched on a display that cannot host tasks.
		*/
		@EnableFlags(Flags.FLAG_ENABLE_MIRROR_DISPLAY_NO_ACTIVITY)
		@Test
		public void testDisplayCanLaunchActivities_canHostTasksDisplay() {
		final Display display = mDisplayContent.mDisplay;
		// An empty info without FLAG_ALLOW_EMBEDDED.
		final ActivityInfo activityInfo = new ActivityInfo();
		final int callingPid = 12345;
		final int callingUid = 12345;
		spyOn(display);

		doReturn(true).when(display).canHostTasks();
		final boolean allowedOnCanHostTasks = mSupervisor.isCallerAllowedToLaunchOnDisplay(
		callingPid, callingUid, display.getDisplayId(), activityInfo);
		assertThat(allowedOnCanHostTasks).isTrue();

		doReturn(false).when(display).canHostTasks();
		final boolean allowedOnCannotHostTasks = mSupervisor.isCallerAllowedToLaunchOnDisplay(
		callingPid, callingUid, display.getDisplayId(), activityInfo);
		assertThat(allowedOnCannotHostTasks).isFalse();
		}

		/**
		* Verifies that process state will be updated with pending top without activity state change.
		* E.g. switch focus between resumed activities in multi-window mode.