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

Commit d5b7b9c8 authored by Marvin Ramin's avatar Marvin Ramin
Browse files

Apply dynamic policy flag in VirtualDeviceImpl 

Ensure VirtualDevice#setDevicePolicy has no side effects when the
dynamic policy flag is disabled.

Test: atest CtsVirtualDevicesTestcases with flag flipped both ways
Bug: 298401780
Change-Id: I8dc0ecdc55efefe68f5ca65463259dda3223ee9b
parent 437b648e

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

+4 −0
Original line number Diff line number Diff line
@@ -632,6 +632,10 @@ final class VirtualDeviceImpl extends IVirtualDevice.Stub 
    public void setDevicePolicy(@VirtualDeviceParams.DynamicPolicyType int policyType,

            @VirtualDeviceParams.DevicePolicy int devicePolicy) {

        super.setDevicePolicy_enforcePermission();

        if (!Flags.dynamicPolicy()) {

            return;

        }



        switch (policyType) {

            case POLICY_TYPE_RECENTS:

                synchronized (mVirtualDeviceLock) {