Merge "Remove erroneous precondition for null surface test" into sc-v2-dev
This commit is contained in:
committed by
Android (Google) Code Review
commit
e7c3d62316
@@ -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 */);
|
||||||
|
|||||||
Reference in New Issue
Block a user