Merge "SurfaceTexture: fix a test deadlock" (08b997c7) · Commits · e / os / android_frameworks_base

libs/gui/tests/SurfaceTexture_test.cpp

+4 −2

Original line number	Diff line number	Diff line
		@@ -974,8 +974,6 @@ TEST_F(SurfaceTextureGLTest, TexturingFromGLFilledRGBABufferPow2) {

		eglSwapBuffers(mEglDisplay, stcEglSurface);

		eglDestroySurface(mEglDisplay, stcEglSurface);

		// Do the consumer side of things
		EXPECT_TRUE(eglMakeCurrent(mEglDisplay, mEglSurface, mEglSurface,
		mEglContext));
		@@ -985,6 +983,10 @@ TEST_F(SurfaceTextureGLTest, TexturingFromGLFilledRGBABufferPow2) {

		mST->updateTexImage();

		// We must wait until updateTexImage has been called to destroy the
		// EGLSurface because we're in synchronous mode.
		eglDestroySurface(mEglDisplay, stcEglSurface);

		glClearColor(0.2, 0.2, 0.2, 0.2);
		glClear(GL_COLOR_BUFFER_BIT);