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

Commit 6727245a authored by Dave Mankoff's avatar Dave Mankoff Committed by Android (Google) Code Review
Browse files

Merge "Prevent NPE in PulseExpansionHandler" into rvc-dev

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

    override fun onInterceptTouchEvent(event: MotionEvent): Boolean {
        return maybeStartExpansion(event)
        return canHandleMotionEvent() && startExpansion(event)
    }

    private fun maybeStartExpansion(event: MotionEvent): Boolean {
        if (!wakeUpCoordinator.canShowPulsingHuns || qsExpanded ||
                bouncerShowing) {
            return false
    private fun canHandleMotionEvent(): Boolean {
        return !wakeUpCoordinator.canShowPulsingHuns || qsExpanded || bouncerShowing
    }

    private fun startExpansion(event: MotionEvent): Boolean {
        if (velocityTracker == null) {
            velocityTracker = VelocityTracker.obtain()
        }
@@ -177,9 +177,14 @@ constructor(
    }

    override fun onTouchEvent(event: MotionEvent): Boolean {
        if (!isExpanding) {
            return maybeStartExpansion(event)
        if (!canHandleMotionEvent()) {
            return false
        }

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

        velocityTracker!!.addMovement(event)
        val y = event.y