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/surfaceflinger_client/Surface.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/surfaceflinger_client/Surface.cpp')
| -rw-r--r-- | libs/surfaceflinger_client/Surface.cpp | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/libs/surfaceflinger_client/Surface.cpp b/libs/surfaceflinger_client/Surface.cpp index afabbf4..21d509a 100644 --- a/libs/surfaceflinger_client/Surface.cpp +++ b/libs/surfaceflinger_client/Surface.cpp @@ -712,11 +712,15 @@ int Surface::query(int what, int* value) case NATIVE_WINDOW_MIN_UNDEQUEUED_BUFFERS: *value = MIN_UNDEQUEUED_BUFFERS; return NO_ERROR; - case NATIVE_WINDOW_QUEUES_TO_WINDOW_COMPOSER: + case NATIVE_WINDOW_QUEUES_TO_WINDOW_COMPOSER: { sp<ISurfaceComposer> sf(ComposerService::getComposerService()); *value = sf->authenticateSurface(mSurface) ? 1 : 0; return NO_ERROR; } + case NATIVE_WINDOW_CONCRETE_TYPE: + *value = NATIVE_WINDOW_SURFACE; + return NO_ERROR; + } return BAD_VALUE; } |