drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

am 28fa220c: Merge "Fix bug #2585298 (google calendar sync clears eventTimezone field for recurring allDay events)" into gingerbread

Browse Source 
Merge commit '28fa220c8da1ea2933ac96595516d1efa545c1ea' into gingerbread-plus-aosp

* commit '28fa220c8da1ea2933ac96595516d1efa545c1ea':
  Fix bug #2585298 (google calendar sync clears eventTimezone field for recurring allDay events)
This commit is contained in:
Fabrice Di Meglio
2010-09-27 02:27:08 -07:00
committed by Android Git Automerger
parent 560ba6e1a9 28fa220c8d
commit 514a455f2a
2 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
core/java/android/pim/RecurrenceSet.java
View File

@ -181,7 +181,9 @@ public class RecurrenceSet {
boolean inUtc = start.parse(dtstart); boolean inUtc = start.parse(dtstart);
boolean allDay = start.allDay; boolean allDay = start.allDay;
if (inUtc) { // We force TimeZone to UTC for "all day recurring events" as the server is sending no
// TimeZone in DTSTART for them
if (inUtc || allDay) {
tzid = Time.TIMEZONE_UTC; tzid = Time.TIMEZONE_UTC;
} }

4
core/tests/coretests/src/android/pim/RecurrenceSetTest.java
View File

@ -46,7 +46,7 @@ public class RecurrenceSetTest extends TestCase {
String recurrence = "DTSTART;VALUE=DATE:20090821\nDTEND;VALUE=DATE:20090822\n" String recurrence = "DTSTART;VALUE=DATE:20090821\nDTEND;VALUE=DATE:20090822\n"
+ "RRULE:FREQ=YEARLY;WKST=SU"; + "RRULE:FREQ=YEARLY;WKST=SU";
verifyPopulateContentValues(recurrence, "FREQ=YEARLY;WKST=SU", null, verifyPopulateContentValues(recurrence, "FREQ=YEARLY;WKST=SU", null,
null, null, 1250812800000L, null, "P1D", 1); null, null, 1250812800000L, "UTC", "P1D", 1);
} }
// Test 2 day all-day event // Test 2 day all-day event
@ -55,7 +55,7 @@ public class RecurrenceSetTest extends TestCase {
String recurrence = "DTSTART;VALUE=DATE:20090821\nDTEND;VALUE=DATE:20090823\n" String recurrence = "DTSTART;VALUE=DATE:20090821\nDTEND;VALUE=DATE:20090823\n"
+ "RRULE:FREQ=YEARLY;WKST=SU"; + "RRULE:FREQ=YEARLY;WKST=SU";
verifyPopulateContentValues(recurrence, "FREQ=YEARLY;WKST=SU", null, verifyPopulateContentValues(recurrence, "FREQ=YEARLY;WKST=SU", null,
null, null, 1250812800000L, null, "P2D", 1); null, null, 1250812800000L, "UTC", "P2D", 1);
} }
// run populateContentValues and verify the results // run populateContentValues and verify the results