am d8c941ff: Merge "Don\'t update OverScroller fling state if no time has passed since start" into lmp-mr1-dev

automerge: 35261e4

* commit '35261e41b60ff2c0297dedaaff849a7414c9ff76':
  Don't update OverScroller fling state if no time has passed since start
This commit is contained in:
Adam Powell
2014-10-31 23:49:49 +00:00
committed by android-build-merger

View File

@@ -901,6 +901,10 @@ public class OverScroller {
final long time = AnimationUtils.currentAnimationTimeMillis();
final long currentTime = time - mStartTime;
if (currentTime == 0) {
// Skip work but report that we're still going if we have a nonzero duration.
return mDuration > 0;
}
if (currentTime > mDuration) {
return false;
}