Merge "Deprecate a bunch of VDM APIs." into main (6a28a132) · Commits · e / os / android_frameworks_base

core/api/system-current.txt

+14 −14

Original line number	Diff line number	Diff line
		@@ -3223,14 +3223,14 @@ package android.companion.virtual {

		public final class VirtualDeviceParams implements android.os.Parcelable {
		method public int describeContents();
		method @NonNull public java.util.Set<android.content.ComponentName> getAllowedActivities();
		method @NonNull public java.util.Set<android.content.ComponentName> getAllowedCrossTaskNavigations();
		method @Deprecated @NonNull public java.util.Set<android.content.ComponentName> getAllowedActivities();
		method @Deprecated @NonNull public java.util.Set<android.content.ComponentName> getAllowedCrossTaskNavigations();
		method public int getAudioPlaybackSessionId();
		method public int getAudioRecordingSessionId();
		method @NonNull public java.util.Set<android.content.ComponentName> getBlockedActivities();
		method @NonNull public java.util.Set<android.content.ComponentName> getBlockedCrossTaskNavigations();
		method public int getDefaultActivityPolicy();
		method public int getDefaultNavigationPolicy();
		method @Deprecated @NonNull public java.util.Set<android.content.ComponentName> getBlockedActivities();
		method @Deprecated @NonNull public java.util.Set<android.content.ComponentName> getBlockedCrossTaskNavigations();
		method @Deprecated public int getDefaultActivityPolicy();
		method @Deprecated public int getDefaultNavigationPolicy();
		method public int getDevicePolicy(int);
		method @FlaggedApi("android.companion.virtual.flags.vdm_custom_home") @Nullable public android.content.ComponentName getHomeComponent();
		method public int getLockState();
		@@ -3238,15 +3238,15 @@ package android.companion.virtual {
		method @NonNull public java.util.Set<android.os.UserHandle> getUsersWithMatchingAccounts();
		method @NonNull public java.util.List<android.companion.virtual.sensor.VirtualSensorConfig> getVirtualSensorConfigs();
		method public void writeToParcel(@NonNull android.os.Parcel, int);
		field public static final int ACTIVITY_POLICY_DEFAULT_ALLOWED = 0; // 0x0
		field public static final int ACTIVITY_POLICY_DEFAULT_BLOCKED = 1; // 0x1
		field @Deprecated public static final int ACTIVITY_POLICY_DEFAULT_ALLOWED = 0; // 0x0
		field @Deprecated public static final int ACTIVITY_POLICY_DEFAULT_BLOCKED = 1; // 0x1
		field @NonNull public static final android.os.Parcelable.Creator<android.companion.virtual.VirtualDeviceParams> CREATOR;
		field public static final int DEVICE_POLICY_CUSTOM = 1; // 0x1
		field public static final int DEVICE_POLICY_DEFAULT = 0; // 0x0
		field public static final int LOCK_STATE_ALWAYS_UNLOCKED = 1; // 0x1
		field public static final int LOCK_STATE_DEFAULT = 0; // 0x0
		field public static final int NAVIGATION_POLICY_DEFAULT_ALLOWED = 0; // 0x0
		field public static final int NAVIGATION_POLICY_DEFAULT_BLOCKED = 1; // 0x1
		field @Deprecated public static final int NAVIGATION_POLICY_DEFAULT_ALLOWED = 0; // 0x0
		field @Deprecated public static final int NAVIGATION_POLICY_DEFAULT_BLOCKED = 1; // 0x1
		field @FlaggedApi("android.companion.virtual.flags.dynamic_policy") public static final int POLICY_TYPE_ACTIVITY = 3; // 0x3
		field public static final int POLICY_TYPE_AUDIO = 1; // 0x1
		field public static final int POLICY_TYPE_RECENTS = 2; // 0x2
		@@ -3257,12 +3257,12 @@ package android.companion.virtual {
		ctor public VirtualDeviceParams.Builder();
		method @NonNull public android.companion.virtual.VirtualDeviceParams.Builder addVirtualSensorConfig(@NonNull android.companion.virtual.sensor.VirtualSensorConfig);
		method @NonNull public android.companion.virtual.VirtualDeviceParams build();
		method @NonNull public android.companion.virtual.VirtualDeviceParams.Builder setAllowedActivities(@NonNull java.util.Set<android.content.ComponentName>);
		method @NonNull public android.companion.virtual.VirtualDeviceParams.Builder setAllowedCrossTaskNavigations(@NonNull java.util.Set<android.content.ComponentName>);
		method @Deprecated @NonNull public android.companion.virtual.VirtualDeviceParams.Builder setAllowedActivities(@NonNull java.util.Set<android.content.ComponentName>);
		method @Deprecated @NonNull public android.companion.virtual.VirtualDeviceParams.Builder setAllowedCrossTaskNavigations(@NonNull java.util.Set<android.content.ComponentName>);
		method @NonNull public android.companion.virtual.VirtualDeviceParams.Builder setAudioPlaybackSessionId(int);
		method @NonNull public android.companion.virtual.VirtualDeviceParams.Builder setAudioRecordingSessionId(int);
		method @NonNull public android.companion.virtual.VirtualDeviceParams.Builder setBlockedActivities(@NonNull java.util.Set<android.content.ComponentName>);
		method @NonNull public android.companion.virtual.VirtualDeviceParams.Builder setBlockedCrossTaskNavigations(@NonNull java.util.Set<android.content.ComponentName>);
		method @Deprecated @NonNull public android.companion.virtual.VirtualDeviceParams.Builder setBlockedActivities(@NonNull java.util.Set<android.content.ComponentName>);
		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.virtual.flags.vdm_custom_home") @NonNull public android.companion.virtual.VirtualDeviceParams.Builder setHomeComponent(@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);

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

+46 −0

Original line number	Diff line number	Diff line
		@@ -94,13 +94,19 @@ public final class VirtualDeviceParams implements Parcelable {
		/**
		* Indicates that activities are allowed by default on this virtual device, unless they are
		* explicitly blocked by {@link Builder#setBlockedActivities}.
		*
		* @deprecated Use {@link #POLICY_TYPE_ACTIVITY} and {@link #DEVICE_POLICY_DEFAULT}
		*/
		@Deprecated
		public static final int ACTIVITY_POLICY_DEFAULT_ALLOWED = 0;

		/**
		* Indicates that activities are blocked by default on this virtual device, unless they are
		* allowed by {@link Builder#setAllowedActivities}.
		*
		* @deprecated Use {@link #POLICY_TYPE_ACTIVITY} and {@link #DEVICE_POLICY_CUSTOM}
		*/
		@Deprecated
		public static final int ACTIVITY_POLICY_DEFAULT_BLOCKED = 1;

		/** @hide */
		@@ -113,13 +119,19 @@ public final class VirtualDeviceParams implements Parcelable {
		/**
		* Indicates that tasks are allowed to navigate to other tasks on this virtual device,
		* unless they are explicitly blocked by {@link Builder#setBlockedCrossTaskNavigations}.
		*
		* @deprecated Use {@link #POLICY_TYPE_ACTIVITY} and {@link #DEVICE_POLICY_DEFAULT}
		*/
		@Deprecated
		public static final int NAVIGATION_POLICY_DEFAULT_ALLOWED = 0;

		/**
		* Indicates that tasks are blocked from navigating to other tasks by default on this virtual
		* device, unless allowed by {@link Builder#setAllowedCrossTaskNavigations}.
		*
		* @deprecated Use {@link #POLICY_TYPE_ACTIVITY} and {@link #DEVICE_POLICY_CUSTOM}
		*/
		@Deprecated
		public static final int NAVIGATION_POLICY_DEFAULT_BLOCKED = 1;

		/** @hide */
		@@ -325,7 +337,10 @@ public final class VirtualDeviceParams implements Parcelable {
		* be be allowed by default.
		*
		* @see Builder#setAllowedCrossTaskNavigations(Set)
		*
		* @deprecated See {@link VirtualDeviceManager.VirtualDevice#addActivityPolicyExemption}
		*/
		@Deprecated
		@NonNull
		public Set<ComponentName> getAllowedCrossTaskNavigations() {
		return mDefaultNavigationPolicy == NAVIGATION_POLICY_DEFAULT_ALLOWED
		@@ -340,7 +355,10 @@ public final class VirtualDeviceParams implements Parcelable {
		* will be be allowed by default.
		*
		* @see Builder#setBlockedCrossTaskNavigations(Set)
		*
		* @deprecated See {@link VirtualDeviceManager.VirtualDevice#addActivityPolicyExemption}
		*/
		@Deprecated
		@NonNull
		public Set<ComponentName> getBlockedCrossTaskNavigations() {
		return mDefaultNavigationPolicy == NAVIGATION_POLICY_DEFAULT_BLOCKED
		@@ -355,7 +373,10 @@ public final class VirtualDeviceParams implements Parcelable {
		*
		* @see Builder#setAllowedCrossTaskNavigations
		* @see Builder#setBlockedCrossTaskNavigations
		*
		* @deprecated Use {@link #getDevicePolicy} with {@link #POLICY_TYPE_ACTIVITY}
		*/
		@Deprecated
		@NavigationPolicy
		public int getDefaultNavigationPolicy() {
		return mDefaultNavigationPolicy;
		@@ -366,7 +387,10 @@ public final class VirtualDeviceParams implements Parcelable {
		* allowed, except the ones explicitly blocked.
		*
		* @see Builder#setAllowedActivities(Set)
		*
		* @deprecated See {@link VirtualDeviceManager.VirtualDevice#addActivityPolicyExemption}
		*/
		@Deprecated
		@NonNull
		public Set<ComponentName> getAllowedActivities() {
		return mDefaultActivityPolicy == ACTIVITY_POLICY_DEFAULT_ALLOWED
		@@ -379,7 +403,10 @@ public final class VirtualDeviceParams implements Parcelable {
		* that all activities in {@link #getAllowedActivities} are allowed.
		*
		* @see Builder#setBlockedActivities(Set)
		*
		* @deprecated See {@link VirtualDeviceManager.VirtualDevice#addActivityPolicyExemption}
		*/
		@Deprecated
		@NonNull
		public Set<ComponentName> getBlockedActivities() {
		return mDefaultActivityPolicy == ACTIVITY_POLICY_DEFAULT_BLOCKED
		@@ -394,7 +421,10 @@ public final class VirtualDeviceParams implements Parcelable {
		*
		* @see Builder#setBlockedActivities
		* @see Builder#setAllowedActivities
		*
		* @deprecated Use {@link #getDevicePolicy} with {@link #POLICY_TYPE_ACTIVITY}
		*/
		@Deprecated
		@ActivityPolicy
		public int getDefaultActivityPolicy() {
		return mDefaultActivityPolicy;
		@@ -743,7 +773,11 @@ public final class VirtualDeviceParams implements Parcelable {
		*
		* @param allowedCrossTaskNavigations A set of tasks {@link ComponentName} allowed to
		* navigate to new tasks in the virtual device.
		*
		* @deprecated Use {@link #POLICY_TYPE_ACTIVITY} and
		* {@link VirtualDeviceManager.VirtualDevice#addActivityPolicyExemption}
		*/
		@Deprecated
		@NonNull
		public Builder setAllowedCrossTaskNavigations(
		@NonNull Set<ComponentName> allowedCrossTaskNavigations) {
		@@ -774,7 +808,11 @@ public final class VirtualDeviceParams implements Parcelable {
		*
		* @param blockedCrossTaskNavigations A set of tasks {@link ComponentName} to be
		* blocked from navigating to new tasks in the virtual device.
		*
		* @deprecated Use {@link #POLICY_TYPE_ACTIVITY} and
		* {@link VirtualDeviceManager.VirtualDevice#addActivityPolicyExemption}
		*/
		@Deprecated
		@NonNull
		public Builder setBlockedCrossTaskNavigations(
		@NonNull Set<ComponentName> blockedCrossTaskNavigations) {
		@@ -802,7 +840,11 @@ public final class VirtualDeviceParams implements Parcelable {
		*
		* @param allowedActivities A set of activity {@link ComponentName} allowed to be launched
		* in the virtual device.
		*
		* @deprecated Use {@link #POLICY_TYPE_ACTIVITY} and
		* {@link VirtualDeviceManager.VirtualDevice#addActivityPolicyExemption}
		*/
		@Deprecated
		@NonNull
		public Builder setAllowedActivities(@NonNull Set<ComponentName> allowedActivities) {
		if (mDefaultActivityPolicyConfigured
		@@ -828,7 +870,11 @@ public final class VirtualDeviceParams implements Parcelable {
		*
		* @param blockedActivities A set of {@link ComponentName} to be blocked launching from
		* virtual device.
		*
		* @deprecated Use {@link #POLICY_TYPE_ACTIVITY} and
		* {@link VirtualDeviceManager.VirtualDevice#addActivityPolicyExemption}
		*/
		@Deprecated
		@NonNull
		public Builder setBlockedActivities(@NonNull Set<ComponentName> blockedActivities) {
		if (mDefaultActivityPolicyConfigured