Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit dfb5b936 authored by Biswarup Pal's avatar Biswarup Pal
Browse files

Fix VirtualDeviceManagerServiceTest 

Test: atest VirtualDeviceManagerServiceTest
Fixes: 427617889
Flag: android.companion.virtualdevice.flags.handle_invalid_device_id
Change-Id: I47fb071aef83d1b7b2ca16518137c99cf4d7bfb9
parent ef040c1c

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()

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

+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))