[automerger skipped] Fix for warning: unnecessary non-null assertion (!!) on a non-null receiver am: 65825315bf -s ours am: 66d2a697bb -s ours

am skip reason: Merged-In I455b76d79ee1518bb89721099430a0e3e5903faf with SHA-1 505d6d4d32 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Calendar/+/20141994

Change-Id: Iab16c9ceadd963e68ec4968bc3440b7b56c80a5b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

src/com/android/calendar/DayView.kt

diff --git a/src/com/android/calendar/DayView.kt b/src/com/android/calendar/DayView.kt
index 84ad583..d5f4f48 100644
--- a/src/com/android/calendar/DayView.kt
+++ b/src/com/android/calendar/DayView.kt
@@ -2796,7 +2796,7 @@
         performLongClick()
     }
 
-    private fun doScroll(e1: MotionEvent, e2: MotionEvent, deltaX: Float, deltaY: Float) {
+    private fun doScroll(e1: MotionEvent?, e2: MotionEvent, deltaX: Float, deltaY: Float) {
         cancelAnimation()
         if (mStartingScroll) {
             mInitialScrollX = 0f
@@ -2909,7 +2909,7 @@
         }
     }
 
-    private fun doFling(e1: MotionEvent, e2: MotionEvent, velocityX: Float, velocityY: Float) {
+    private fun doFling(e1: MotionEvent?, e2: MotionEvent, velocityX: Float, velocityY: Float) {
         cancelAnimation()
         mSelectionMode = SELECTION_HIDDEN
         eventClickCleanup()
@@ -2919,7 +2919,7 @@
             // initNextView(deltaX);
             mTouchMode = TOUCH_MODE_INITIAL_STATE
             if (DEBUG) Log.d(TAG, "doFling: velocityX $velocityX")
-            val deltaX = e2.getX().toInt() - e1.getX().toInt()
+            val deltaX = e2.getX().toInt() - e1!!.getX().toInt()
             switchViews(deltaX < 0, mViewStartX.toFloat(), mViewWidth.toFloat(), velocityX)
             mViewStartX = 0
             return
@@ -3526,7 +3526,7 @@
 
         @Override
         override fun onScroll(
-            e1: MotionEvent,
+            e1: MotionEvent?,
             e2: MotionEvent,
             distanceX: Float,
             distanceY: Float
@@ -3550,7 +3550,7 @@
 
         @Override
         override fun onFling(
-            e1: MotionEvent,
+            e1: MotionEvent?,
             e2: MotionEvent,
             velocityX: Float,
             velocityY: Float
@@ -3987,4 +3987,4 @@
         OVERFLING_DISTANCE = vc.getScaledOverflingDistance()
         init(context as Context)
     }
-}
\ No newline at end of file
+}