commit 708745373284ae3e816fad16554ecb95574b5ef3
author Sara Ting <sarating@google.com> Thu Oct 18 11:46:33 2012 -0700
committer Sara Ting <sarating@google.com> Wed Oct 24 15:27:45 2012 -0700
tree 9e36c309376be36e908d8469822a1bf550f32f13
parent 21049d25dcf8f055dc046a889b0a514833ad599a

Minimize chance of race condition bug that misses alarms by clearing/rescheduling alarms.

This was properly fixed in the provider but this tries to minimize the bug until that fix is rolled out everywhere.

Bug:7221716
Change-Id: I4cb32b48caf31c8372770b74d7983e54480b755a

AndroidManifest.xml

diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index 76895c9..b894af5 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -36,6 +36,7 @@
     <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" />
     <uses-sdk android:minSdkVersion="15" android:targetSdkVersion="16"></uses-sdk>
 
@@ -168,11 +169,13 @@
         <receiver android:name=".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>
             <intent-filter>
@@ -188,6 +191,8 @@
 
         <service android:name=".alerts.SnoozeAlarmsService" />
 
+        <service android:name=".alerts.InitAlarmsService" />
+
         <!-- Declarations for the widget -->
         <receiver android:name=".widget.CalendarAppWidgetProvider" android:label="@string/gadget_title">
             <intent-filter>