ADHOC/replicant-packages_apps_Email
3
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

am 8ba07285: Use timezone in exception ics files

Browse Source 
Merge commit '8ba07285336c34a1fa454b23c9d4c95af020fa00' into froyo-plus-aosp

* commit '8ba07285336c34a1fa454b23c9d4c95af020fa00':
  Use timezone in exception ics files
This commit is contained in:
Marc Blank 2010-04-29 10:48:39 -07:00 committed by Android Git Automerger
commit 220d910753
1 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/com/android/exchange/utility/CalendarUtilities.java
View File

@ -1416,8 +1416,11 @@ public class CalendarUtilities {
// If we're inviting people and the meeting is recurring, we need to send our time zone // 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, // information and make sure to send DTSTART/DTEND in local time (unless, of course,
// this is an all-day event) // this is an all-day event). Recurring, for this purpose, includes exceptions to
if (!isReply && entityValues.containsKey(Events.RRULE) && !allDayEvent) { // recurring events
if (!isReply && !allDayEvent &&
(entityValues.containsKey(Events.RRULE) ||
entityValues.containsKey(Events.ORIGINAL_EVENT))) {
vCalendarTimeZone = TimeZone.getDefault(); vCalendarTimeZone = TimeZone.getDefault();
// Write the VTIMEZONE block to the writer // Write the VTIMEZONE block to the writer
timeZoneToVTimezone(vCalendarTimeZone, ics); timeZoneToVTimezone(vCalendarTimeZone, ics);