diff options
| author | 2024-12-06 19:02:01 +0000 | |
|---|---|---|
| committer | 2024-12-06 19:02:01 +0000 | |
| commit | 8244e943941c687b64eac706bda36435500e4fd5 (patch) | |
| tree | 69a3de1bf45a5e1c1d3766d3dbe441294dee96f1 | |
| parent | 7bc6fd6458bc97db62689d3c204bbaf7a16a8941 (diff) | |
| parent | c38ae9a61b5c2c0cd38d075b4d2e4b2d1fc7cd4c (diff) | |
Merge "Fix NPE in AbsListView's ScrollFeedbackProvider usage" into main
| -rw-r--r-- | core/java/android/widget/AbsListView.java | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/core/java/android/widget/AbsListView.java b/core/java/android/widget/AbsListView.java index 0721fd379e9b..fc3014a0eaec 100644 --- a/core/java/android/widget/AbsListView.java +++ b/core/java/android/widget/AbsListView.java @@ -3737,7 +3737,7 @@ public abstract class AbsListView extends AdapterView<ListAdapter> implements Te atEdge = trackMotionScroll(deltaY, incrementalDeltaY); // TODO: b/360198915 - Add unit testing for using ScrollFeedbackProvider - if (enableScrollFeedbackForTouch()) { + if (vtev != null && enableScrollFeedbackForTouch()) { initHapticScrollFeedbackProviderIfNotExists(); mHapticScrollFeedbackProvider.onScrollProgress( vtev.getDeviceId(), vtev.getSource(), MotionEvent.AXIS_Y, @@ -3779,7 +3779,7 @@ public abstract class AbsListView extends AdapterView<ListAdapter> implements Te mTouchMode = TOUCH_MODE_OVERSCROLL; } - if (enableScrollFeedbackForTouch()) { + if (vtev != null && enableScrollFeedbackForTouch()) { initHapticScrollFeedbackProviderIfNotExists(); mHapticScrollFeedbackProvider.onScrollLimit( vtev.getDeviceId(), vtev.getSource(), |