Merge "Clean up launched VDM custom home flag" into main (6af54bb3) · Commits · e / os / android_frameworks_base

core/api/system-current.txt

+4 −4

Original line number	Diff line number	Diff line
		@@ -3481,7 +3481,7 @@ package android.companion.virtual {
		method @Deprecated public int getDefaultNavigationPolicy();
		method public int getDevicePolicy(int);
		method @FlaggedApi("android.companion.virtualdevice.flags.device_aware_display_power") @NonNull public java.time.Duration getDimDuration();
		method @FlaggedApi("android.companion.virtual.flags.vdm_custom_home") @Nullable public android.content.ComponentName getHomeComponent();
		method @Nullable public android.content.ComponentName getHomeComponent();
		method @FlaggedApi("android.companion.virtual.flags.vdm_custom_ime") @Nullable public android.content.ComponentName getInputMethodComponent();
		method public int getLockState();
		method @Nullable public String getName();
		@@ -3520,7 +3520,7 @@ package android.companion.virtual {
		method @Deprecated @NonNull public android.companion.virtual.VirtualDeviceParams.Builder setBlockedCrossTaskNavigations(@NonNull java.util.Set<android.content.ComponentName>);
		method @NonNull public android.companion.virtual.VirtualDeviceParams.Builder setDevicePolicy(int, int);
		method @FlaggedApi("android.companion.virtualdevice.flags.device_aware_display_power") @NonNull public android.companion.virtual.VirtualDeviceParams.Builder setDimDuration(@NonNull java.time.Duration);
		method @FlaggedApi("android.companion.virtual.flags.vdm_custom_home") @NonNull public android.companion.virtual.VirtualDeviceParams.Builder setHomeComponent(@Nullable android.content.ComponentName);
		method @NonNull public android.companion.virtual.VirtualDeviceParams.Builder setHomeComponent(@Nullable android.content.ComponentName);
		method @FlaggedApi("android.companion.virtual.flags.vdm_custom_ime") @NonNull public android.companion.virtual.VirtualDeviceParams.Builder setInputMethodComponent(@Nullable android.content.ComponentName);
		method @NonNull @RequiresPermission(value=android.Manifest.permission.ADD_ALWAYS_UNLOCKED_DISPLAY, conditional=true) public android.companion.virtual.VirtualDeviceParams.Builder setLockState(int);
		method @NonNull public android.companion.virtual.VirtualDeviceParams.Builder setName(@NonNull String);
		@@ -5332,13 +5332,13 @@ package android.hardware.display {

		public final class VirtualDisplayConfig implements android.os.Parcelable {
		method @FlaggedApi("android.companion.virtualdevice.flags.virtual_display_insets") @Nullable public android.view.DisplayCutout getDisplayCutout();
		method @FlaggedApi("android.companion.virtual.flags.vdm_custom_home") public boolean isHomeSupported();
		method public boolean isHomeSupported();
		method @FlaggedApi("com.android.window.flags.vdm_force_app_universal_resizable_api") public boolean isIgnoreActivitySizeRestrictions();
		}

		public static final class VirtualDisplayConfig.Builder {
		method @FlaggedApi("android.companion.virtualdevice.flags.virtual_display_insets") @NonNull public android.hardware.display.VirtualDisplayConfig.Builder setDisplayCutout(@Nullable android.view.DisplayCutout);
		method @FlaggedApi("android.companion.virtual.flags.vdm_custom_home") @NonNull public android.hardware.display.VirtualDisplayConfig.Builder setHomeSupported(boolean);
		method @NonNull public android.hardware.display.VirtualDisplayConfig.Builder setHomeSupported(boolean);
		method @FlaggedApi("com.android.window.flags.vdm_force_app_universal_resizable_api") @NonNull public android.hardware.display.VirtualDisplayConfig.Builder setIgnoreActivitySizeRestrictions(boolean);
		}

core/java/android/companion/virtual/VirtualDeviceParams.java

+0 −2

Original line number	Diff line number	Diff line
		@@ -429,7 +429,6 @@ public final class VirtualDeviceParams implements Parcelable {
		* @see Builder#setHomeComponent
		* @see VirtualDisplayConfig#isHomeSupported()
		*/
		@FlaggedApi(Flags.FLAG_VDM_CUSTOM_HOME)
		@Nullable
		public ComponentName getHomeComponent() {
		return mHomeComponent;
		@@ -924,7 +923,6 @@ public final class VirtualDeviceParams implements Parcelable {
		*
		* @see VirtualDisplayConfig#isHomeSupported()
		*/
		@FlaggedApi(Flags.FLAG_VDM_CUSTOM_HOME)
		@NonNull
		public Builder setHomeComponent(@Nullable ComponentName homeComponent) {
		mHomeComponent = homeComponent;

core/java/android/hardware/display/VirtualDisplayConfig.java

+1 −3

Original line number	Diff line number	Diff line
		@@ -237,10 +237,9 @@ public final class VirtualDisplayConfig implements Parcelable {
		* @see Builder#setHomeSupported
		* @hide
		*/
		@FlaggedApi(android.companion.virtual.flags.Flags.FLAG_VDM_CUSTOM_HOME)
		@SystemApi
		public boolean isHomeSupported() {
		return android.companion.virtual.flags.Flags.vdmCustomHome() && mIsHomeSupported;
		return mIsHomeSupported;
		}

		/**
		@@ -605,7 +604,6 @@ public final class VirtualDisplayConfig implements Parcelable {
		* @see DisplayManager#VIRTUAL_DISPLAY_FLAG_OWN_CONTENT_ONLY
		* @hide
		*/
		@FlaggedApi(android.companion.virtual.flags.Flags.FLAG_VDM_CUSTOM_HOME)
		@SystemApi
		@NonNull
		public Builder setHomeSupported(boolean isHomeSupported) {

services/companion/java/com/android/server/companion/virtual/VirtualDeviceImpl.java

+1 −3

Original line number	Diff line number	Diff line
		@@ -1431,8 +1431,6 @@ final class VirtualDeviceImpl extends IVirtualDevice.Stub
		mParams.getDefaultNavigationPolicy() == NAVIGATION_POLICY_DEFAULT_ALLOWED;
		final boolean showTasksInHostDeviceRecents =
		getDevicePolicy(POLICY_TYPE_RECENTS) == DEVICE_POLICY_DEFAULT;
		final ComponentName homeComponent =
		Flags.vdmCustomHome() ? mParams.getHomeComponent() : null;

		if (mActivityListenerAdapter == null) {
		mActivityListenerAdapter = new GwpcActivityListener();
		@@ -1453,7 +1451,7 @@ final class VirtualDeviceImpl extends IVirtualDevice.Stub
		mActivityListenerAdapter,
		displayCategories,
		showTasksInHostDeviceRecents,
		homeComponent);
		mParams.getHomeComponent());
		gwpc.registerRunningAppsChangedListener(/* listener= */ this);
		return gwpc;
		}

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

+12 −15

Original line number	Diff line number	Diff line
		@@ -152,7 +152,6 @@ import com.android.server.LocalServices;
		import com.android.server.am.ActivityManagerService;
		import com.android.server.am.AppTimeTracker;
		import com.android.server.am.UserState;
		import com.android.server.display.feature.DisplayManagerFlags;
		import com.android.server.pm.UserManagerInternal;
		import com.android.server.policy.PermissionPolicyInternal;
		import com.android.server.policy.WindowManagerPolicy;
		@@ -1541,7 +1540,6 @@ class RootWindowContainer extends WindowContainer<DisplayContent>
		ActivityInfo aInfo = resolveHomeActivity(userId, homeIntent);
		boolean lookForSecondaryHomeActivityInPrimaryHomePackage = aInfo != null;

		if (android.companion.virtual.flags.Flags.vdmCustomHome()) {
		// Resolve the externally set home activity for this display, if any. If it is unset or
		// we fail to resolve it, fallback to the default secondary home activity.
		final ComponentName customHomeComponent =
		@@ -1556,7 +1554,6 @@ class RootWindowContainer extends WindowContainer<DisplayContent>
		lookForSecondaryHomeActivityInPrimaryHomePackage = false;
		}
		}
		}

		if (lookForSecondaryHomeActivityInPrimaryHomePackage) {
		// Resolve activities in the same package as currently selected primary home activity.