summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJamie Gennis <jgennis@google.com>2011-07-13 12:57:23 -0700
committerJamie Gennis <jgennis@google.com>2011-07-14 15:03:33 -0700
commita775f0d4193dffc336b295dc06056f81801eba9e (patch)
tree5d07068845e61df1022efed01bc678b774d6e7a8
parentd44e1b6033eed29718f2e7e3540e4884929941a5 (diff)
downloadframeworks_base-a775f0d4193dffc336b295dc06056f81801eba9e.zip
frameworks_base-a775f0d4193dffc336b295dc06056f81801eba9e.tar.gz
frameworks_base-a775f0d4193dffc336b295dc06056f81801eba9e.tar.bz2
SurfaceTexture: add support for new connect values
This change adds support to SurfaceTextureClient for the new enum values that can be passed to the ANativeWindow connect call. Change-Id: I8c15418909e43a15673a9b22a5eb40df6923b273
-rw-r--r--libs/gui/SurfaceTextureClient.cpp6
1 files changed, 6 insertions, 0 deletions
diff --git a/libs/gui/SurfaceTextureClient.cpp b/libs/gui/SurfaceTextureClient.cpp
index b9b2310..dc83412 100644
--- a/libs/gui/SurfaceTextureClient.cpp
+++ b/libs/gui/SurfaceTextureClient.cpp
@@ -309,6 +309,9 @@ int SurfaceTextureClient::connect(int api) {
int err = NO_ERROR;
switch (api) {
case NATIVE_WINDOW_API_EGL:
+ case NATIVE_WINDOW_API_CPU:
+ case NATIVE_WINDOW_API_MEDIA:
+ case NATIVE_WINDOW_API_CAMERA:
if (mConnectedApi) {
err = -EINVAL;
} else {
@@ -328,6 +331,9 @@ int SurfaceTextureClient::disconnect(int api) {
int err = NO_ERROR;
switch (api) {
case NATIVE_WINDOW_API_EGL:
+ case NATIVE_WINDOW_API_CPU:
+ case NATIVE_WINDOW_API_MEDIA:
+ case NATIVE_WINDOW_API_CAMERA:
if (mConnectedApi == api) {
mConnectedApi = 0;
} else {