summaryrefslogtreecommitdiffstats
path: root/libs
diff options
context:
space:
mode:
authorJamie Gennis <jgennis@google.com>2011-06-17 10:45:15 -0700
committerAndroid (Google) Code Review <android-gerrit@google.com>2011-06-17 10:45:15 -0700
commit54ed6107903d596cd3d1610f0cb5c0b041c02573 (patch)
treeab7030760d228b51a792b1e3f87105a6d31d6315 /libs
parentce14a04b2c9269261e841b962b4ff2d71b1610c3 (diff)
parent537cf4a6a375f25e4ed0fef286965c864878f6c2 (diff)
downloadframeworks_base-54ed6107903d596cd3d1610f0cb5c0b041c02573.zip
frameworks_base-54ed6107903d596cd3d1610f0cb5c0b041c02573.tar.gz
frameworks_base-54ed6107903d596cd3d1610f0cb5c0b041c02573.tar.bz2
Merge "SurfaceTexture: enable a test that now passes."
Diffstat (limited to 'libs')
-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 a4c5b36..519b40e 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