Merge "Rename VirtualDeviceParams#addDevicePolicy to setDevicePolicy" (e0c9e112) · Commits · e / os / android_frameworks_base

core/api/system-current.txt

+1 −1

Original line number	Diff line number	Diff line
		@@ -2998,13 +2998,13 @@ package android.companion.virtual {

		public static final class VirtualDeviceParams.Builder {
		ctor public VirtualDeviceParams.Builder();
		method @NonNull public android.companion.virtual.VirtualDeviceParams.Builder addDevicePolicy(int, int);
		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 @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 @NonNull public android.companion.virtual.VirtualDeviceParams.Builder setDevicePolicy(int, int);
		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);
		method @NonNull public android.companion.virtual.VirtualDeviceParams.Builder setUsersWithMatchingAccounts(@NonNull java.util.Set<android.os.UserHandle>);

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

+6 −6

Original line number	Diff line number	Diff line
		@@ -313,7 +313,7 @@ public final class VirtualDeviceParams implements Parcelable {
		* Returns the policy specified for this policy type, or {@link #DEVICE_POLICY_DEFAULT} if no
		* policy for this type has been explicitly specified.
		*
		* @see Builder#addDevicePolicy
		* @see Builder#setDevicePolicy
		*/
		public @DevicePolicy int getDevicePolicy(@PolicyType int policyType) {
		return mDevicePolicies.get(policyType, DEVICE_POLICY_DEFAULT);
		@@ -615,7 +615,7 @@ public final class VirtualDeviceParams implements Parcelable {
		}

		/**
		* Add a policy for this virtual device.
		* Specifies a policy for this virtual device.
		*
		* Policies define the system behavior that may be specific for this virtual device. A
		* policy can be defined for each {@code PolicyType}, but they are all optional.
		@@ -624,7 +624,7 @@ public final class VirtualDeviceParams implements Parcelable {
		* @param devicePolicy the value of the policy, i.e. how to interpret the device behavior.
		*/
		@NonNull
		public Builder addDevicePolicy(@PolicyType int policyType, @DevicePolicy int devicePolicy) {
		public Builder setDevicePolicy(@PolicyType int policyType, @DevicePolicy int devicePolicy) {
		mDevicePolicies.put(policyType, devicePolicy);
		return this;
		}
		@@ -632,13 +632,13 @@ public final class VirtualDeviceParams implements Parcelable {
		/**
		* Adds a configuration for a sensor that should be created for this virtual device.
		*
		* Device sensors must remain valid for the entire lifetime of the device, hence they are
		* <p>Device sensors must remain valid for the entire lifetime of the device, hence they are
		* created together with the device itself, and removed when the device is removed.
		*
		* Requires {@link #DEVICE_POLICY_CUSTOM} to be set for {@link #POLICY_TYPE_SENSORS}.
		* <p>Requires {@link #DEVICE_POLICY_CUSTOM} to be set for {@link #POLICY_TYPE_SENSORS}.
		*
		* @see android.companion.virtual.sensor.VirtualSensor
		* @see #addDevicePolicy
		* @see #setDevicePolicy
		*/
		@NonNull
		public Builder addVirtualSensorConfig(@NonNull VirtualSensorConfig virtualSensorConfig) {

services/tests/servicestests/src/com/android/server/companion/virtual/VirtualDeviceManagerServiceTest.java

+1 −1

Original line number	Diff line number	Diff line
		@@ -317,7 +317,7 @@ public class VirtualDeviceManagerServiceTest {
		VirtualDeviceParams params = new VirtualDeviceParams
		.Builder()
		.setBlockedActivities(getBlockedActivities())
		.addDevicePolicy(POLICY_TYPE_SENSORS, DEVICE_POLICY_CUSTOM)
		.setDevicePolicy(POLICY_TYPE_SENSORS, DEVICE_POLICY_CUSTOM)
		.build();
		mDeviceImpl = new VirtualDeviceImpl(mContext,
		mAssociationInfo, new Binder(), /* ownerUid */ 0, VIRTUAL_DEVICE_ID,

services/tests/servicestests/src/com/android/server/companion/virtual/VirtualDeviceParamsTest.java

+1 −1

Original line number	Diff line number	Diff line
		@@ -46,7 +46,7 @@ public class VirtualDeviceParamsTest {
		VirtualDeviceParams originalParams = new VirtualDeviceParams.Builder()
		.setLockState(VirtualDeviceParams.LOCK_STATE_ALWAYS_UNLOCKED)
		.setUsersWithMatchingAccounts(Set.of(UserHandle.of(123), UserHandle.of(456)))
		.addDevicePolicy(POLICY_TYPE_SENSORS, DEVICE_POLICY_CUSTOM)
		.setDevicePolicy(POLICY_TYPE_SENSORS, DEVICE_POLICY_CUSTOM)
		.addVirtualSensorConfig(
		new VirtualSensorConfig.Builder(TYPE_ACCELEROMETER, SENSOR_NAME)
		.setVendor(SENSOR_VENDOR)