Merge "Merge "Prevent transparent region in SurfaceViewSyncTests" into nougat-cts-dev am: c083cb5191" into nougat-mr1-cts-dev
diff --git a/tests/tests/view/src/android/view/cts/SurfaceViewSyncTests.java b/tests/tests/view/src/android/view/cts/SurfaceViewSyncTests.java
index 6f1c655..b85fc4f 100644
--- a/tests/tests/view/src/android/view/cts/SurfaceViewSyncTests.java
+++ b/tests/tests/view/src/android/view/cts/SurfaceViewSyncTests.java
@@ -98,10 +98,21 @@
     // ViewFactories
     ///////////////////////////////////////////////////////////////////////////
 
-    private ViewFactory sEmptySurfaceViewFactory = SurfaceView::new;
+    private ViewFactory sEmptySurfaceViewFactory = context -> {
+        SurfaceView surfaceView = new SurfaceView(context);
+
+        // prevent transparent region optimization, which is invalid for a SurfaceView moving around
+        surfaceView.setWillNotDraw(false);
+
+        return surfaceView;
+    };
 
     private ViewFactory sGreenSurfaceViewFactory = context -> {
         SurfaceView surfaceView = new SurfaceView(context);
+
+        // prevent transparent region optimization, which is invalid for a SurfaceView moving around
+        surfaceView.setWillNotDraw(false);
+
         surfaceView.getHolder().setFixedSize(640, 480);
         surfaceView.getHolder().addCallback(new SurfaceHolder.Callback() {
             @Override
@@ -122,6 +133,10 @@
 
     private ViewFactory sVideoViewFactory = context -> {
         SurfaceView surfaceView = new SurfaceView(context);
+
+        // prevent transparent region optimization, which is invalid for a SurfaceView moving around
+        surfaceView.setWillNotDraw(false);
+
         surfaceView.getHolder().setFixedSize(640, 480);
         surfaceView.getHolder().addCallback(new SurfaceHolder.Callback() {
             @Override