diff options
| author | John Reck <jreck@google.com> | 2014-12-04 15:15:27 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-12-04 15:15:27 +0000 |
| commit | a51a0901ada5e2bc472c379a39df13ff48e666ed (patch) | |
| tree | dc6ae4f58ff8da681648597c47e5f44205860608 /libs/hwui/renderthread/RenderProxy.cpp | |
| parent | 4eb896ef011a8ecfe32f3b4300a42e0cc8b162a8 (diff) | |
| parent | bd15e4f59c0ac4386ad11ba1555e41cb32d3a52c (diff) | |
am bd15e4f5: Merge "Resume RT-animations after a pauseSurface" into lmp-mr1-dev
* commit 'bd15e4f59c0ac4386ad11ba1555e41cb32d3a52c':
Resume RT-animations after a pauseSurface
Diffstat (limited to 'libs/hwui/renderthread/RenderProxy.cpp')
| -rw-r--r-- | libs/hwui/renderthread/RenderProxy.cpp | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/libs/hwui/renderthread/RenderProxy.cpp b/libs/hwui/renderthread/RenderProxy.cpp index 5d55ea62af1f..6d063a4b0ce0 100644 --- a/libs/hwui/renderthread/RenderProxy.cpp +++ b/libs/hwui/renderthread/RenderProxy.cpp @@ -156,15 +156,14 @@ void RenderProxy::updateSurface(const sp<ANativeWindow>& window) { } CREATE_BRIDGE2(pauseSurface, CanvasContext* context, ANativeWindow* window) { - args->context->pauseSurface(args->window); - return NULL; + return (void*) args->context->pauseSurface(args->window); } -void RenderProxy::pauseSurface(const sp<ANativeWindow>& window) { +bool RenderProxy::pauseSurface(const sp<ANativeWindow>& window) { SETUP_TASK(pauseSurface); args->context = mContext; args->window = window.get(); - postAndWait(task); + return (bool) postAndWait(task); } CREATE_BRIDGE7(setup, CanvasContext* context, int width, int height, |