Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Remove workaround for end() not supported in some app" into oc-dev

Browse Source
This commit is contained in:
TreeHugger Robot
2017-04-03 21:41:12 +00:00
committed by Android (Google) Code Review
parent c0c524af4f ae570c04c0
commit 33f893202d
1 changed files with 4 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
core/java/android/animation/AnimatorSet.java
View File

@@ -431,12 +431,10 @@ public final class AnimatorSet extends Animator implements AnimationHandler.Anim
// Force all the animations to end when the duration scale is 0. // Force all the animations to end when the duration scale is 0.
private void forceToEnd() { private void forceToEnd() {
// TODO: Below is commented out to temp work around b/36241584, uncomment this when it's if (mEndCanBeCalled) {
// fixed. end();
// if (mEndCanBeCalled) { return;
// end(); }
// return;
// }
// Note: we don't want to combine this case with the end() method below because in // Note: we don't want to combine this case with the end() method below because in
// the case of developer calling end(), we still need to make sure end() is explicitly // the case of developer calling end(), we still need to make sure end() is explicitly