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

Commit 1733e375 authored by Vladimir Komsiyski's avatar Vladimir Komsiyski Committed by Android (Google) Code Review
Browse files

Merge "Make DESTROY_CONTENT_ON_REMOVAL default VDM flag." into main

parents 3814571e f8ba95fc

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

+1 −4
Original line number Diff line number Diff line
@@ -107,6 +107,7 @@ final class VirtualDeviceImpl extends IVirtualDevice.Stub 


    private static final int DEFAULT_VIRTUAL_DISPLAY_FLAGS =

            DisplayManager.VIRTUAL_DISPLAY_FLAG_TOUCH_FEEDBACK_DISABLED

                    | DisplayManager.VIRTUAL_DISPLAY_FLAG_DESTROY_CONTENT_ON_REMOVAL

                    | DisplayManager.VIRTUAL_DISPLAY_FLAG_SUPPORTS_TOUCH

                    | DisplayManager.VIRTUAL_DISPLAY_FLAG_OWN_FOCUS;
@@ -283,10 +284,6 @@ final class VirtualDeviceImpl extends IVirtualDevice.Stub 
        if (mParams.getLockState() == VirtualDeviceParams.LOCK_STATE_ALWAYS_UNLOCKED) {

            flags |= DisplayManager.VIRTUAL_DISPLAY_FLAG_ALWAYS_UNLOCKED;

        }

        if (mParams.getDevicePolicy(VirtualDeviceParams.POLICY_TYPE_RECENTS)

                == VirtualDeviceParams.DEVICE_POLICY_CUSTOM) {

            flags |= DisplayManager.VIRTUAL_DISPLAY_FLAG_DESTROY_CONTENT_ON_REMOVAL;

        }

        return flags;

    }