diff options
| author | John Reck <jreck@google.com> | 2014-12-04 00:08:13 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2014-12-04 00:08:16 +0000 |
| commit | bd15e4f59c0ac4386ad11ba1555e41cb32d3a52c (patch) | |
| tree | 627f6aac5b149cc44fa61bc0f39e5222173fba70 /libs/hwui/renderthread/RenderThread.cpp | |
| parent | ba1307b2b42b60893c88622f41f99efa2356350d (diff) | |
| parent | 01a5ea35fbba4c5bb1d7790ae1677a2fa752e042 (diff) | |
Merge "Resume RT-animations after a pauseSurface" into lmp-mr1-dev
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) { |