summaryrefslogtreecommitdiff
path: root/libs/hwui/AnimationContext.cpp
diff options
context:
space:
mode:
author TreeHugger Robot <treehugger-gerrit@google.com> 2016-06-18 02:00:59 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 2016-06-18 02:01:00 +0000
commitfc275d244e5827641b45f444557bec202ac5560a (patch)
tree06e5dfa4f12b74a6bdf6188cfcaf0a2a1c8b3cdb /libs/hwui/AnimationContext.cpp
parentf4ddb7ce3032d81134b2e655d1efc5d1db933274 (diff)
parent501ff9acfe9dd656c1fb6d82ec0533c3244fd88b (diff)
Merge "Avoid re-calculating vsync mid-frame" into nyc-dev
Diffstat (limited to 'libs/hwui/AnimationContext.cpp')
-rw-r--r--libs/hwui/AnimationContext.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/libs/hwui/AnimationContext.cpp b/libs/hwui/AnimationContext.cpp
index 097be08faaad..5759ccd85464 100644
--- a/libs/hwui/AnimationContext.cpp
+++ b/libs/hwui/AnimationContext.cpp
@@ -63,7 +63,7 @@ void AnimationContext::startFrame(TreeInfo::TraversalMode mode) {
mCurrentFrameAnimations.mNextHandle = head;
head->mPreviousHandle = &mCurrentFrameAnimations;
}
- mFrameTimeMs = mClock.computeFrameTimeMs();
+ mFrameTimeMs = ns2ms(mClock.latestVsync());
}
void AnimationContext::runRemainingAnimations(TreeInfo& info) {