Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 2e03316f authored by Annie Chin's avatar Annie Chin Committed by Android Git Automerger
Browse files

am af116754: am 8e217dcc: Merge "Cancel times up notification on RESET,...

am af116754: am 8e217dcc: Merge "Cancel times up notification on RESET, DELETE, or DONE." into ub-deskclock-business

* commit 'af116754':
  Cancel times up notification on RESET, DELETE, or DONE.
parents 62f8fc5e af116754
Loading
Loading
Loading
Loading
+4 −0
Original line number Diff line number Diff line
@@ -127,6 +127,10 @@ public class TimerReceiver extends BroadcastReceiver {
                || Timers.TIMER_DONE.equals(actionType)) {
            // Stop Ringtone if all timers are not in times-up status
            stopRingtoneIfNoTimesup(context);

            if (t != null) {
                cancelTimesUpNotification(context, t);
            }
        } else if (Timers.NOTIF_TIMES_UP_STOP.equals(actionType)) {
            // Find the timer (if it doesn't exists, it was probably deleted).
            if (t == null) {