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

Commit 3bb0c7b6 authored by Johannes Gallmann's avatar Johannes Gallmann Committed by Android (Google) Code Review
Browse files

Merge "Fix NullPointerException in FlingOnBackAnimationCallback" into main

parents 9d433655 3df09aa5

packages/SystemUI/animation/src/com/android/systemui/animation/back/FlingOnBackAnimationCallback.kt

+11 −9
Original line number Diff line number Diff line
@@ -95,9 +95,10 @@ abstract class FlingOnBackAnimationCallback( 
    final override fun onBackProgressed(backEvent: BackEvent) {

        val interpolatedProgress = progressInterpolator.getInterpolation(backEvent.progress)

        if (predictiveBackTimestampApi()) {

            downTime?.let { downTime ->

                velocityTracker.addMovement(

                    MotionEvent.obtain(

                    /* downTime */ downTime!!,

                        /* downTime */ downTime,

                        /* eventTime */ backEvent.frameTimeMillis,

                        /* action */ ACTION_MOVE,

                        /* x */ interpolatedProgress * SCALE_FACTOR,
@@ -105,6 +106,7 @@ abstract class FlingOnBackAnimationCallback( 
                        /* metaState */ 0,

                    )

                )

            }

            lastBackEvent =

                BackEvent(

                    backEvent.touchX,