commit 7dc370bfe3223dfbcb368e0006c688dfd668ab01
author sergeyv <sergeyv@google.com> Fri Jun 17 11:21:11 2016 -0700
committer sergeyv <sergeyv@google.com> Fri Jun 17 14:34:22 2016 -0700
tree a34aee6e378a9f536649f22d186cba869e4f7c36
parent d2f712d22a63787646ae345cfc50c24784c9ab4c

HWUI: add leak check for macrobench

Change-Id: Id2037921fdbe599b3c722f2e1d17b99f3b74361c

libs/hwui/tests/common/TestUtils.cpp

diff --git a/libs/hwui/tests/common/TestUtils.cpp b/libs/hwui/tests/common/TestUtils.cpp
index c3eb0ea..930067a 100644
--- a/libs/hwui/tests/common/TestUtils.cpp
+++ b/libs/hwui/tests/common/TestUtils.cpp
@@ -20,6 +20,7 @@
 #include "DeferredLayerUpdater.h"
 #include "LayerRenderer.h"
 
+#include <renderthread/EglManager.h>
 #include <utils/Unicode.h>
 
 namespace android {
@@ -112,12 +113,18 @@
 
 void TestUtils::TestTask::run() {
     // RenderState only valid once RenderThread is running, so queried here
-    RenderState& renderState = renderthread::RenderThread::getInstance().renderState();
+    renderthread::RenderThread& renderThread = renderthread::RenderThread::getInstance();
+    bool hasEglContext = renderThread.eglManager().hasEglContext();
+    RenderState& renderState = renderThread.renderState();
+    if (!hasEglContext) {
+        renderState.onGLContextCreated();
+    }
 
-    renderState.onGLContextCreated();
-    rtCallback(renderthread::RenderThread::getInstance());
-    renderState.flush(Caches::FlushMode::Full);
-    renderState.onGLContextDestroyed();
+    rtCallback(renderThread);
+    if (!hasEglContext) {
+        renderState.flush(Caches::FlushMode::Full);
+        renderState.onGLContextDestroyed();
+    }
 }
 
 std::unique_ptr<uint16_t[]> TestUtils::asciiToUtf16(const char* str) {