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

Commit 7c4cbf9e authored by Romain Hunault's avatar Romain Hunault 💻
Browse files

Merge branch 'v1-s' into 'v2.0-s' 

Merge v1-s into v2.0-s

See merge request !65
parents fea4e0a8 5812a3fd

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

+5 −7
Original line number Diff line number Diff line
@@ -529,15 +529,13 @@ public class AlertService extends Service { 
                int newState = -1;

                boolean newAlert = false;



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

                // events ended. b/1880369

                //

                // if (endTime < currentTime) {

                //     newState = CalendarAlerts.DISMISSED;

                // } else

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

                if (endTime < currentTime) {

                    newState = CalendarAlerts.STATE_DISMISSED;

                }



                // Remove declined events

                boolean sendAlert = !declined;

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

                // Check for experimental reminder settings.

                if (remindRespondedOnly) {

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