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

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

+11 −0

Original line number	Diff line number	Diff line
		@@ -18,6 +18,7 @@ package com.android.server.companion.virtual;

		import static android.companion.virtual.VirtualDeviceParams.DEVICE_POLICY_CUSTOM;
		import static android.companion.virtual.VirtualDeviceParams.DEVICE_POLICY_DEFAULT;
		import static android.companion.virtual.VirtualDeviceParams.DEVICE_POLICY_INVALID;
		import static android.companion.virtual.VirtualDeviceParams.POLICY_TYPE_RECENTS;
		import static android.companion.virtual.VirtualDeviceParams.POLICY_TYPE_SENSORS;
		import static android.content.Context.DEVICE_ID_DEFAULT;
		@@ -448,6 +449,7 @@ public class VirtualDeviceManagerServiceTest {
		}

		@Test
		@DisableFlags(Flags.FLAG_HANDLE_INVALID_DEVICE_ID)
		public void getDevicePolicy_nonExistentDeviceId_returnsDefault() {
		assertThat(mVdm.getDevicePolicy(mDeviceImpl.getDeviceId() + 1, POLICY_TYPE_SENSORS))
		.isEqualTo(DEVICE_POLICY_DEFAULT);
		@@ -455,6 +457,15 @@ public class VirtualDeviceManagerServiceTest {
		.isEqualTo(DEVICE_POLICY_DEFAULT);
		}

		@Test
		@EnableFlags(Flags.FLAG_HANDLE_INVALID_DEVICE_ID)
		public void getDevicePolicy_nonExistentDeviceId_returnsInvalid() {
		assertThat(mVdm.getDevicePolicy(mDeviceImpl.getDeviceId() + 1, POLICY_TYPE_SENSORS))
		.isEqualTo(DEVICE_POLICY_INVALID);
		assertThat(mVdmNative.getDevicePolicy(mDeviceImpl.getDeviceId() + 1, POLICY_TYPE_SENSORS))
		.isEqualTo(DEVICE_POLICY_INVALID);
		}

		@Test
		public void getDevicePolicy_unspecifiedPolicy_returnsDefault() {
		assertThat(mVdm.getDevicePolicy(mDeviceImpl.getDeviceId(), POLICY_TYPE_SENSORS))