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 | 34e1fb1ee229a7e033dcd42f4efd194e1614d5ce (patch) | |
| tree | 18830cc0a5bd1dbfdf47f9fc95179d9a14f27703 /libs/gui/SurfaceTextureClient.cpp | |
| parent | d20482de2f8fb0045c69c7065221923a72d13303 (diff) | |
| parent | 982d2da4eef0a48d84d88e3e1d2d1dbdbb413a27 (diff) | |
| download | frameworks_base-34e1fb1ee229a7e033dcd42f4efd194e1614d5ce.zip frameworks_base-34e1fb1ee229a7e033dcd42f4efd194e1614d5ce.tar.gz frameworks_base-34e1fb1ee229a7e033dcd42f4efd194e1614d5ce.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; |