summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSam Blitzstein <sblitz@google.com>2013-04-02 16:13:25 -0700
committerSam Blitzstein <sblitz@google.com>2013-04-02 16:39:00 -0700
commit523cc4846b045c51d70ae59c9b66bc232eac807a (patch)
tree7b7bf474560d9b72315c342b7bb1f5f6ba91feec
parent49bd484164cdb20168cd8e51297ac158d58ac9dc (diff)
downloadandroid_packages_apps_Calendar-523cc4846b045c51d70ae59c9b66bc232eac807a.tar.gz
android_packages_apps_Calendar-523cc4846b045c51d70ae59c9b66bc232eac807a.tar.bz2
android_packages_apps_Calendar-523cc4846b045c51d70ae59c9b66bc232eac807a.zip
Fix for crashing on rotation with no reminders.
Bug: 8424377 Change-Id: Idcfe8480226b42b100ae3ef6f49dd764f4149801
-rw-r--r--src/com/android/calendar/event/EditEventFragment.java7
1 files changed, 6 insertions, 1 deletions
diff --git a/src/com/android/calendar/event/EditEventFragment.java b/src/com/android/calendar/event/EditEventFragment.java
index 0c9424a9..ff35e5a1 100644
--- a/src/com/android/calendar/event/EditEventFragment.java
+++ b/src/com/android/calendar/event/EditEventFragment.java
@@ -223,7 +223,12 @@ public class EditEventFragment extends Fragment implements EventHandler, OnColor
EditEventHelper.REMINDERS_WHERE /* selection */,
remArgs /* selection args */, null /* sort order */);
} else {
- Collections.sort(mReminders);
+ if (mReminders == null) {
+ // mReminders should not be null.
+ mReminders = new ArrayList<ReminderEntry>();
+ } else {
+ Collections.sort(mReminders);
+ }
mOriginalModel.mReminders = mReminders;
mModel.mReminders =
(ArrayList<ReminderEntry>) mReminders.clone();