Merge "Skip desktop mode LPM if desktop mode isn't on" into main (29f3ad63) · Commits · e / os / android_frameworks_base

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

+2 −2

Original line number	Diff line number	Diff line
		@@ -80,8 +80,8 @@ public class DesktopModeLaunchParamsModifier implements LaunchParamsModifier {
		LaunchParamsController.LaunchParams outParams) {

		if (!canEnterDesktopMode(mContext)) {
		appendLog("desktop mode is not enabled, continuing");
		return RESULT_CONTINUE;
		appendLog("desktop mode is not enabled, skipping");
		return RESULT_SKIP;
		}

		if (task == null) {

+4 −4

Original line number	Diff line number	Diff line
		@@ -79,19 +79,19 @@ public class DesktopModeLaunchParamsModifierTests extends WindowTestsBase {

		@Test
		@DisableFlags(Flags.FLAG_ENABLE_DESKTOP_WINDOWING_MODE)
		public void testReturnsContinueIfDesktopWindowingIsDisabled() {
		public void testReturnsSkipIfDesktopWindowingIsDisabled() {
		setupDesktopModeLaunchParamsModifier();

		assertEquals(RESULT_CONTINUE, new CalculateRequestBuilder().setTask(null).calculate());
		assertEquals(RESULT_SKIP, new CalculateRequestBuilder().setTask(null).calculate());
		}

		@Test
		@EnableFlags(Flags.FLAG_ENABLE_DESKTOP_WINDOWING_MODE)
		public void testReturnsContinueIfDesktopWindowingIsEnabledOnUnsupportedDevice() {
		public void testReturnsSkipIfDesktopWindowingIsEnabledOnUnsupportedDevice() {
		setupDesktopModeLaunchParamsModifier(/isDesktopModeSupported=/ false,
		/enforceDeviceRestrictions=/ true);

		assertEquals(RESULT_CONTINUE, new CalculateRequestBuilder().setTask(null).calculate());
		assertEquals(RESULT_SKIP, new CalculateRequestBuilder().setTask(null).calculate());
		}

		@Test