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

Commit 5d9da392 authored by Oleg Blinnikov's avatar Oleg Blinnikov
Browse files

Fix displayIdMirror test 

With I18b36dadc43ba1c37f9516ff10d24bb8683c04ac
getDisplayIdToMirror will return INVALID_DISPLAY
if the virtual display has own content. By default
virtual display has own content flag set, unless
VIRTUAL_DISPLAY_FLAG_AUTO_MIRROR is present.

This CL adds VIRTUAL_DISPLAY_FLAG_AUTO_MIRROR
to the virtual displays in the test and also
makes sure there is permission to capture video
set.

Change-Id: I703aee71f526013129c187628809763fa6e946b7
Bug: 302336562
Test: atest DisplayManagerServiceTest#testCreateVirtualDisplay_displayIdToMirror
parent cf5fa2a3

services/tests/displayservicetests/src/com/android/server/display/DisplayManagerServiceTest.java

+4 −0
Original line number Diff line number Diff line
@@ -948,6 +948,9 @@ public class DisplayManagerServiceTest { 
        final VirtualDisplayConfig.Builder builder = new VirtualDisplayConfig.Builder(

                VIRTUAL_DISPLAY_NAME, width, height, dpi);

        builder.setUniqueId(uniqueId);

        builder.setFlags(VIRTUAL_DISPLAY_FLAG_AUTO_MIRROR);

        when(mContext.checkCallingPermission(CAPTURE_VIDEO_OUTPUT))

                .thenReturn(PackageManager.PERMISSION_GRANTED);

        final int firstDisplayId = binderService.createVirtualDisplay(builder.build(),

                mMockAppToken /* callback */, null /* projection */, PACKAGE_NAME);

        verify(mMockProjectionService, never()).setContentRecordingSession(any(),
@@ -960,6 +963,7 @@ public class DisplayManagerServiceTest { 
                VIRTUAL_DISPLAY_NAME, width, height, dpi).setUniqueId(uniqueId2);

        builder2.setUniqueId(uniqueId2);

        builder2.setDisplayIdToMirror(firstDisplayId);

        builder2.setFlags(VIRTUAL_DISPLAY_FLAG_AUTO_MIRROR);

        final int secondDisplayId = binderService.createVirtualDisplay(builder2.build(),

                mMockAppToken2 /* callback */, null /* projection */,

                PACKAGE_NAME);