am 3fdaa329: Only set ORIGINAL_INSTANCE_TIME in exceptions

Merge commit '3fdaa329692b29c0083008bcbb5c5aa62ae7b9fd' into froyo-plus-aosp

* commit '3fdaa329692b29c0083008bcbb5c5aa62ae7b9fd':
  Only set ORIGINAL_INSTANCE_TIME in exceptions
This commit is contained in:
Marc Blank 2010-04-14 12:02:58 -07:00 committed by Android Git Automerger
commit 595ebcebfa

View File

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