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

Commit c38ae9a6 authored by Yeabkal Wubshit's avatar Yeabkal Wubshit
Browse files

Fix NPE in AbsListView's ScrollFeedbackProvider usage 

Bug: 382575858
Flag: android.view.flags.enable_scroll_feedback_for_touch
Test: atest CtsWidgetTestCases
Change-Id: I58c4f37d686ab08fbe6f9d8d6194d2d24ac22020
parent a6186267

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(),