diff options
| author | Jamie Gennis <jgennis@google.com> | 2011-03-15 10:33:35 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2011-03-15 10:33:35 -0700 |
| commit | 02805a40d44fa038549e771ec9a15f52b5fa3538 (patch) | |
| tree | f50a270f52f81eda55363aa2df5f1311209347a9 /libs/surfaceflinger_client/Surface.cpp | |
| parent | e65711b21f1b351f28d4f04819e1e05a9ac8dfee (diff) | |
| parent | c4ca7c511499693f13622b135637f600ec913e57 (diff) | |
| download | frameworks_base-02805a40d44fa038549e771ec9a15f52b5fa3538.zip frameworks_base-02805a40d44fa038549e771ec9a15f52b5fa3538.tar.gz frameworks_base-02805a40d44fa038549e771ec9a15f52b5fa3538.tar.bz2 | |
Merge "ANativeWindow: add query for the concrete type." into honeycomb-mr1
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; } |