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

Commit 8e217dcc authored by Annie Chin's avatar Annie Chin Committed by Android (Google) Code Review
Browse files

Merge "Cancel times up notification on RESET, DELETE, or DONE." into ub-deskclock-business

parents 62ff2ac2 8d659d7d

src/com/android/deskclock/timer/TimerReceiver.java

+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) {