b/2519327 Added check for null cursor

Monkey was causing a query to be canceled which returned a null cursor.

Change-Id: I42941cfa42245800c9a9e7463a1509daa98c3239

diff --git a/src/com/android/calendar/EditEvent.java b/src/com/android/calendar/EditEvent.java
index 2fb2d9b..9657224 100644 (file)
--- a/src/com/android/calendar/EditEvent.java
+++ b/src/com/android/calendar/EditEvent.java
@@ -503,6 +503,11 @@ public class EditEvent extends Activity implements View.OnClickListener,
 
         @Override
         protected void onQueryComplete(int token, Object cookie, Cursor cursor) {
+            // If the query didn't return a cursor for some reason return
+            if (cursor == null) {
+                return;
+            }
+
             // If the Activity is finishing, then close the cursor.
             // Otherwise, use the new cursor in the adapter.
             if (isFinishing()) {