diff options
Diffstat (limited to 'src/com/android/deskclock/data/TimerModel.java')
-rw-r--r-- | src/com/android/deskclock/data/TimerModel.java | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/src/com/android/deskclock/data/TimerModel.java b/src/com/android/deskclock/data/TimerModel.java index 33f02c51f..5eb5d43e5 100644 --- a/src/com/android/deskclock/data/TimerModel.java +++ b/src/com/android/deskclock/data/TimerModel.java @@ -678,16 +678,19 @@ final class TimerModel { if (nextExpiringTimer == null) { // Cancel the existing timer expiration callback. - final PendingIntent pi = PendingIntent.getService(mContext, - 0, intent, PendingIntent.FLAG_ONE_SHOT | PendingIntent.FLAG_NO_CREATE); + final PendingIntent pi = PendingIntent.getService(mContext, 0, intent, + PendingIntent.FLAG_ONE_SHOT | PendingIntent.FLAG_NO_CREATE | + PendingIntent.FLAG_IMMUTABLE); + if (pi != null) { mAlarmManager.cancel(pi); pi.cancel(); } } else { // Update the existing timer expiration callback. - final PendingIntent pi = PendingIntent.getService(mContext, - 0, intent, PendingIntent.FLAG_ONE_SHOT | PendingIntent.FLAG_UPDATE_CURRENT); + final PendingIntent pi = PendingIntent.getService(mContext, 0, intent, + PendingIntent.FLAG_ONE_SHOT | PendingIntent.FLAG_UPDATE_CURRENT | + PendingIntent.FLAG_IMMUTABLE); schedulePendingIntent(mAlarmManager, nextExpiringTimer.getExpirationTime(), pi); } } |