diff options
| author | Ricardo Cerqueira <cyanogenmod@cerqueira.org> | 2013-07-24 23:56:55 +0100 |
|---|---|---|
| committer | Ricardo Cerqueira <cyanogenmod@cerqueira.org> | 2013-07-24 23:57:42 +0100 |
| commit | 9e9ee5d52d15ea7cdda6de176a1cbc75abae19b7 (patch) | |
| tree | ec4fb735b0df7cd3426040ed40b2f1289acbf90a /AndroidManifest.xml | |
| parent | b2134103af68deee998f09f781df88e9b8af10d3 (diff) | |
| parent | 71b4934595bc56c3aec2a80abd3b9ff11ff4c582 (diff) | |
| download | android_packages_apps_Calendar-9e9ee5d52d15ea7cdda6de176a1cbc75abae19b7.tar.gz android_packages_apps_Calendar-9e9ee5d52d15ea7cdda6de176a1cbc75abae19b7.tar.bz2 android_packages_apps_Calendar-9e9ee5d52d15ea7cdda6de176a1cbc75abae19b7.zip | |
Merge tag 'android-4.3_r2.1' into cm-10.2
Android 4.3 release 2.1
Conflicts:
res/values-cs/strings.xml
src/com/android/calendar/GeneralPreferences.java
src/com/android/calendar/alerts/AlertReceiver.java
src/com/android/calendar/alerts/AlertService.java
src/com/android/calendar/alerts/AlertUtils.java
Change-Id: Ieb99951c15ff0eb484341aa07d007d0a7d14dac2
Diffstat (limited to 'AndroidManifest.xml')
| -rw-r--r-- | AndroidManifest.xml | 15 |
1 files changed, 12 insertions, 3 deletions
diff --git a/AndroidManifest.xml b/AndroidManifest.xml index 4f36e9c8..dd2b21b6 100644 --- a/AndroidManifest.xml +++ b/AndroidManifest.xml @@ -36,14 +36,16 @@ <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> + <uses-sdk android:minSdkVersion="15" android:targetSdkVersion="18"></uses-sdk> <application android:name="CalendarApplication" android:label="@string/app_label" android:icon="@mipmap/ic_launcher_calendar" android:taskAffinity="android.task.calendar" android:hardwareAccelerated="true" - android:backupAgent="com.android.calendar.CalendarBackupAgent" > + android:backupAgent="com.android.calendar.CalendarBackupAgent" + android:requiredAccountType="*" > <meta-data android:name="com.google.android.backup.api_key" android:value="AEdPqrEAAAAIM256oVOGnuSel5QKDpL8je_T65ZI8rFnDinssA" /> @@ -171,11 +173,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> @@ -185,12 +189,17 @@ </intent-filter> </receiver> + <receiver android:name=".alerts.GlobalDismissManager" + android:exported="false" /> + <service android:name=".alerts.AlertService" /> <service android:name=".alerts.DismissAlarmsService" /> <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> |