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

Commit 552e0b25 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Remove erroneous precondition for null surface test" into sc-v2-dev am:... 

Merge "Remove erroneous precondition for null surface test" into sc-v2-dev am: e7c3d623 am: 0fbd6901

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15836017

Change-Id: I5dff68baf81342091080c6bab870a29371b1a578
parents dc0bcb59 0fbd6901

services/tests/wmtests/src/com/android/server/wm/DisplayContentTests.java

+1 −2
Original line number Diff line number Diff line
@@ -2334,11 +2334,10 @@ public class DisplayContentTests extends WindowTestsBase { 
        // mirror.

        setUpDefaultTaskDisplayAreaWindowToken();



        // GIVEN SurfaceControl can successfully mirror the provided surface.

        // GIVEN SurfaceControl does not mirror a null surface.

        Point surfaceSize = new Point(

                mDefaultDisplay.getDefaultTaskDisplayArea().getBounds().width(),

                mDefaultDisplay.getDefaultTaskDisplayArea().getBounds().height());

        surfaceControlMirrors(surfaceSize);



        // GIVEN a new VirtualDisplay with an associated surface.

        final VirtualDisplay display = createVirtualDisplay(surfaceSize, null /* surface */);