summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/com/android/calendar/DeleteEventsActivity.java15
1 files changed, 9 insertions, 6 deletions
diff --git a/src/com/android/calendar/DeleteEventsActivity.java b/src/com/android/calendar/DeleteEventsActivity.java
index f763675c..02a597e5 100644
--- a/src/com/android/calendar/DeleteEventsActivity.java
+++ b/src/com/android/calendar/DeleteEventsActivity.java
@@ -315,12 +315,15 @@ public class DeleteEventsActivity extends ListActivity
// if DTEND invalid, check for duration
if (end == 0) {
String durationStr = cursor.getString(cursor.getColumnIndex(Events.DURATION));
- Duration duration = new Duration();
- try {
- duration.parse(durationStr);
- end = start + duration.getMillis();
- } catch (DateException e) {
- Log.w(TAG, e.getLocalizedMessage());
+ if (durationStr != null) {
+ Duration duration = new Duration();
+
+ try {
+ duration.parse(durationStr);
+ end = start + duration.getMillis();
+ } catch (DateException e) {
+ Log.w(TAG, e.getLocalizedMessage());
+ }
}
}
if (DEBUG) Log.v(TAG,