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

Commit 5121c6b2 authored by Dave Mankoff's avatar Dave Mankoff Committed by Automerger Merge Worker
Browse files

Merge "Prevent NPE on ExpandableNotificationRow." into sc-dev am: 2bbaf1e4 

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14430217

Change-Id: I1123c53eafdb277cfaef38f68bf92449d8c6d2ca
parents bdb646b9 2bbaf1e4

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

    }

}