Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 514a455f authored by Fabrice Di Meglio's avatar Fabrice Di Meglio Committed by Android Git Automerger
Browse files

am 28fa220c: Merge "Fix bug #2585298 (google calendar sync clears... 

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

Merge commit '28fa220c' into gingerbread-plus-aosp

* commit '28fa220c':
  Fix bug #2585298 (google calendar sync clears eventTimezone field for recurring allDay events)
parents 560ba6e1 28fa220c

core/java/android/pim/RecurrenceSet.java

+3 −1
Original line number Diff line number Diff line
@@ -181,7 +181,9 @@ public class RecurrenceSet { 
        boolean inUtc = start.parse(dtstart);

        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;

        }

core/tests/coretests/src/android/pim/RecurrenceSetTest.java

+2 −2
Original line number Diff line number Diff line
@@ -46,7 +46,7 @@ public class RecurrenceSetTest extends TestCase { 
        String recurrence = "DTSTART;VALUE=DATE:20090821\nDTEND;VALUE=DATE:20090822\n"

                + "RRULE:FREQ=YEARLY;WKST=SU";

        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
@@ -55,7 +55,7 @@ public class RecurrenceSetTest extends TestCase { 
        String recurrence = "DTSTART;VALUE=DATE:20090821\nDTEND;VALUE=DATE:20090823\n"

                + "RRULE:FREQ=YEARLY;WKST=SU";

        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