summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlex Buynytskyy <alexbuy@google.com>2023-04-21 04:18:09 +0000
committerAlex Buynytskyy <alexbuy@google.com>2023-04-21 04:22:46 +0000
commit3e92647982fea37df37aa55579d3d0e9f9c8a7aa (patch)
tree56afe3b956ec7be618ed7d3c57da5148817d0fe4
parent104089134b528ba94b6315b2a6d95268ddf553de (diff)
downloadCalendar-android14-dev.tar.gz
Build fix.android14-dev
packages/apps/Calendar/src/com/android/calendar/AllInOneActivity.kt:72:1: error: class 'AllInOneActivity' is not abstract and does not implement abstract member public abstract fun onSharedPreferenceChanged(sharedPreferences: SharedPreferences!, key: String?): Unit defined in android.content.SharedPreferences.OnSharedPreferenceChangeListener class AllInOneActivity : Activity(), EventHandler, OnSharedPreferenceChangeListener, ^ packages/apps/Calendar/src/com/android/calendar/AllInOneActivity.kt:686:5: error: 'onSharedPreferenceChanged' overrides nothing override fun onSharedPreferenceChanged(prefs: SharedPreferences?, key: String) { ^ packages/apps/Calendar/src/com/android/calendar/GeneralPreferences.kt:49:1: error: class 'GeneralPreferences' is not abstract and does not implement abstract member public abstract fun onSharedPreferenceChanged(sharedPreferences: SharedPreferences!, key: String?): Unit defined in android.content.SharedPreferences.OnSharedPreferenceChangeListener class GeneralPreferences : PreferenceFragment(), OnSharedPreferenceChangeListener, ^ packages/apps/Calendar/src/com/android/calendar/GeneralPreferences.kt:175:5: error: 'onSharedPreferenceChanged' overrides nothing override fun onSharedPreferenceChanged(sharedPreferences: SharedPreferences?, key: String) { ^ packages/apps/Calendar/src/com/android/calendar/alerts/AlertUtils.kt:56:57: error: type mismatch: inferred type is PendingIntent? but PendingIntent was expected mgr.setExact(type, triggerAtMillis, operation) ^ packages/apps/Calendar/src/com/android/calendar/alerts/AlertUtils.kt:58:52: error: type mismatch: inferred type is PendingIntent? but PendingIntent was expected mgr.set(type, triggerAtMillis, operation) ^ https://android-build.googleplex.com/builds/pending/P54933224/cf_x86_64_phone-userdebug/latest/view/logs/build_error.log Bug: 275409981 Test: local finalization topic + m Change-Id: Idec17650fd6063495375d6a26b720286ef02ec96
-rw-r--r--src/com/android/calendar/AllInOneActivity.kt2
-rw-r--r--src/com/android/calendar/GeneralPreferences.kt2
-rw-r--r--src/com/android/calendar/alerts/AlertUtils.kt4
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!!)
}
}
}