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

Commit fc1ea085 authored by Dave Mankoff's avatar Dave Mankoff
Browse files

Prevent NPE on ExpandableNotificationRow. 

An NPE could happen, related to falsing, if the very
first gesture to happen is a tap on an ExpandableNotificationRow.

Fixes: 187196123
Test: atest SystemUITests
Change-Id: I8a82fc4d85ba5676a6c198a0b6ddb67009c8ad8e
parent 9693ec26

packages/SystemUI/src/com/android/systemui/classifier/FalsingDataProvider.java

+1 −1
Original line number Diff line number Diff line
@@ -49,7 +49,7 @@ public class FalsingDataProvider { 


    private TimeLimitedMotionEventBuffer mRecentMotionEvents =

            new TimeLimitedMotionEventBuffer(MOTION_EVENT_AGE_MS);

    private List<MotionEvent> mPriorMotionEvents;

    private List<MotionEvent> mPriorMotionEvents = new ArrayList<>();



    private boolean mDirty = true;

packages/SystemUI/tests/src/com/android/systemui/classifier/FalsingDataProviderTest.java

+7 −0
Original line number Diff line number Diff line
@@ -290,4 +290,11 @@ public class FalsingDataProviderTest extends ClassifierTest { 
        mDataProvider.onMotionEvent(appendDownEvent(0, 200));

        verify(listener).onGestureFinalized(100);

    }



    @Test

    public void test_GetPriorEventsEarly() {

        // Ensure that if we ask for prior events before any events were added, we at least get

        // an empty array.

        assertThat(mDataProvider.getPriorMotionEvents()).isNotNull();

    }

}