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

am c94c077a: Merge "Send busy_status = 2 on all upsync\'s" into froyo

Browse Source 
Merge commit 'c94c077a668fe3eb78dfeec797a175571a47b1c6' into kraken

* commit 'c94c077a668fe3eb78dfeec797a175571a47b1c6':
  Send busy_status = 2 on all upsync's
This commit is contained in:
Marc Blank 2010-04-07 11:14:53 -07:00 committed by Android Git Automerger
commit 1dec3405f5
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -97,6 +97,8 @@ public class CalendarSyncAdapter extends AbstractSyncAdapter {
private static final String CATEGORY_TOKENIZER_DELIMITER = "\\";
private static final String ATTENDEE_TOKENIZER_DELIMITER = CATEGORY_TOKENIZER_DELIMITER;
private static final String FREE_BUSY_BUSY = "2";
private static final ContentProviderOperation PLACEHOLDER_OPERATION =
ContentProviderOperation.newInsert(Uri.EMPTY).build();
@ -1146,11 +1148,9 @@ public class CalendarSyncAdapter extends AbstractSyncAdapter {
s.data(Tags.CALENDAR_TIME_ZONE, timeZone);
}
if (mService.mProtocolVersionDouble < Eas.SUPPORTED_PROTOCOL_EX2007_DOUBLE) {
// We need BusyStatus for 2.5, so we'll send "busy", which is what OWA does.
// Calendar doesn't support free/busy yet
s.data(Tags.CALENDAR_BUSY_STATUS, "2");
}
// Busy status is only required for 2.5, but we need to send it with later
// versions as well, because if we don't, the server will clear it.
s.data(Tags.CALENDAR_BUSY_STATUS, FREE_BUSY_BUSY);
boolean allDay = false;
if (entityValues.containsKey(Events.ALL_DAY)) {