From 8c742a4c65e1ff2618e1005803edb65a42994fb6 Mon Sep 17 00:00:00 2001 From: Marc Blank Date: Wed, 26 May 2010 19:33:38 -0700 Subject: [PATCH] Handle case of null organizerEmail in changed event * A recent change assumed that organizerEmail couldn't be null while an event was being added. However, there is an unusual case in which it CAN be null, and this CL handles that case * Regression caused by: SHA 7f448dcd470ac509a85368a84f5a55c346ae7e70 Bug: 2719254 Change-Id: Idb8fc79c898bcd2e53fcc8b3e42d0ba67ba762fa --- src/com/android/exchange/adapter/CalendarSyncAdapter.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/com/android/exchange/adapter/CalendarSyncAdapter.java b/src/com/android/exchange/adapter/CalendarSyncAdapter.java index 0df6ccc1d..9a4909b20 100644 --- a/src/com/android/exchange/adapter/CalendarSyncAdapter.java +++ b/src/com/android/exchange/adapter/CalendarSyncAdapter.java @@ -552,7 +552,8 @@ public class CalendarSyncAdapter extends AbstractSyncAdapter { addOrganizerToAttendees(ops, eventId, organizerName, organizerEmail); } - boolean selfOrganizer = (organizerEmail.equals(mEmailAddress)); + // Note that organizerEmail can be null with a DTSTAMP only change from the server + boolean selfOrganizer = (mEmailAddress.equals(organizerEmail)); // Store email addresses of attendees (in a tokenizable string) in ExtendedProperties // If the user is an attendee, set the attendee status using busyStatus (note that the