diff options
| author | Jamie Gennis <jgennis@google.com> | 2011-03-15 10:36:01 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2011-03-15 10:36:01 -0700 |
| commit | ceb7cb1460484eda1a3cb9cd271d7caf3a3dcbd1 (patch) | |
| tree | 244a1d7aa59404ea42890bd80169f158386d32c8 /libs/gui/SurfaceTextureClient.cpp | |
| parent | 6d4f318f0c836c0c2eac3a1d99debedc6c03578a (diff) | |
| parent | 02805a40d44fa038549e771ec9a15f52b5fa3538 (diff) | |
| download | frameworks_base-ceb7cb1460484eda1a3cb9cd271d7caf3a3dcbd1.zip frameworks_base-ceb7cb1460484eda1a3cb9cd271d7caf3a3dcbd1.tar.gz frameworks_base-ceb7cb1460484eda1a3cb9cd271d7caf3a3dcbd1.tar.bz2 | |
am 02805a40: Merge "ANativeWindow: add query for the concrete type." into honeycomb-mr1
* commit '02805a40d44fa038549e771ec9a15f52b5fa3538':
ANativeWindow: add query for the concrete type.
Diffstat (limited to 'libs/gui/SurfaceTextureClient.cpp')
| -rw-r--r-- | libs/gui/SurfaceTextureClient.cpp | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/libs/gui/SurfaceTextureClient.cpp b/libs/gui/SurfaceTextureClient.cpp index a40fac9..111141f 100644 --- a/libs/gui/SurfaceTextureClient.cpp +++ b/libs/gui/SurfaceTextureClient.cpp @@ -160,6 +160,9 @@ int SurfaceTextureClient::query(int what, int* value) { // SurfaceTextureClient currently never queues frames to SurfaceFlinger. *value = 0; return NO_ERROR; + case NATIVE_WINDOW_CONCRETE_TYPE: + *value = NATIVE_WINDOW_SURFACE_TEXTURE_CLIENT; + return NO_ERROR; } return BAD_VALUE; } |