From 15af4648a01317ca370a6920865ad80358345acd Mon Sep 17 00:00:00 2001 From: Naomi Musgrave Date: Wed, 15 Sep 2021 16:54:31 +0100 Subject: [PATCH] Remove erroneous precondition for null surface test When DisplayContent is mirroring a VirtualDisplay with no surface, it is expected that querying the surface size returns null. Test mistakenly included an override for this method, leading to the test case asking SurfaceFlinger to mirror a null surface. Bug: 200017844 Test: atest WmTests:DisplayContentTests#testVirtualDisplayContent_withoutSurface --iterations 20 Change-Id: Ibaef4b85b99b6a3829ef598e050393db1616fdee --- .../wmtests/src/com/android/server/wm/DisplayContentTests.java | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/services/tests/wmtests/src/com/android/server/wm/DisplayContentTests.java b/services/tests/wmtests/src/com/android/server/wm/DisplayContentTests.java index 4ee0c60905047..d3ffe3d1fe4e1 100644 --- a/services/tests/wmtests/src/com/android/server/wm/DisplayContentTests.java +++ b/services/tests/wmtests/src/com/android/server/wm/DisplayContentTests.java @@ -2319,11 +2319,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 */);