Calendar: Check if the duration is empty before parser it when delete the events

If the event end time is 0, it will calculate the end time by "duration"
string. But if the "duration" is null, it will lead the NullPointerException.

So check the duration string is empty or not before use it to get the end
time when delete the events.

CRs-Fixed: 650814

Change-Id: I97350db4103959b851367beae53f09200a2a29b8

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,