diff options
| author | Xin Li <delphij@google.com> | 2023-08-14 15:41:47 -0700 |
|---|---|---|
| committer | Xin Li <delphij@google.com> | 2023-08-14 15:41:47 -0700 |
| commit | 26f413673316c3e5475455f9add9b5660a5d50e6 (patch) | |
| tree | 3326cec40cc6add259c695efee5f6d7fdd0e2e19 | |
| parent | 5ba07cec0863a29d93257094421af82e8a7c3239 (diff) | |
| parent | d2759329f05b3e88785f6a1efd12963bff7fe51e (diff) | |
| download | DeskClock-tmp_amf_298295554.tar.gz | |
Merge Android U (ab/10368041)tmp_amf_298295554
Bug: 291102124
Merged-In: If8e78d1437c516cdb46a3ae170caee1cedc618d9
Change-Id: I3552c1d78154a15b82b14ed291610821ae8b8d31
| -rw-r--r-- | src/com/android/deskclock/Utils.kt | 2 | ||||
| -rw-r--r-- | src/com/android/deskclock/alarms/AlarmStateManager.kt | 2 | ||||
| -rw-r--r-- | src/com/android/deskclock/data/TimerModel.kt | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/src/com/android/deskclock/Utils.kt b/src/com/android/deskclock/Utils.kt index 166803a24..3320e20e7 100644 --- a/src/com/android/deskclock/Utils.kt +++ b/src/com/android/deskclock/Utils.kt @@ -315,7 +315,7 @@ object Utils { } @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 2478ef5c1..c98380c97 100644 --- a/src/com/android/deskclock/alarms/AlarmStateManager.kt +++ b/src/com/android/deskclock/alarms/AlarmStateManager.kt @@ -288,7 +288,7 @@ class AlarmStateManager : BroadcastReceiver() { 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 dae15102e..2b97af719 100644 --- a/src/com/android/deskclock/data/TimerModel.kt +++ b/src/com/android/deskclock/data/TimerModel.kt @@ -806,7 +806,7 @@ internal class TimerModel( */ 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) |