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

Commit 237d14ac authored by Fahim Salam Chowdhury's avatar Fahim Salam Chowdhury 👽
Browse files

Merge branch '6430-t-Clear_notification_after_event_ends' into 'v1-t' 

6430-t-Clear_notification_after_event_ends

See merge request !55
parents 7fb32750 0831bf4f

app/src/main/java/com/android/calendar/alerts/AlertService.java

+6 −8
Original line number Original line Diff line number Diff line
@@ -526,15 +526,13 @@ public class AlertService extends Service { 
                int newState = -1;

                int newState = -1;

                boolean newAlert = false;

                boolean newAlert = false;





                // Uncomment for the behavior of clearing out alerts after the

                // clearing out alerts after the events ended. b/1880369

                // events ended. b/1880369

                if (endTime < currentTime) {

                //

                    newState = CalendarAlerts.STATE_DISMISSED;

                // if (endTime < currentTime) {

                }

                //     newState = CalendarAlerts.DISMISSED;

                // } else





                // Remove declined events

                // Remove declined events

                boolean sendAlert = !declined;

                boolean sendAlert = !declined  && newState != CalendarAlerts.STATE_DISMISSED;

                // Check for experimental reminder settings.

                // Check for experimental reminder settings.

                if (remindRespondedOnly) {

                if (remindRespondedOnly) {

                    // If the experimental setting is turned on, then only send

                    // If the experimental setting is turned on, then only send