Merge "Remove dead code in AlarmService." into ics-ub-calendar-timely

2 files changed, 11 insertions, 9 deletions

diff --git a/src/com/android/calendar/alerts/AlertReceiver.java b/src/com/android/calendar/alerts/AlertReceiver.java
index da8e617e..7bc211ae 100644
--- a/src/com/android/calendar/alerts/AlertReceiver.java
+++ b/src/com/android/calendar/alerts/AlertReceiver.java
@@ -68,7 +68,6 @@ import java.util.regex.Pattern;
 public class AlertReceiver extends BroadcastReceiver {
     private static final String TAG = "AlertReceiver";
 
-    private static final String DELETE_ALL_ACTION = "com.android.calendar.DELETEALL";
     private static final String MAP_ACTION = "com.android.calendar.MAP";
     private static final String CALL_ACTION = "com.android.calendar.CALL";
     private static final String MAIL_ACTION = "com.android.calendar.MAIL";
@@ -103,13 +102,7 @@ public class AlertReceiver extends BroadcastReceiver {
         if (AlertService.DEBUG) {
             Log.d(TAG, "onReceive: a=" + intent.getAction() + " " + intent.toString());
         }
-        if (DELETE_ALL_ACTION.equals(intent.getAction())) {
-
-            // The user has dismissed a digest notification.
-            // TODO Grab a wake lock here?
-            Intent serviceIntent = new Intent(context, DismissAlarmsService.class);
-            context.startService(serviceIntent);
-        } else if (MAP_ACTION.equals(intent.getAction())) {
+        if (MAP_ACTION.equals(intent.getAction())) {
             // Try starting the map action.
             // If no map location is found (something changed since the notification was originally
             // fired), update the notifications to express this change.
@@ -222,6 +215,7 @@ public class AlertReceiver extends BroadcastReceiver {
             boolean showEvent) {
         Intent intent = new Intent();
         intent.setClass(context, DismissAlarmsService.class);
+        intent.setAction(DismissAlarmsService.DELETE_ALL_ACTION);
         intent.putExtra(AlertUtils.EVENT_ID_KEY, eventId);
         intent.putExtra(AlertUtils.EVENT_START_KEY, startMillis);
         intent.putExtra(AlertUtils.EVENT_END_KEY, endMillis);
@@ -477,7 +471,7 @@ public class AlertReceiver extends BroadcastReceiver {
         // expired events.
         Intent deleteIntent = new Intent();
         deleteIntent.setClass(context, DismissAlarmsService.class);
-        deleteIntent.setAction(DELETE_ALL_ACTION);
+        deleteIntent.setAction(DismissAlarmsService.DELETE_ALL_ACTION);
         deleteIntent.putExtra(AlertUtils.EVENT_IDS_KEY, eventIds);
         deleteIntent.putExtra(AlertUtils.EVENT_STARTS_KEY, startMillis);
         PendingIntent pendingDeleteIntent = PendingIntent.getService(context, 0, deleteIntent,
diff --git a/src/com/android/calendar/alerts/DismissAlarmsService.java b/src/com/android/calendar/alerts/DismissAlarmsService.java
index d5dfaf30..e4ab89f4 100644
--- a/src/com/android/calendar/alerts/DismissAlarmsService.java
+++ b/src/com/android/calendar/alerts/DismissAlarmsService.java
@@ -27,6 +27,7 @@ import android.os.IBinder;
 import android.provider.CalendarContract.CalendarAlerts;
 import android.support.v4.app.TaskStackBuilder;
 
+import android.util.Log;
 import com.android.calendar.EventInfoActivity;
 import com.android.calendar.alerts.GlobalDismissManager.AlarmId;
 
@@ -37,6 +38,9 @@ import java.util.List;
  * Service for asynchronously marking fired alarms as dismissed.
  */
 public class DismissAlarmsService extends IntentService {
+    public static final String DELETE_ALL_ACTION = "com.android.calendar.DELETEALL";
+    private static final String TAG = "DismissAlarmsService";
+
     private static final String[] PROJECTION = new String[] {
             CalendarAlerts.STATE,
     };
@@ -53,6 +57,10 @@ public class DismissAlarmsService extends IntentService {
 
     @Override
     public void onHandleIntent(Intent intent) {
+        if (!DELETE_ALL_ACTION.equals(intent.getAction())) {
+            Log.wtf(TAG, String.format("Unknown Action: %s", intent.getAction()));
+            return;
+        }
 
         long eventId = intent.getLongExtra(AlertUtils.EVENT_ID_KEY, -1);
         long eventStart = intent.getLongExtra(AlertUtils.EVENT_START_KEY, -1);