diff options
| author | 2014-11-21 14:19:06 -0800 | |
|---|---|---|
| committer | 2014-11-21 14:19:06 -0800 | |
| commit | 2ab8298dc37851aab4623ba3f98d71055d653a73 (patch) | |
| tree | e31d76f1c16ec8e980983392b09287515bcec2f1 /libs/hwui/AnimationContext.cpp | |
| parent | 4c9041cf837cda13c749b148661d18c3fab0fbd6 (diff) | |
| parent | 99377df12ee696e01cd9071132f122801a9862ce (diff) | |
resolved conflicts for merge of 99377df1 to lmp-mr1-dev-plus-aosp
Change-Id: I3a98f55832ac447b1ed0dd129c7a93d088025943
Diffstat (limited to 'libs/hwui/AnimationContext.cpp')
| -rw-r--r-- | libs/hwui/AnimationContext.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libs/hwui/AnimationContext.cpp b/libs/hwui/AnimationContext.cpp index a20bdae31f79..d2152ca5b852 100644 --- a/libs/hwui/AnimationContext.cpp +++ b/libs/hwui/AnimationContext.cpp @@ -54,7 +54,7 @@ void AnimationContext::addAnimationHandle(AnimationHandle* handle) { handle->insertAfter(&mNextFrameAnimations); } -void AnimationContext::startFrame(TreeInfo::TraversalMode mode) { +void AnimationContext::startFrame(TreeInfo::TraversalMode /* mode */) { LOG_ALWAYS_FATAL_IF(mCurrentFrameAnimations.mNextHandle, "Missed running animations last frame!"); AnimationHandle* head = mNextFrameAnimations.mNextHandle; |