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/RenderThread.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/RenderThread.cpp')
| -rw-r--r-- | libs/hwui/renderthread/RenderThread.cpp | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/libs/hwui/renderthread/RenderThread.cpp b/libs/hwui/renderthread/RenderThread.cpp index f887103e28ae..38cb4cde6bc2 100644 --- a/libs/hwui/renderthread/RenderThread.cpp +++ b/libs/hwui/renderthread/RenderThread.cpp @@ -314,9 +314,11 @@ void RenderThread::postFrameCallback(IFrameCallback* callback) { mPendingRegistrationFrameCallbacks.insert(callback); } -void RenderThread::removeFrameCallback(IFrameCallback* callback) { - mFrameCallbacks.erase(callback); - mPendingRegistrationFrameCallbacks.erase(callback); +bool RenderThread::removeFrameCallback(IFrameCallback* callback) { + size_t erased; + erased = mFrameCallbacks.erase(callback); + erased |= mPendingRegistrationFrameCallbacks.erase(callback); + return erased; } void RenderThread::pushBackFrameCallback(IFrameCallback* callback) { |