diff options
| author | Mathias Agopian <mathias@google.com> | 2011-07-29 17:55:48 -0700 |
|---|---|---|
| committer | Mathias Agopian <mathias@google.com> | 2011-08-01 14:06:20 -0700 |
| commit | 982d2da4eef0a48d84d88e3e1d2d1dbdbb413a27 (patch) | |
| tree | 2a5036e97e04b0467eab8f73a283f0a0730c0d61 /libs | |
| parent | 03116780a17cb6db7c926d01630cb9f68a19539b (diff) | |
| download | frameworks_base-982d2da4eef0a48d84d88e3e1d2d1dbdbb413a27.zip frameworks_base-982d2da4eef0a48d84d88e3e1d2d1dbdbb413a27.tar.gz frameworks_base-982d2da4eef0a48d84d88e3e1d2d1dbdbb413a27.tar.bz2 | |
connect/disconnect is now called from our EGL wrapper
the original connect/disconnect hooks are deprecated
and replace by api_connect/api_disconnect. the original
hooks are no no-ops.
api_connect/api_disconnect is now only called from the
android framework.
Bug: 5057915
Change-Id: I8ca64cd1acd6cabf915bf54689ec2e5f6dfa495a
Diffstat (limited to 'libs')
| -rw-r--r-- | libs/gui/SurfaceTextureClient.cpp | 10 | ||||
| -rw-r--r-- | libs/ui/FramebufferNativeWindow.cpp | 2 |
2 files changed, 10 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; diff --git a/libs/ui/FramebufferNativeWindow.cpp b/libs/ui/FramebufferNativeWindow.cpp index 0e8ae61..8949730 100644 --- a/libs/ui/FramebufferNativeWindow.cpp +++ b/libs/ui/FramebufferNativeWindow.cpp @@ -317,6 +317,8 @@ int FramebufferNativeWindow::perform(ANativeWindow* window, case NATIVE_WINDOW_SET_BUFFERS_DIMENSIONS: case NATIVE_WINDOW_SET_BUFFERS_FORMAT: case NATIVE_WINDOW_SET_BUFFERS_TRANSFORM: + case NATIVE_WINDOW_API_CONNECT: + case NATIVE_WINDOW_API_DISCONNECT: // TODO: we should implement these return NO_ERROR; |