commit 08588dd76073a8635aa4175d5b98fc5db86afec4
author Pablo Ceballos <pceballos@google.com> Thu Jun 02 17:10:06 2016 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Thu Jun 02 17:10:06 2016 +0000
tree 2747df691f7cd8dcf0a5bdaf2101f22276986762
parent d25aab3ce8aab1b95ac60922981c87c6963a0a6b
parent 15311bd8a5e8a8b74e7abe6314c764e02491a12d

Merge "Push empty sync transaction before taking screenshot in tests" into nyc-dev

services/surfaceflinger/tests/Transaction_test.cpp

diff --git a/services/surfaceflinger/tests/Transaction_test.cpp b/services/surfaceflinger/tests/Transaction_test.cpp
index 320fddb..f8d4d13 100644
--- a/services/surfaceflinger/tests/Transaction_test.cpp
+++ b/services/surfaceflinger/tests/Transaction_test.cpp
@@ -66,6 +66,8 @@
         sp<ISurfaceComposer> sf(ComposerService::getComposerService());
         sp<IBinder> display(sf->getBuiltInDisplay(
                 ISurfaceComposer::eDisplayIdMain));
+        SurfaceComposerClient::openGlobalTransaction();
+        SurfaceComposerClient::closeGlobalTransaction(true);
         ASSERT_EQ(NO_ERROR, sf->captureScreen(display, producer, Rect(), 0, 0,
                 0, INT_MAX, false));
         *sc = new ScreenCapture(cpuConsumer);