summaryrefslogtreecommitdiffstats
path: root/src/com/android/calendar/EventInfoActivity.java
diff options
context:
space:
mode:
authorThe Android Open Source Project <initial-contribution@android.com>2010-06-09 12:18:53 -0700
committerThe Android Open Source Project <initial-contribution@android.com>2010-06-09 12:18:53 -0700
commit4dcea88ce1c4653aaa1569d9d3bcb80b88c9de68 (patch)
treeac3855f3e474a6264d959a2ef886a1631b8a1596 /src/com/android/calendar/EventInfoActivity.java
parentec5daf689279afeccad68f211e37994d64d4fb53 (diff)
parent9a319f5523517e9379b45f14692e7fc8f85c145f (diff)
downloadandroid_packages_apps_Calendar-4dcea88ce1c4653aaa1569d9d3bcb80b88c9de68.tar.gz
android_packages_apps_Calendar-4dcea88ce1c4653aaa1569d9d3bcb80b88c9de68.tar.bz2
android_packages_apps_Calendar-4dcea88ce1c4653aaa1569d9d3bcb80b88c9de68.zip
merge from open-source master
Change-Id: Ibd856b06b087b82635de7316f391d6066c3f11db
Diffstat (limited to 'src/com/android/calendar/EventInfoActivity.java')
-rw-r--r--src/com/android/calendar/EventInfoActivity.java3
1 files changed, 2 insertions, 1 deletions
diff --git a/src/com/android/calendar/EventInfoActivity.java b/src/com/android/calendar/EventInfoActivity.java
index f5536ee5..296359eb 100644
--- a/src/com/android/calendar/EventInfoActivity.java
+++ b/src/com/android/calendar/EventInfoActivity.java
@@ -335,7 +335,8 @@ public class EventInfoActivity extends Activity implements View.OnClickListener,
mCalendarOwnerAccount = "";
if (mCalendarsCursor != null) {
mCalendarsCursor.moveToFirst();
- mCalendarOwnerAccount = mCalendarsCursor.getString(CALENDARS_INDEX_OWNER_ACCOUNT);
+ String tempAccount = mCalendarsCursor.getString(CALENDARS_INDEX_OWNER_ACCOUNT);
+ mCalendarOwnerAccount = (tempAccount == null) ? "" : tempAccount;
mOrganizerCanRespond = mCalendarsCursor.getInt(CALENDARS_INDEX_OWNER_CAN_RESPOND) != 0;
String displayName = mCalendarsCursor.getString(CALENDARS_INDEX_DISPLAY_NAME);