Revert "Minimize chance of race condition bug that misses alarms by c…

…learing/rescheduling alarms." (Etar-Group#411)

This reverts commit 7087453.

AndroidManifest.xml

@@ -39,7 +39,6 @@
     <uses-permission android:name="android.permission.WAKE_LOCK" />
     <uses-permission android:name="android.permission.USE_CREDENTIALS" />
     <uses-permission android:name="android.permission.READ_SYNC_SETTINGS" />
-    <uses-permission android:name="android.permission.RECEIVE_BOOT_COMPLETED" />
     <uses-permission android:name="com.google.android.googleapps.permission.GOOGLE_AUTH.mail" />
 
 
@@ -226,12 +225,10 @@
         <receiver android:name="com.android.calendar.alerts.AlertReceiver">
             <intent-filter>
                 <action android:name="android.intent.action.EVENT_REMINDER" />
+                <action android:name="android.intent.action.BOOT_COMPLETED" />
                 <action android:name="android.intent.action.TIME_SET" />
                 <data android:scheme="content" />
             </intent-filter>
-            <intent-filter>
-                <action android:name="android.intent.action.BOOT_COMPLETED" />
-            </intent-filter>
             <intent-filter>
                 <action android:name="android.intent.action.LOCALE_CHANGED" />
             </intent-filter>
@@ -251,8 +248,6 @@
 
         <service android:name="com.android.calendar.alerts.SnoozeAlarmsService" />
 
-        <service android:name="com.android.calendar.alerts.InitAlarmsService" />
-
         <!-- Declarations for the widget -->
         <!--receiver android:name="com.android.calendar.widget.CalendarAppWidgetProvider" android:label="@string/gadget_title">
             <intent-filter>

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

@@ -946,19 +946,8 @@ void processMessage(Message msg) {
             }
 
             updateAlertNotification(this);
-        } else if (action.equals(Intent.ACTION_BOOT_COMPLETED)) {
-            // The provider usually initiates this setting up of alarms on startup,
-            // but there was a bug (b/7221716) where a race condition caused this step to be
-            // skipped, resulting in missed alarms.  This is a stopgap to minimize this bug
-            // for devices that don't have the provider fix, by initiating this a 2nd time here.
-            // However, it would still theoretically be possible to hit the race condition
-            // the 2nd time and still miss alarms.
-            //
-            // TODO: Remove this when the provider fix is rolled out everywhere.
-            Intent intent = new Intent();
-            intent.setClass(this, InitAlarmsService.class);
-            startService(intent);
-        } else if (action.equals(Intent.ACTION_TIME_CHANGED)) {
+        } else if (action.equals(Intent.ACTION_BOOT_COMPLETED)
+                || action.equals(Intent.ACTION_TIME_CHANGED)) {
             doTimeChanged();
         } else if (action.equals(AlertReceiver.ACTION_DISMISS_OLD_REMINDERS)) {
             dismissOldAlerts(this);