Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

am 426ac065: Merge change 22328 into eclair

Browse Source 
Merge commit '426ac065d0065507b7bc8c7c5c47fc2b09de2c82' into eclair-plus-aosp

* commit '426ac065d0065507b7bc8c7c5c47fc2b09de2c82':
  Fix recurrence parsing for all-day events.
This commit is contained in:
Ken Shirriff
2009-08-21 16:01:01 -07:00
committed by Android Git Automerger
parent 6b3776cd3e 426ac065d0
commit 8fca03a88b
1 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
core/java/android/pim/RecurrenceSet.java
View File

@@ -410,10 +410,14 @@ public static boolean populateComponent(ContentValues values,
Time end = new Time(endTzid); Time end = new Time(endTzid);
end.parse(dtendProperty.getValue()); end.parse(dtendProperty.getValue());
long durationMillis = end.toMillis(false /* use isDst */) long durationMillis = end.toMillis(false /* use isDst */)
- start.toMillis(false /* use isDst */); - start.toMillis(false /* use isDst */);
long durationSeconds = (durationMillis / 1000); long durationSeconds = (durationMillis / 1000);
return "P" + durationSeconds + "S"; if (start.allDay && (durationSeconds % 86400) == 0) {
return "P" + (durationSeconds / 86400) + "D"; // Server wants this instead of P86400S
} else {
return "P" + durationSeconds + "S";
}
} }
private static String flattenProperties(ICalendar.Component component, private static String flattenProperties(ICalendar.Component component,