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

Commit 49b3335e authored by Dave Mankoff's avatar Dave Mankoff
Browse files

Revert "Prevent NPE in PulseExpansionHandler" 

This reverts commit 14f069b8.

Reason for revert: http://b/156204772

Bug: 156204772
Change-Id: Ie47d41d3d6625d3769005bd46b5dfe20171d5d70
parent 14f069b8

packages/SystemUI/src/com/android/systemui/statusbar/PulseExpansionHandler.kt

+8 −13
Original line number Diff line number Diff line
@@ -121,14 +121,14 @@ constructor( 
    }



    override fun onInterceptTouchEvent(event: MotionEvent): Boolean {

        return canHandleMotionEvent() && startExpansion(event)

        return maybeStartExpansion(event)

    }



    private fun canHandleMotionEvent(): Boolean {

        return !wakeUpCoordinator.canShowPulsingHuns || qsExpanded || bouncerShowing

    private fun maybeStartExpansion(event: MotionEvent): Boolean {

        if (!wakeUpCoordinator.canShowPulsingHuns || qsExpanded ||

                bouncerShowing) {

            return false

        }



    private fun startExpansion(event: MotionEvent): Boolean {

        if (velocityTracker == null) {

            velocityTracker = VelocityTracker.obtain()

        }
@@ -177,14 +177,9 @@ constructor( 
    }



    override fun onTouchEvent(event: MotionEvent): Boolean {

        if (!canHandleMotionEvent()) {

            return false

        if (!isExpanding) {

            return maybeStartExpansion(event)

        }



        if (!isExpanding || event.actionMasked == MotionEvent.ACTION_DOWN) {

            return startExpansion(event)

        }



        velocityTracker!!.addMovement(event)

        val y = event.y