Build fix.
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
diff --git a/src/com/android/calendar/AllInOneActivity.kt b/src/com/android/calendar/AllInOneActivity.kt
index b3b45fc..d6767f0 100644
--- a/src/com/android/calendar/AllInOneActivity.kt
+++ b/src/com/android/calendar/AllInOneActivity.kt
@@ -683,7 +683,7 @@
}
@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 9406eff..4044ef1 100644
--- a/src/com/android/calendar/GeneralPreferences.kt
+++ b/src/com/android/calendar/GeneralPreferences.kt
@@ -172,7 +172,7 @@
}
@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 18b7e7d..21b2be0 100644
--- a/src/com/android/calendar/alerts/AlertUtils.kt
+++ b/src/com/android/calendar/alerts/AlertUtils.kt
@@ -53,9 +53,9 @@
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!!)
}
}
}