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

Commit b6992f2d authored by Santos Cordon's avatar Santos Cordon
Browse files

VR Virtual Display created with SECURE flag. 

VR Virtual display needs to be able to composite secure layers
into the VR scene.  To do that it needs access to said layers by
including VIRTUAL_DISPLAY_FLAG_SECURE at creation time.

Also add code to allow secure virtual displays to be created from
system components, which VR is.

Test: Run a secure activity (like a credit-card entry) in the virtual
display and ensure that it renders in VR.

Bug: 67714367
Change-Id: Iaeb9507aacd5d7e52e92b67c8ce2cd5af31a3f83
parent 850f29a1

services/core/java/com/android/server/display/DisplayManagerService.java

+1 −1
Original line number Diff line number Diff line
@@ -1741,7 +1741,7 @@ public final class DisplayManagerService extends SystemService { 
                            + "display.");

                }

            }

            if ((flags & VIRTUAL_DISPLAY_FLAG_SECURE) != 0) {

            if (callingUid != Process.SYSTEM_UID && (flags & VIRTUAL_DISPLAY_FLAG_SECURE) != 0) {

                if (!canProjectSecureVideo(projection)) {

                    throw new SecurityException("Requires CAPTURE_SECURE_VIDEO_OUTPUT "

                            + "or an appropriate MediaProjection token to create a "

services/core/java/com/android/server/vr/Vr2dDisplay.java

+2 −0
Original line number Diff line number Diff line
@@ -296,6 +296,8 @@ class Vr2dDisplay { 
            flags |= DisplayManager.VIRTUAL_DISPLAY_FLAG_PUBLIC;

            flags |= DisplayManager.VIRTUAL_DISPLAY_FLAG_OWN_CONTENT_ONLY;

            flags |= DisplayManager.VIRTUAL_DISPLAY_FLAG_DESTROY_CONTENT_ON_REMOVAL;

            flags |= DisplayManager.VIRTUAL_DISPLAY_FLAG_SECURE;



            mVirtualDisplay = mDisplayManager.createVirtualDisplay(null /* projection */,

                    DISPLAY_NAME, mVirtualDisplayWidth, mVirtualDisplayHeight, mVirtualDisplayDpi,

                    null /* surface */, flags, null /* callback */, null /* handler */,