Merge "Remove gwpc_aware_windowing_mode flag." into main (79c374eb) · Commits · e / os / android_frameworks_base

core/java/android/companion/virtual/flags/flags.aconfig

+0 −10

Original line number	Diff line number	Diff line
		@@ -202,16 +202,6 @@ flag {
		is_exported: true
		}

		flag {
		name: "gwpc_aware_windowing_mode"
		namespace: "virtual_devices"
		description: "Fallback to FULLSCREEN when the windowing mode is unsupported"
		bug: "378663612"
		metadata {
		purpose: PURPOSE_BUGFIX
		}
		}

		flag {
		name: "device_aware_ui_mode"
		namespace: "virtual_devices"

+0 −3

Original line number	Diff line number	Diff line
		@@ -68,9 +68,6 @@ public abstract class DisplayWindowPolicyController {
		public DisplayWindowPolicyController() {
		synchronized (mSupportedWindowingModes) {
		mSupportedWindowingModes.add(WindowConfiguration.WINDOWING_MODE_FULLSCREEN);
		if (!android.companion.virtualdevice.flags.Flags.gwpcAwareWindowingMode()) {
		mSupportedWindowingModes.add(WindowConfiguration.WINDOWING_MODE_MULTI_WINDOW);
		}
		}
		}

+0 −6

Original line number	Diff line number	Diff line
		@@ -316,12 +316,6 @@ public class GenericWindowPolicyController extends DisplayWindowPolicyController
		logActivityLaunchBlocked("Mirror virtual displays cannot contain activities.");
		return false;
		}
		if (!android.companion.virtualdevice.flags.Flags.gwpcAwareWindowingMode()
		&& !isWindowingModeSupported(windowingMode)) {
		logActivityLaunchBlocked(
		"Virtual device doesn't support windowing mode " + windowingMode);
		return false;
		}
		if (!mIsSecureDisplay && (activityInfo.flags & FLAG_CAN_DISPLAY_ON_REMOTE_DEVICES) == 0) {
		logActivityLaunchBlocked("Display requires android:canDisplayOnRemoteDevices=true");
		return false;

+0 −3

Original line number	Diff line number	Diff line
		@@ -5807,9 +5807,6 @@ class DisplayContent extends RootDisplayArea implements WindowManagerPolicy.Disp
		* @return Whether this windowing mode is supported.
		*/
		boolean isWindowingModeSupported(@WindowConfiguration.WindowingMode int windowingMode) {
		if (!android.companion.virtualdevice.flags.Flags.gwpcAwareWindowingMode()) {
		return true;
		}
		if (mDwpcHelper != null && !mDwpcHelper.isWindowingModeSupported(windowingMode)) {
		return false;
		}

+0 −15

Original line number	Diff line number	Diff line
		@@ -527,20 +527,6 @@ public class GenericWindowPolicyControllerTest {
		WindowConfiguration.WINDOWING_MODE_FULLSCREEN, activityInfo);
		}

		@DisableFlags(android.companion.virtualdevice.flags.Flags.FLAG_GWPC_AWARE_WINDOWING_MODE)
		@Test
		public void canActivityBeLaunched_unsupportedWindowingMode_isBlocked() {
		GenericWindowPolicyController gwpc = createGwpc();
		ActivityInfo activityInfo = getActivityInfo(
		NONBLOCKED_APP_PACKAGE_NAME,
		NONBLOCKED_APP_PACKAGE_NAME,
		/* displayOnRemoteDevices */ true,
		/* targetDisplayCategory */ null);
		assertActivityIsBlocked(gwpc, DISPLAY_ID, true, WindowConfiguration.WINDOWING_MODE_PINNED,
		activityInfo);
		}

		@EnableFlags(android.companion.virtualdevice.flags.Flags.FLAG_GWPC_AWARE_WINDOWING_MODE)
		@Test
		public void canActivityBeLaunched_unsupportedWindowingMode_isNotBlocked() {
		GenericWindowPolicyController gwpc = createGwpc();
		@@ -553,7 +539,6 @@ public class GenericWindowPolicyControllerTest {
		WindowConfiguration.WINDOWING_MODE_PINNED, activityInfo);
		}


		@Test
		public void registerRunningAppsChangedListener_onRunningAppsChanged_listenersNotified() {
		ArraySet<Integer> uids = new ArraySet<>(Arrays.asList(TEST_UID));