commit b4f78da94bcc3af7a872b5dc195d5243a948a3c7
author Marc Blank <mblank@google.com> Thu Apr 29 09:41:02 2010 -0700
committer Marc Blank <mblank@google.com> Thu Apr 29 10:16:58 2010 -0700
tree e7dcc45bffdfabd0493fcb6fbe638fa5f0554c1f
parent fadd996626e60f11be1e98af5a194f29fd5c0d7a

Use timezone in exception ics files

* Exchange seems to require time zone information in ics files containing
  event exceptions, although this is NOT the case for iCalendar, and appears
  not to conform to VCALENDAR specifications
* This causes exceptions to be placed on the wrong date or perhaps even
  ignored, depending on the circumstance
* This CL simply adds time zone information to all exception ics files

Bug: 2640878
Change-Id: Ibc614eb7a2c45e9e782b10be979d9892bbfc0029

src/com/android/exchange/utility/CalendarUtilities.java

diff --git a/src/com/android/exchange/utility/CalendarUtilities.java b/src/com/android/exchange/utility/CalendarUtilities.java
index 4051f1a..6f38047 100644
--- a/src/com/android/exchange/utility/CalendarUtilities.java
+++ b/src/com/android/exchange/utility/CalendarUtilities.java
@@ -1416,8 +1416,11 @@
 
             // If we're inviting people and the meeting is recurring, we need to send our time zone
             // information and make sure to send DTSTART/DTEND in local time (unless, of course,
-            // this is an all-day event)
-            if (!isReply  && entityValues.containsKey(Events.RRULE) && !allDayEvent) {
+            // this is an all-day event).  Recurring, for this purpose, includes exceptions to
+            // recurring events
+            if (!isReply && !allDayEvent &&
+                    (entityValues.containsKey(Events.RRULE) ||
+                            entityValues.containsKey(Events.ORIGINAL_EVENT))) {
                 vCalendarTimeZone = TimeZone.getDefault();
                 // Write the VTIMEZONE block to the writer
                 timeZoneToVTimezone(vCalendarTimeZone, ics);