diff options
| author | Mathias Agopian <mathias@google.com> | 2011-08-01 16:36:02 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2011-08-01 16:36:02 -0700 |
| commit | d05b34a07940f3d6009b90b3eda067a2d0a35d2c (patch) | |
| tree | e205321a5bd067fde518d37a6b0b32c2e19bec33 /libs/gui/SurfaceTextureClient.cpp | |
| parent | d8501af36354aaf0de9c6c475a78941af8b0e7fc (diff) | |
| parent | 81a63350527cafce6929309533c58586878f10b5 (diff) | |
| download | frameworks_native-d05b34a07940f3d6009b90b3eda067a2d0a35d2c.zip frameworks_native-d05b34a07940f3d6009b90b3eda067a2d0a35d2c.tar.gz frameworks_native-d05b34a07940f3d6009b90b3eda067a2d0a35d2c.tar.bz2 | |
Merge "connect/disconnect is now called from our EGL wrapper"
Diffstat (limited to 'libs/gui/SurfaceTextureClient.cpp')
| -rw-r--r-- | libs/gui/SurfaceTextureClient.cpp | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/libs/gui/SurfaceTextureClient.cpp b/libs/gui/SurfaceTextureClient.cpp index e6837ea..d1037de 100644 --- a/libs/gui/SurfaceTextureClient.cpp +++ b/libs/gui/SurfaceTextureClient.cpp @@ -258,10 +258,10 @@ int SurfaceTextureClient::perform(int operation, va_list args) int res = NO_ERROR; switch (operation) { case NATIVE_WINDOW_CONNECT: - res = dispatchConnect(args); + // deprecated. must return NO_ERROR. break; case NATIVE_WINDOW_DISCONNECT: - res = dispatchDisconnect(args); + // deprecated. must return NO_ERROR. break; case NATIVE_WINDOW_SET_USAGE: res = dispatchSetUsage(args); @@ -296,6 +296,12 @@ int SurfaceTextureClient::perform(int operation, va_list args) case NATIVE_WINDOW_SET_SCALING_MODE: res = dispatchSetScalingMode(args); break; + case NATIVE_WINDOW_API_CONNECT: + res = dispatchConnect(args); + break; + case NATIVE_WINDOW_API_DISCONNECT: + res = dispatchDisconnect(args); + break; default: res = NAME_NOT_FOUND; break; |