Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 8244e943 authored by Treehugger Robot's avatar Treehugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Fix NPE in AbsListView's ScrollFeedbackProvider usage" into main

parents 7bc6fd64 c38ae9a6

core/java/android/widget/AbsListView.java

+2 −2
Original line number Diff line number Diff line
@@ -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(),