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

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

Merge "Prevent NPE in PulseExpansionHandler" into rvc-dev am: 6727245a am:...

Merge "Prevent NPE in PulseExpansionHandler" into rvc-dev am: 6727245a am: cb9ffc3d am: d230231b am: f4f86ddc

Change-Id: I58954640036ac9e9f303b7cdd29c42f9a8f480ab
parents 743ec0cb f4f86ddc
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