summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlex Cruz <alex@dirtyunicorns.com>2018-11-15 22:21:11 -0600
committeralk3pInjection <webmaster@raspii.tech>2022-01-27 18:50:18 +0800
commit0330785837e09b94c25d5ffdf6003b3c699833cd (patch)
tree20487388fc1c6c3dd8051737ef076d068fa0895f
parente01cdff09d8df32a42ee76a4c29ec06d5ada8284 (diff)
Fix NPE with void android.view.VelocityTracker.clear()
06-21 14:39:46.546 30816 30816 E AndroidRuntime: FATAL EXCEPTION: main 06-21 14:39:46.546 30816 30816 E AndroidRuntime: Process: com.android.settings, PID: 30816 06-21 14:39:46.546 30816 30816 E AndroidRuntime: java.lang.NullPointerException: Attempt to invoke virtual method 'void android.view.VelocityTracker.clear()' on a null object reference Change-Id: I415fc2e85bcdbe694f1d3a1bd76d1462fc8db78b
-rw-r--r--core/java/android/widget/ScrollView.java4
1 files changed, 3 insertions, 1 deletions
diff --git a/core/java/android/widget/ScrollView.java b/core/java/android/widget/ScrollView.java
index 693b13bbf224..9a0afa96b26f 100644
--- a/core/java/android/widget/ScrollView.java
+++ b/core/java/android/widget/ScrollView.java
@@ -827,7 +827,9 @@ public class ScrollView extends FrameLayout {
if (overScrollBy(0, deltaY, 0, mScrollY, 0, range, 0, mOverscrollDistance, true)
&& !hasNestedScrollingParent()) {
// Break our velocity if we hit a scroll barrier.
- mVelocityTracker.clear();
+ if (mVelocityTracker != null) {
+ mVelocityTracker.clear();
+ }
}
final int scrolledDeltaY = mScrollY - oldY;