Merge "Fix VirtualDeviceManagerServiceTest" into main (fe39f69f) · Commits · e / os / android_frameworks_base

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

+4 −1

Original line number	Diff line number	Diff line
		@@ -531,9 +531,12 @@ public class VirtualDeviceManagerService extends SystemService {
		mVirtualDeviceListeners.unregister(listener);
		}

		@Override // BinderCall
		@Override // Binder call
		@VirtualDeviceParams.DevicePolicy
		public int getDevicePolicy(int deviceId, @VirtualDeviceParams.PolicyType int policyType) {
		if (deviceId == Context.DEVICE_ID_DEFAULT) {
		return DEVICE_POLICY_DEFAULT;
		}
		VirtualDeviceImpl virtualDevice = getVirtualDeviceForId(deviceId);
		if (virtualDevice == null) {
		return Flags.handleInvalidDeviceId()

+10 −0

Original line number	Diff line number	Diff line
		@@ -433,6 +433,7 @@ public class VirtualDeviceManagerServiceTest {
		}

		@Test
		@DisableFlags(Flags.FLAG_HANDLE_INVALID_DEVICE_ID)
		public void getDevicePolicy_invalidDeviceId_returnsDefault() {
		assertThat(mVdm.getDevicePolicy(DEVICE_ID_INVALID, POLICY_TYPE_SENSORS))
		.isEqualTo(DEVICE_POLICY_DEFAULT);
		@@ -440,6 +441,15 @@ public class VirtualDeviceManagerServiceTest {
		.isEqualTo(DEVICE_POLICY_DEFAULT);
		}

		@Test
		@EnableFlags(Flags.FLAG_HANDLE_INVALID_DEVICE_ID)
		public void getDevicePolicy_invalidDeviceId_returnsInvalid() {
		assertThat(mVdm.getDevicePolicy(DEVICE_ID_INVALID, POLICY_TYPE_SENSORS))
		.isEqualTo(DEVICE_POLICY_INVALID);
		assertThat(mVdmNative.getDevicePolicy(DEVICE_ID_INVALID, POLICY_TYPE_SENSORS))
		.isEqualTo(DEVICE_POLICY_INVALID);
		}

		@Test
		public void getDevicePolicy_defaultDeviceId_returnsDefault() {
		assertThat(mVdm.getDevicePolicy(DEVICE_ID_DEFAULT, POLICY_TYPE_SENSORS))