Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

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

Change-Id: I5be82d6f5d2007c6d3e90e2f81285becaa1fad60
This commit is contained in:
TreeHugger Robot
2021-09-17 06:01:59 +00:00
committed by Automerger Merge Worker
parent 93705f50de e7c3d62316
commit 0fbd69011a
1 changed files with 1 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -2334,11 +2334,10 @@ public class DisplayContentTests extends WindowTestsBase {
// mirror. // mirror.
setUpDefaultTaskDisplayAreaWindowToken(); setUpDefaultTaskDisplayAreaWindowToken();
// GIVEN SurfaceControl can successfully mirror the provided surface. // GIVEN SurfaceControl does not mirror a null surface.
Point surfaceSize = new Point( Point surfaceSize = new Point(
mDefaultDisplay.getDefaultTaskDisplayArea().getBounds().width(), mDefaultDisplay.getDefaultTaskDisplayArea().getBounds().width(),
mDefaultDisplay.getDefaultTaskDisplayArea().getBounds().height()); mDefaultDisplay.getDefaultTaskDisplayArea().getBounds().height());
surfaceControlMirrors(surfaceSize);
// GIVEN a new VirtualDisplay with an associated surface. // GIVEN a new VirtualDisplay with an associated surface.
final VirtualDisplay display = createVirtualDisplay(surfaceSize, null /* surface */); final VirtualDisplay display = createVirtualDisplay(surfaceSize, null /* surface */);