summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Jamie Gennis <jgennis@google.com> 2011-06-17 10:45:15 -0700
committer Android (Google) Code Review <android-gerrit@google.com> 2011-06-17 10:45:15 -0700
commit28bca1a77252bf94a73d765afe94a9fc8b9dc1a0 (patch)
tree92cb55d0a32a93632598a1eb2429094d5831b99e
parent4661a501217695ca8ac8c8a9c20e74b8f6fac0cf (diff)
parent07ed1a94bcad9b78b20f74f890d4271099da3a97 (diff)
Merge "SurfaceTexture: enable a test that now passes."
-rw-r--r--libs/gui/tests/SurfaceTextureClient_test.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/libs/gui/tests/SurfaceTextureClient_test.cpp b/libs/gui/tests/SurfaceTextureClient_test.cpp
index a4c5b36288..519b40e44a 100644
--- a/libs/gui/tests/SurfaceTextureClient_test.cpp
+++ b/libs/gui/tests/SurfaceTextureClient_test.cpp
@@ -590,7 +590,7 @@ TEST_F(SurfaceTextureClientTest, GetTransformMatrixSucceedsAfterFreeingBuffersWi
// This test verifies that the buffer format can be queried immediately after
// it is set.
-TEST_F(SurfaceTextureClientTest, DISABLED_QueryFormatAfterSettingWorks) {
+TEST_F(SurfaceTextureClientTest, QueryFormatAfterSettingWorks) {
sp<ANativeWindow> anw(mSTC);
int fmts[] = {
// RGBA_8888 should not come first, as it's the default