diff options
| author | John Reck <jreck@google.com> | 2016-08-10 11:04:39 -0700 |
|---|---|---|
| committer | John Reck <jreck@google.com> | 2016-08-10 11:04:39 -0700 |
| commit | 712765ff3448e84f415866f040e0e84a3f553361 (patch) | |
| tree | cb61cc0398f9748e6249a48e20279e64df481d43 /libs/hwui/renderthread/RenderProxy.cpp | |
| parent | f3116cbab923e77085eb0e740bda1347caf9bc0f (diff) | |
| parent | 1d7ee6b5a363eaffb3d478fa4bbd23f5a4a4009c (diff) | |
resolve merge conflicts of 1d7ee6b to master
Change-Id: I2ed0f2c3233151e890bd8bde825d306ec8f0d8fd
Diffstat (limited to 'libs/hwui/renderthread/RenderProxy.cpp')
| -rw-r--r-- | libs/hwui/renderthread/RenderProxy.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libs/hwui/renderthread/RenderProxy.cpp b/libs/hwui/renderthread/RenderProxy.cpp index d6eea877de0c..3edd42372653 100644 --- a/libs/hwui/renderthread/RenderProxy.cpp +++ b/libs/hwui/renderthread/RenderProxy.cpp @@ -157,7 +157,7 @@ void RenderProxy::updateSurface(const sp<Surface>& surface) { SETUP_TASK(updateSurface); args->context = mContext; args->surface = surface.get(); - postAndWait(task); + post(task); } CREATE_BRIDGE2(pauseSurface, CanvasContext* context, Surface* surface) { |