Build fix.
packages/apps/DeskClock/src/com/android/deskclock/Utils.kt:319:26: error: type mismatch: inferred type is AlarmManager.AlarmClockInfo? but AlarmManager.AlarmClockInfo was expected
am.setAlarmClock(info, op)
^
packages/apps/DeskClock/src/com/android/deskclock/Utils.kt:319:32: error: type mismatch: inferred type is PendingIntent? but PendingIntent was expected
am.setAlarmClock(info, op)
^
packages/apps/DeskClock/src/com/android/deskclock/data/TimerModel.kt:812:84: error: type mismatch: inferred type is PendingIntent? but PendingIntent was expected
am.setExactAndAllowWhileIdle(ELAPSED_REALTIME_WAKEUP, triggerTime, pi)
^
packages/apps/DeskClock/src/com/android/deskclock/data/TimerModel.kt:814:67: error: type mismatch: inferred type is PendingIntent? but PendingIntent was expected
am.setExact(ELAPSED_REALTIME_WAKEUP, triggerTime, pi)
https://android-build.googleplex.com/builds/pending/P54969978/aosp_bramble_hwasan-userdebug/latest/view/logs/build_error.log
Bug: 275409981
Test: local finalization topic + m
Change-Id: I9da10deeef7752617638747f95a8b7aeb4be8b01
diff --git a/src/com/android/deskclock/Utils.kt b/src/com/android/deskclock/Utils.kt
index 166803a..05c93cd 100644
--- a/src/com/android/deskclock/Utils.kt
+++ b/src/com/android/deskclock/Utils.kt
@@ -316,7 +316,7 @@
@TargetApi(Build.VERSION_CODES.LOLLIPOP)
fun updateNextAlarm(am: AlarmManager, info: AlarmClockInfo?, op: PendingIntent?) {
- am.setAlarmClock(info, op)
+ am.setAlarmClock(info!!, op!!)
}
fun isAlarmWithin24Hours(alarmInstance: AlarmInstance): Boolean {
diff --git a/src/com/android/deskclock/data/TimerModel.kt b/src/com/android/deskclock/data/TimerModel.kt
index dae1510..bd61bf3 100644
--- a/src/com/android/deskclock/data/TimerModel.kt
+++ b/src/com/android/deskclock/data/TimerModel.kt
@@ -809,9 +809,9 @@
fun schedulePendingIntent(am: AlarmManager, triggerTime: Long, pi: PendingIntent?) {
if (Utils.isMOrLater) {
// Ensure the timer fires even if the device is dozing.
- am.setExactAndAllowWhileIdle(ELAPSED_REALTIME_WAKEUP, triggerTime, pi)
+ am.setExactAndAllowWhileIdle(ELAPSED_REALTIME_WAKEUP, triggerTime, pi!!)
} else {
- am.setExact(ELAPSED_REALTIME_WAKEUP, triggerTime, pi)
+ am.setExact(ELAPSED_REALTIME_WAKEUP, triggerTime, pi!!)
}
}
}