diff options
author | Alex Buynytskyy <alexbuy@google.com> | 2023-04-21 15:55:58 +0000 |
---|---|---|
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2023-04-21 15:55:58 +0000 |
commit | 94da3dcf4e6211d964c71aef7ef75ea270151ec8 (patch) | |
tree | 56afe3b956ec7be618ed7d3c57da5148817d0fe4 | |
parent | 104089134b528ba94b6315b2a6d95268ddf553de (diff) | |
parent | 3e92647982fea37df37aa55579d3d0e9f9c8a7aa (diff) | |
download | Calendar-94da3dcf4e6211d964c71aef7ef75ea270151ec8.tar.gz |
Build fix. am: 3e92647982android-14.0.0_r45android-14.0.0_r44android-14.0.0_r43android-14.0.0_r42android-14.0.0_r41android-14.0.0_r40android-14.0.0_r39android-14.0.0_r38android14-d2-s5-releaseandroid14-d2-s4-releaseandroid14-d2-s3-releaseandroid14-d2-s2-releaseandroid14-d2-s1-releaseandroid14-d2-release
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Calendar/+/22780457
Change-Id: Icea5b152a0f066a4e2141c99e80da3e1d772ade4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
-rw-r--r-- | src/com/android/calendar/AllInOneActivity.kt | 2 | ||||
-rw-r--r-- | src/com/android/calendar/GeneralPreferences.kt | 2 | ||||
-rw-r--r-- | src/com/android/calendar/alerts/AlertUtils.kt | 4 |
3 files changed, 4 insertions, 4 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/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!!) } } } |