diff options
author | Adam Powell <adamp@google.com> | 2014-10-31 13:55:58 -0700 |
---|---|---|
committer | Adam Powell <adamp@google.com> | 2014-10-31 14:03:01 -0700 |
commit | 311506afbba83c11b862c1f95a24dea83fab0aad (patch) | |
tree | a0eed8a093e607a6fd6b78eec53b000c8fb6e866 /core/java/android/widget | |
parent | 685a8770c018d02080d29f18fcb9e50a182912aa (diff) | |
download | frameworks_base-311506afbba83c11b862c1f95a24dea83fab0aad.zip frameworks_base-311506afbba83c11b862c1f95a24dea83fab0aad.tar.gz frameworks_base-311506afbba83c11b862c1f95a24dea83fab0aad.tar.bz2 |
Don't update OverScroller fling state if no time has passed since start
If no time has passed when we try to update fling state, skip the
update computation since there is nothing to do.
Fixes a bug where we could return NaN from
OverScroller#getCurrentVelocity.
Bug 17700698
Change-Id: I65042d4d26a29593f66781b58456c2d1e85381c6
Diffstat (limited to 'core/java/android/widget')
-rw-r--r-- | core/java/android/widget/OverScroller.java | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/core/java/android/widget/OverScroller.java b/core/java/android/widget/OverScroller.java index 7b3dd31..a40d4f8 100644 --- a/core/java/android/widget/OverScroller.java +++ b/core/java/android/widget/OverScroller.java @@ -904,6 +904,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; } |