summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorPaul Sliwowski <psliwowski@google.com>2013-07-23 15:49:24 -0700
committerPaul Sliwowski <psliwowski@google.com>2013-07-23 15:49:24 -0700
commitfbfbc73dd74c0855123b50b4fa1adb6bbb86a512 (patch)
tree218afbda12eb4ac28bb4554a35dd83859df6e3e8 /src
parentdc72665b57311a3f25ee6af07743e7c32aed754d (diff)
downloadandroid_packages_apps_Calendar-fbfbc73dd74c0855123b50b4fa1adb6bbb86a512.tar.gz
android_packages_apps_Calendar-fbfbc73dd74c0855123b50b4fa1adb6bbb86a512.tar.bz2
android_packages_apps_Calendar-fbfbc73dd74c0855123b50b4fa1adb6bbb86a512.zip
Fixed crash when changing recurrent event.
Bug: 9735508 Change-Id: I90eb878598b758bfe0dcbb5ea33dc315b08f4487
Diffstat (limited to 'src')
-rw-r--r--src/com/android/calendar/event/EditEventHelper.java3
1 files changed, 2 insertions, 1 deletions
diff --git a/src/com/android/calendar/event/EditEventHelper.java b/src/com/android/calendar/event/EditEventHelper.java
index d72ab5d3..c735e91e 100644
--- a/src/com/android/calendar/event/EditEventHelper.java
+++ b/src/com/android/calendar/event/EditEventHelper.java
@@ -1320,7 +1320,8 @@ public class EditEventHelper {
// Not weekly so nothing to worry about.
return;
}
- if (mEventRecurrence.byday.length > mEventRecurrence.bydayCount) {
+ if (mEventRecurrence.byday == null ||
+ mEventRecurrence.byday.length > mEventRecurrence.bydayCount) {
// This shouldn't happen, but just in case something is weird about the recurrence.
return;
}