diff options
| author | 2024-12-06 01:59:08 +0000 | |
|---|---|---|
| committer | 2024-12-06 03:38:08 +0000 | |
| commit | c38ae9a61b5c2c0cd38d075b4d2e4b2d1fc7cd4c (patch) | |
| tree | b5433390d8e63185cf8b73632a7bc742f72e79ac | |
| parent | a618626771934e0dc2be19a7b034b7f83ae97ff2 (diff) | |
Fix NPE in AbsListView's ScrollFeedbackProvider usage
Bug: 382575858
Flag: android.view.flags.enable_scroll_feedback_for_touch
Test: atest CtsWidgetTestCases
Change-Id: I58c4f37d686ab08fbe6f9d8d6194d2d24ac22020
| -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(), |