summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge "Ignore Wakelock Under-Locked Exception" into klp-devandroid-sdk-4.4.2_r1.0.1android-sdk-4.4.2_r1android-4.4w_r1android-4.4.4_r2.0.1android-4.4.4_r2android-4.4.4_r1.0.1android-4.4.4_r1android-4.4.3_r1.1.0.1android-4.4.3_r1.1android-4.4.3_r1.0.1android-4.4.3_r1kitkat-wearkitkat-mr2.2-releasekitkat-mr2.1-releasekitkat-mr2-releasekitkat-devAlon Albert2013-11-191-1/+8
|\
| * Ignore Wakelock Under-Locked ExceptionAlon Albert2013-11-181-1/+8
| | | | | | | | | | Bug: 11751204 Change-Id: I78d9e16ea83a06e1fe3e69b0d8a596d16da271f7
* | Initialize WakeLock in the CTORAlon Albert2013-11-133-15/+13
|/ | | | | | | | | | Protect against possible race Also added a log that will indicate if a second provider is created in the in same process. Bug: 11260491 Change-Id: I3048d3c57d1cf6a13b808b85151d20ddb85d95a9
* Import translations. DO NOT MERGEBaligh Uddin2013-11-042-2/+2
| | | | | Change-Id: Iacf412bf332a5c9562891338e6e9e159553b4ca8 Auto-generated-cl: translation import
* Merge "Don't trigger a sync for ALERTS tables" into klp-devAlon Albert2013-11-013-7/+29
|\
| * Don't trigger a sync for ALERTS tablesAlon Albert2013-10-313-7/+29
| | | | | | | | | | Bug: 11350900 Change-Id: Iede3da60cb45ac496bea90c85d06eac36af617e1
* | Handle Missing Event RowAlon Albert2013-10-281-6/+16
|/ | | | | | | | When checking for Calendars.CAN_PARTIALLY_UPDATE in duplicateEvent() , don't crash if there is no matching event id in the db. Bug: 11392862 Change-Id: I895c3a307b842c4340c851da27c25951d3e7968f
* merge in KQS81Mandroid-cts-4.4_r1kitkat-cts-devEd Heyl2013-10-080-0/+0
|\
| * merge in klp-release history after reset to klp-devandroid-4.4_r1.0.1android-4.4_r1android-4.4_r0.9android-4.4_r0.8The Android Automerger2013-09-170-0/+0
|/|
| * merge in klp-release history after reset to klp-devThe Android Automerger2013-09-170-0/+0
| |\ | |/ |/|
* | Call clearCallingIdentity in Provider Entry PointsAlon Albert2013-09-162-0/+21
|/ | | | | Bug: 10777084 Change-Id: I7de6289e9b05b2ef51a9fe65c3a04f0d814c3362
* Import translations. DO NOT MERGEBaligh Uddin2013-09-1411-2/+342
| | | | | Change-Id: I8806d3bd9dd2962099fd3b1596647c0cc090e73c Auto-generated-cl: translation import
* Make sure to use exact alarms for Calendar eventsandroid-4.4_r0.7Christopher Tate2013-07-181-1/+1
| | | | Change-Id: Idfe11d65c81999b76cbbe2611bb77816f0c8875a
* Remove RDATE, EXRULE & EXDATE From ExceptionAlon Albert2013-06-271-2/+6
| | | | | | | When inserting an exception all recurrence fields need to be stripped. Bug: 9598339 Change-Id: I1226b135c170015073d020aaf791774ff10dc0dd
* The Calendar provider needs privileged permissionsChristopher Tate2013-05-101-0/+2
| | | | | | Bug 8765951 Change-Id: Ibc2b4bae860a977568e341d071c1954cd4b7d8d7
* Import translations. DO NOT MERGEBaligh Uddin2013-03-181-1/+1
| | | | | Change-Id: I095165951cd06a5c0c9b797fab5f0db1b767d9ee Auto-generated-cl: translation import
* Add EVENT_COLOR's to Event Entity Iteratorandroid-4.3_r3.1android-4.3_r3android-4.3_r2.3android-4.3_r2.2android-4.3_r2.1android-4.3_r2android-4.3_r1.1android-4.3_r1android-4.3_r0.9.1android-4.3_r0.9android-4.3.1_r1tools_r22.2jb-mr2.0.0-releasejb-mr2.0-releasejb-mr2-releasejb-mr2-devAlon Albert2013-02-041-0/+1
| | | | | Bug: 8132457 Change-Id: I292d10844bdeb21a2845a656dd0676b9acb8219e
* Protect calendar with app ops.Dianne Hackborn2013-01-252-0/+3
| | | | Change-Id: I9d6705b0fa5257434a825809ad46d422f2ee57cc
* Put some useful information in User-Agent HeaderAlon Albert2013-01-032-5/+95
| | | | | | | | | | | | Put information in User-Agent: * Build fingerprint * Calendar or CalendarSyncAdapter package name + version code * Package name of app making changes to provider for uphill syncs Example: google/mantaray/manta:K/MASTER/eng.aalbert.20121217.140040:eng/dev-keys:com.google.android.calendar:201212060:com.google.android.calendar Google-HTTP-Java-Client/1.11.0-beta (gzip) Change-Id: I729c64ba9b922523d35903fcaf2a51cc234799a8
* Import translations. DO NOT MERGEBaligh Uddin2012-12-121-1/+1
| | | | | Change-Id: I7226fbe0f633f92a93feb148f9806eff46531135 Auto-generated-cl: translation import
* am 49b7d3c4: Fix race condition for missing alerts after boot up.Sara Ting2012-10-161-1/+7
|\ | | | | | | | | * commit '49b7d3c4222a6b9e8e4639ba6d5128df5eac7e73': Fix race condition for missing alerts after boot up.
| * Fix race condition for missing alerts after boot up.android-sdk-support_r11android-cts-4.2_r2android-cts-4.2_r1android-4.2_r1android-4.2.2_r1.2android-4.2.2_r1.1android-4.2.2_r1android-4.2.1_r1.2android-4.2.1_r1.1android-4.2.1_r1tools_r22jb-mr1.1-releasejb-mr1.1-dev-plus-aospjb-mr1.1-devjb-mr1-releasejb-mr1-dev-plus-aospjb-mr1-devSara Ting2012-10-161-1/+7
| | | | | | | | | | | | | | After boot up, it was possible to miss scheduling alerts due to improper synchronization of the BOOT_COMPLETED and TIME_CHANGED actions. Bug:7221716 Change-Id: Id97266a19bb1ff8182576f687c34e10ef8644dc6
* | am 65dd5386: (-s ours) am 1687164a: (-s ours) Reconcile with jb-mr0-release ↵The Android Open Source Project2012-10-020-0/+0
|\| | | | | | | | | | | | | - do not merge * commit '65dd538630d0961b7d732a27da02817186eb7d26': Fix event color query (which fixes the failing CTS test).
| * am 1687164a: (-s ours) Reconcile with jb-mr0-release - do not mergeThe Android Open Source Project2012-10-020-0/+0
| |\ | | | | | | | | | | | | * commit '1687164a25c537f456cb4d212d128c99870bdf07': Fix event color query (which fixes the failing CTS test).
| | * Reconcile with jb-mr0-release - do not mergeThe Android Open Source Project2012-10-020-0/+0
| | |\ | | | | | | | | | | | | Change-Id: I22a716496e377e047ccf9d19cd30833225707565
| | | * Fix event color query (which fixes the failing CTS test).android-4.1.2_r2.1android-4.1.2_r2android-4.1.2_r1jb-mr0-releaseSara Ting2012-10-022-4/+70
| | | | | | | | | | | | | | | | | | | | Bug:7261590 Change-Id: I72c60af1ae8d563db7693fdf7d87972dfc80ab82
* | | | am d2e4cb09: am f4b1756f: Fix event color query (which fixes the failing CTS ↵Sara Ting2012-10-022-4/+70
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | test). * commit 'd2e4cb09054364f1b09e453426f642961cfbf7cf': Fix event color query (which fixes the failing CTS test).
| * | | am f4b1756f: Fix event color query (which fixes the failing CTS test).Sara Ting2012-10-022-4/+70
| |\| | | | | | | | | | | | | | | | | | * commit 'f4b1756f88c34efefb33b4103230ee334d9c9262': Fix event color query (which fixes the failing CTS test).
| | * | Fix event color query (which fixes the failing CTS test).android-cts-4.1_r4android-cts-4.1_r2jb-devSara Ting2012-10-022-4/+70
| | |/ | | | | | | | | | | | | Bug:7261590 Change-Id: I72c60af1ae8d563db7693fdf7d87972dfc80ab82
* | | am b5570054: Merge "Fix possible NPE in runScheduleNextAlarm." into jb-mr1-devSara Ting2012-09-281-1/+5
|\| | | | | | | | | | | | | | * commit 'b5570054791d2ae2743ab952a7f0e1d0ccf4d0ad': Fix possible NPE in runScheduleNextAlarm.
| * | Merge "Fix possible NPE in runScheduleNextAlarm." into jb-mr1-devSara Ting2012-09-271-1/+5
| |\ \
| | * | Fix possible NPE in runScheduleNextAlarm.Sara Ting2012-09-271-1/+5
| | | | | | | | | | | | | | | | | | | | Bug:7244877 Change-Id: Ifda7343cd154fc53a8b7e39fd747c3088f21a5eb
* | | | Import translations. DO NOT MERGEBaligh Uddin2012-09-251-1/+1
|/ / / | | | | | | | | | | | | Change-Id: If1b588c7bf97f5115af499dda727be3c94cdf316 Auto-generated-cl: translation import
* / / Adding new column 'uid2445' to Events table to support future handling of ↵Sara Ting2012-09-243-14/+43
|/ / | | | | | | | | | | | | ical/ics format. Bug:7029852 Change-Id: Ie2e5c0126583a68d2da81b6cc7c0101e29eb0649
* | Add some columnsAlon Albert2012-09-202-7/+80
| | | | | | | | | | | | | | | | | | isPrimary to Calendars isOrganizer to Events Bug: 6888477 Change-Id: I6ea7d69eec4a7226bf3e9fac216a31b5cd170782
* | Renamed calendarcommon to calendarcommon2 to avoid naming conflict with OEM ↵Michael Chan2012-08-094-13/+13
| | | | | | | | | | | | devices Change-Id: Ia765b4c17bfc00e283c66c440b8561fcd7b8e4dc
* | am f98ed2e5: Fixed the problem where updating event colors would cause ↵Michael Chan2012-08-090-0/+0
|\| | | | | | | | | | | | | exceptions * commit 'f98ed2e5c5e08cac159ce4cf22ab86a718f0bb0b': Fixed the problem where updating event colors would cause exceptions
| * Fixed the problem where updating event colors would cause exceptionstools_r21Michael Chan2012-07-242-18/+77
| | | | | | | | | | Bug: 6742712 Change-Id: Ie097e05c74995513b5b6fc04efd8e0d35876b698
* | Fixed the problem where updating event colors would cause exceptionsMichael Chan2012-08-032-18/+77
| | | | | | | | | | Bug: 6742712 Change-Id: Ie097e05c74995513b5b6fc04efd8e0d35876b698
* | Explicitly export content providersNick Kralevich2012-07-281-0/+1
| | | | | | | | | | | | | | | | | | In a future version of Android, the default value for <provider android:exported> will change from true to false. Explicitly set android:exported="true" Bug: 3306452 Change-Id: I18fb3f7afe37c8e463b27e05077e207b7ef13d86
* | Import translations. DO NOT MERGEYing Wang2012-07-131-2/+2
| | | | | | | | | | Change-Id: Ia8c1dd6713c7ae6067d05879186b98093e9c2887 Auto-generated-cl: translation import
* | Import translations. DO NOT MERGEEric Fischer2012-07-021-1/+1
| | | | | | | | | | Change-Id: Ie5e78a2a217eb4ac02b97ac29b360032899c6f87 Auto-generated-cl: translation import
* | Import translations. DO NOT MERGEYing Wang2012-06-181-1/+1
|/ | | | Change-Id: I32b07fcdf146e01c8d15f59a403ef2f6d7d3d9a0
* Merge "Update widget after changing attendee status." into jb-devandroid-cts-4.1_r1android-4.1.1_r6.1android-4.1.1_r6android-4.1.1_r5android-4.1.1_r4android-4.1.1_r3android-4.1.1_r2android-4.1.1_r1.1android-4.1.1_r1jb-releaseSara Ting2012-05-301-0/+1
|\
| * Update widget after changing attendee status.Sara Ting2012-05-251-0/+1
| | | | | | | | | | Bug:5934675 Change-Id: I51a9f3f1b7c4cce405d80d1bc92dd3b8a6febf66
* | Updating launcher icon to fix alignment. Bug: 6511716Christian Robertson2012-05-233-0/+0
|/ | | | Change-Id: Ib6d2b0aab346a53036a032dd1fd5eccb2e9a2428
* Keep the device awake while we schedule the next alarmMichael Chan2012-05-012-0/+11
| | | | | Bug: 5777855 Change-Id: I59e97ce69e0dcbaf1b8eaa25407f2d3234140b98
* Fixed so potential memory leaks.Michael Chan2012-04-293-19/+32
| | | | | Bug: 6396900 Change-Id: Id02c323b567bfc49ae1da4dbe4335ba150241232
* Add support for custom app and uri in eventsMichael Chan2012-04-244-84/+169
| | | | | Bug: 6325441 Change-Id: If4a0f855e21d10aa63be67c5bb702618b776b29b
* Add support for identity in attendeesMichael Chan2012-04-175-10/+73
| | | | | Bug: 6353721 Change-Id: If167941b90b256073444f2660df2360f79872276