Snap for 10929834 from 1b5c4779fb69c14aa95c4e887e9e4f3b9f65a3db to sdk-release

Change-Id: I9ee273bd900d803b6fafe71a6bd4fe53cfeef123

4 files changed, 10 insertions, 10 deletions

diff --git a/src/com/android/calendar/AllInOneActivity.kt b/src/com/android/calendar/AllInOneActivity.kt
index b3b45fc1..d6767f04 100644
--- a/src/com/android/calendar/AllInOneActivity.kt
+++ b/src/com/android/calendar/AllInOneActivity.kt
@@ -683,7 +683,7 @@ class AllInOneActivity : Activity(), EventHandler, OnSharedPreferenceChangeListe
     }
 
     @Override
-    override fun onSharedPreferenceChanged(prefs: SharedPreferences?, key: String) {
+    override fun onSharedPreferenceChanged(prefs: SharedPreferences, key: String?) {
         if (key.equals(GeneralPreferences.KEY_WEEK_START_DAY)) {
             if (mPaused) {
                 mUpdateOnResume = true
diff --git a/src/com/android/calendar/DayView.kt b/src/com/android/calendar/DayView.kt
index 84ad5833..d5f4f483 100644
--- a/src/com/android/calendar/DayView.kt
+++ b/src/com/android/calendar/DayView.kt
@@ -2796,7 +2796,7 @@ class DayView(
         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 @@ class DayView(
         }
     }
 
-    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 @@ class DayView(
             // 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 @@ class DayView(
 
         @Override
         override fun onScroll(
-            e1: MotionEvent,
+            e1: MotionEvent?,
             e2: MotionEvent,
             distanceX: Float,
             distanceY: Float
@@ -3550,7 +3550,7 @@ class DayView(
 
         @Override
         override fun onFling(
-            e1: MotionEvent,
+            e1: MotionEvent?,
             e2: MotionEvent,
             velocityX: Float,
             velocityY: Float
@@ -3987,4 +3987,4 @@ class DayView(
         OVERFLING_DISTANCE = vc.getScaledOverflingDistance()
         init(context as Context)
     }
-}
\ No newline at end of file
+}
diff --git a/src/com/android/calendar/GeneralPreferences.kt b/src/com/android/calendar/GeneralPreferences.kt
index 9406eff6..4044ef1b 100644
--- a/src/com/android/calendar/GeneralPreferences.kt
+++ b/src/com/android/calendar/GeneralPreferences.kt
@@ -172,7 +172,7 @@ class GeneralPreferences : PreferenceFragment(), OnSharedPreferenceChangeListene
     }
 
     @Override
-    override fun onSharedPreferenceChanged(sharedPreferences: SharedPreferences?, key: String) {
+    override fun onSharedPreferenceChanged(sharedPreferences: SharedPreferences, key: String?) {
         val a: Activity = getActivity()
         if (key.equals(KEY_ALERTS)) {
             updateChildPreferences()
diff --git a/src/com/android/calendar/alerts/AlertUtils.kt b/src/com/android/calendar/alerts/AlertUtils.kt
index 18b7e7d1..21b2be04 100644
--- a/src/com/android/calendar/alerts/AlertUtils.kt
+++ b/src/com/android/calendar/alerts/AlertUtils.kt
@@ -53,9 +53,9 @@ object AlertUtils {
         return object : AlarmManagerInterface {
             override operator fun set(type: Int, triggerAtMillis: Long, operation: PendingIntent?) {
                 if (com.android.calendar.Utils.isKeyLimePieOrLater()) {
-                    mgr.setExact(type, triggerAtMillis, operation)
+                    mgr.setExact(type, triggerAtMillis, operation!!)
                 } else {
-                    mgr.set(type, triggerAtMillis, operation)
+                    mgr.set(type, triggerAtMillis, operation!!)
                 }
             }
         }