summaryrefslogtreecommitdiff
path: root/libs
diff options
context:
space:
mode:
authorDoris Liu <tianliu@google.com>2016-08-02 18:08:04 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2016-08-02 18:08:05 +0000
commit0cf4d47a4094a43984a5215ab1a283b0fdcf87a8 (patch)
treee71bf27bc7805f7f3965b295772d447e8c0cbb89 /libs
parent0d8f164cdea03c8b114d6627c821fbcbae0ec298 (diff)
parentc82e879e563ad692cabf19f61a08559c6220171e (diff)
downloadandroid-frameworks-base-0cf4d47a4094a43984a5215ab1a283b0fdcf87a8.tar.gz
android-frameworks-base-0cf4d47a4094a43984a5215ab1a283b0fdcf87a8.tar.xz
Merge "Put VD animators on paused list when RT stops drawing" into nyc-mr1-dev
Diffstat (limited to 'libs')
-rw-r--r--libs/hwui/AnimationContext.h2
-rw-r--r--libs/hwui/renderthread/CanvasContext.cpp2
2 files changed, 2 insertions, 2 deletions
diff --git a/libs/hwui/AnimationContext.h b/libs/hwui/AnimationContext.h
index 801fd87..11d305c 100644
--- a/libs/hwui/AnimationContext.h
+++ b/libs/hwui/AnimationContext.h
@@ -100,7 +100,7 @@ public:
ANDROID_API virtual void destroy();
- ANDROID_API virtual void detachAnimators() {}
+ ANDROID_API virtual void pauseAnimators() {}
private:
friend class AnimationHandle;
diff --git a/libs/hwui/renderthread/CanvasContext.cpp b/libs/hwui/renderthread/CanvasContext.cpp
index c6b258b..dafe1d1 100644
--- a/libs/hwui/renderthread/CanvasContext.cpp
+++ b/libs/hwui/renderthread/CanvasContext.cpp
@@ -326,7 +326,7 @@ void CanvasContext::prepareTree(TreeInfo& info, int64_t* uiFrameInfo,
void CanvasContext::stopDrawing() {
mRenderThread.removeFrameCallback(this);
- mAnimationContext->detachAnimators();
+ mAnimationContext->pauseAnimators();
}
void CanvasContext::notifyFramePending() {