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

am 595ebceb: am 3fdaa329: Only set ORIGINAL_INSTANCE_TIME in exceptions

Browse Source 
Merge commit '595ebcebfaf937434dd797f0423819dae147b0d6' into kraken

* commit '595ebcebfaf937434dd797f0423819dae147b0d6':
  Only set ORIGINAL_INSTANCE_TIME in exceptions
This commit is contained in:
Marc Blank 2010-04-14 12:10:12 -07:00 committed by Android Git Automerger
commit da86f04c77
1 changed files with 0 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/com/android/exchange/adapter/CalendarSyncAdapter.java
View File

@ -361,7 +361,6 @@ public class CalendarSyncAdapter extends AbstractSyncAdapter {
case Tags.CALENDAR_START_TIME: case Tags.CALENDAR_START_TIME:
startTime = Utility.parseDateTimeToMillis(getValue()); startTime = Utility.parseDateTimeToMillis(getValue());
cv.put(Events.DTSTART, startTime); cv.put(Events.DTSTART, startTime);
cv.put(Events.ORIGINAL_INSTANCE_TIME, startTime);
break; break;
case Tags.CALENDAR_END_TIME: case Tags.CALENDAR_END_TIME:
endTime = Utility.parseDateTimeToMillis(getValue()); endTime = Utility.parseDateTimeToMillis(getValue());
@ -455,7 +454,6 @@ public class CalendarSyncAdapter extends AbstractSyncAdapter {
cal.set(GregorianCalendar.MINUTE, 0); cal.set(GregorianCalendar.MINUTE, 0);
cal.set(GregorianCalendar.SECOND, 0); cal.set(GregorianCalendar.SECOND, 0);
cv.put(Events.DTSTART, cal.getTimeInMillis()); cv.put(Events.DTSTART, cal.getTimeInMillis());
cv.put(Events.ORIGINAL_INSTANCE_TIME, cal.getTimeInMillis());
} else { } else {
cv.put(Events.DURATION, "P" + ((endTime - startTime) / MINUTES) + "M"); cv.put(Events.DURATION, "P" + ((endTime - startTime) / MINUTES) + "M");
} }