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

Commit 1477798b authored by Fabrice Di Meglio's avatar Fabrice Di Meglio Committed by Android (Google) Code Review
Browse files

Merge "Fix bug #2585298 (google calendar sync clears eventTimezone field for... 

Merge "Fix bug #2585298 (google calendar sync clears eventTimezone field for recurring allDay events)"
parents 78aaa97b 9d8d1e5d

core/java/android/pim/RecurrenceSet.java

+4 −5
Original line number Original line Diff line number Diff line
@@ -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;

        }

        }
@@ -204,9 +206,6 @@ public class RecurrenceSet { 
        }

        }

        

        

        if (allDay) {

        if (allDay) {

        	// TODO: also change tzid to be UTC?  that would be consistent, but

        	// that would not reflect the original timezone value back to the

        	// server.

            start.timezone = Time.TIMEZONE_UTC;

            start.timezone = Time.TIMEZONE_UTC;

        }

        }

        long millis = start.toMillis(false /* use isDst */);

        long millis = start.toMillis(false /* use isDst */);