commit e7375c079d603253ae1fb2bc65a34a1f8985e64d
author TreeHugger Robot <treehugger-gerrit@google.com> Thu Apr 13 04:49:58 2017 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Thu Apr 13 04:49:58 2017 +0000
tree 52d79090c9820740e3f8bc7ed424b62768a47fda
parent cb1d509d21ee0526599ac36ff01895591247208d
parent 06a7d395b8d91656c1cb22d254940926c564c2cc

Merge "Connecting to BufferQueue before setting surface." into oc-dev

renderscript/1.0/vts/functional/VtsMiscellaneousTests.cpp

diff --git a/renderscript/1.0/vts/functional/VtsMiscellaneousTests.cpp b/renderscript/1.0/vts/functional/VtsMiscellaneousTests.cpp
index 23b09ac..278dbf3 100644
--- a/renderscript/1.0/vts/functional/VtsMiscellaneousTests.cpp
+++ b/renderscript/1.0/vts/functional/VtsMiscellaneousTests.cpp
@@ -175,6 +175,8 @@
     ASSERT_NE(NativeWindow(0), nativeWindow);
 
     ((ANativeWindow *)nativeWindow)->incStrong(nullptr);
+    native_window_api_connect((ANativeWindow*)nativeWindow,
+                              NATIVE_WINDOW_API_CPU);
 
     context->allocationSetNativeWindow(allocationSend, nativeWindow);
     context->allocation2DWrite(allocationSend, 0, 0, 0, AllocationCubemapFace::POSITIVE_X, 512, 512,
@@ -239,6 +241,8 @@
     EXPECT_EQ(nativeWindow2, nativeWindow1);
 
     ((ANativeWindow *)nativeWindow1)->incStrong(nullptr);
+    native_window_api_connect((ANativeWindow*)nativeWindow1,
+                              NATIVE_WINDOW_API_CPU);
 
     context->allocationSetNativeWindow(allocationSend, nativeWindow1);
     context->allocation2DWrite(allocationSend, 0, 0, 0, AllocationCubemapFace::POSITIVE_X, 512, 512,