Snap for 10103804 from 4d7b743a91ede9886739f3e902b8405103e58668 to mainline-tzdata5-release
Change-Id: I252f4a7376c47dbcf97df3ceac2d9fba25b355bb
diff --git a/src/com/android/deskclock/Utils.kt b/src/com/android/deskclock/Utils.kt
index 166803a..3320e20 100644
--- a/src/com/android/deskclock/Utils.kt
+++ b/src/com/android/deskclock/Utils.kt
@@ -315,7 +315,7 @@
}
@TargetApi(Build.VERSION_CODES.LOLLIPOP)
- fun updateNextAlarm(am: AlarmManager, info: AlarmClockInfo?, op: PendingIntent?) {
+ fun updateNextAlarm(am: AlarmManager, info: AlarmClockInfo, op: PendingIntent) {
am.setAlarmClock(info, op)
}
diff --git a/src/com/android/deskclock/alarms/AlarmStateManager.kt b/src/com/android/deskclock/alarms/AlarmStateManager.kt
index 2478ef5..c98380c 100644
--- a/src/com/android/deskclock/alarms/AlarmStateManager.kt
+++ b/src/com/android/deskclock/alarms/AlarmStateManager.kt
@@ -288,7 +288,7 @@
PendingIntent.FLAG_UPDATE_CURRENT)
val info = AlarmClockInfo(alarmTime, viewIntent)
- Utils.updateNextAlarm(alarmManager, info, operation)
+ Utils.updateNextAlarm(alarmManager, info, operation!!)
} else if (operation != null) {
LogUtils.i("Canceling upcoming AlarmClockInfo")
alarmManager.cancel(operation)
diff --git a/src/com/android/deskclock/data/TimerModel.kt b/src/com/android/deskclock/data/TimerModel.kt
index dae1510..2b97af7 100644
--- a/src/com/android/deskclock/data/TimerModel.kt
+++ b/src/com/android/deskclock/data/TimerModel.kt
@@ -806,7 +806,7 @@
*/
private val MISSED_THRESHOLD: Long = -MINUTE_IN_MILLIS
- fun schedulePendingIntent(am: AlarmManager, triggerTime: Long, pi: PendingIntent?) {
+ 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)