diff options
| author | Chih-Hung Hsieh <chh@google.com> | 2016-04-28 12:08:15 -0700 |
|---|---|---|
| committer | Chih-Hung Hsieh <chh@google.com> | 2016-04-28 12:08:15 -0700 |
| commit | 85e0c89ba55188ecc484538efbfdb570606fc1a2 (patch) | |
| tree | 9e5d618c4446b2e4933b2035b77c8fb846062f93 /libs/hwui/AnimatorManager.cpp | |
| parent | 237790ec48e83d1623ce44dd968e15059121df56 (diff) | |
| parent | 1599b981fae5e606713e6c9a1698a7e36ef5ae09 (diff) | |
resolve merge conflicts of 1599b981 to nyc-dev-plus-aosp
Change-Id: I90807581e10b6a0024515ff634ac8b29eaa5fc9f
Diffstat (limited to 'libs/hwui/AnimatorManager.cpp')
| -rw-r--r-- | libs/hwui/AnimatorManager.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libs/hwui/AnimatorManager.cpp b/libs/hwui/AnimatorManager.cpp index f170e9cda8af..9d5860ca0d1a 100644 --- a/libs/hwui/AnimatorManager.cpp +++ b/libs/hwui/AnimatorManager.cpp @@ -168,7 +168,7 @@ void AnimatorManager::endAllStagingAnimators() { class EndActiveAnimatorsFunctor { public: - EndActiveAnimatorsFunctor(AnimationContext& context) : mContext(context) {} + explicit EndActiveAnimatorsFunctor(AnimationContext& context) : mContext(context) {} void operator() (sp<BaseRenderNodeAnimator>& animator) { animator->forceEndNow(mContext); |