diff options
Diffstat (limited to 'src/com/android/calendar')
| -rw-r--r-- | src/com/android/calendar/alerts/AlertReceiver.java | 3 | ||||
| -rw-r--r-- | src/com/android/calendar/alerts/DismissAlarmsService.java | 2 |
2 files changed, 4 insertions, 1 deletions
diff --git a/src/com/android/calendar/alerts/AlertReceiver.java b/src/com/android/calendar/alerts/AlertReceiver.java index 9005d36a..e1f7dec6 100644 --- a/src/com/android/calendar/alerts/AlertReceiver.java +++ b/src/com/android/calendar/alerts/AlertReceiver.java @@ -464,8 +464,10 @@ public class AlertReceiver extends BroadcastReceiver { Resources res = context.getResources(); int numEvents = notificationInfos.size(); long[] eventIds = new long[notificationInfos.size()]; + long[] startMillis = new long[notificationInfos.size()]; for (int i = 0; i < notificationInfos.size(); i++) { eventIds[i] = notificationInfos.get(i).eventId; + startMillis[i] = notificationInfos.get(i).startMillis; } // Create an intent triggered by clicking on the status icon that shows the alerts list. @@ -477,6 +479,7 @@ public class AlertReceiver extends BroadcastReceiver { deleteIntent.setClass(context, DismissAlarmsService.class); deleteIntent.setAction(DELETE_ALL_ACTION); deleteIntent.putExtra(AlertUtils.EVENT_IDS_KEY, eventIds); + deleteIntent.putExtra(AlertUtils.EVENT_STARTS_KEY, startMillis); PendingIntent pendingDeleteIntent = PendingIntent.getService(context, 0, deleteIntent, PendingIntent.FLAG_UPDATE_CURRENT); diff --git a/src/com/android/calendar/alerts/DismissAlarmsService.java b/src/com/android/calendar/alerts/DismissAlarmsService.java index 64ff2aa4..5ba34560 100644 --- a/src/com/android/calendar/alerts/DismissAlarmsService.java +++ b/src/com/android/calendar/alerts/DismissAlarmsService.java @@ -74,7 +74,7 @@ public class DismissAlarmsService extends IntentService { } else if (eventIds != null && eventIds.length > 0 && eventStarts != null && eventIds.length == eventStarts.length) { selection = buildMultipleEventsQuery(eventIds); - for (int i = 1; i < eventIds.length; i++) { + for (int i = 0; i < eventIds.length; i++) { alarmIds.add(new AlarmId(eventIds[i], eventStarts[i])); } } else { |