commit 6bad39e5ef80d30c441bea5dfda00a1341fb4685
author Michael Chan <mchan@android.com> Fri Dec 07 09:35:13 2012 -0800
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Fri Dec 07 09:35:14 2012 -0800
tree 119758eb272e0c2e636b9a2410c2ce1ff6488dc7
parent ce2719263ef6cc77ea2c24d5cb8602c763a5c895
parent ae0a1002a66b13fcedffaa9561f3e9c92eb99f95

Merge "fix calendar crash when deleting events in agenda view"

src/com/android/calendar/AsyncQueryServiceHelper.java

diff --git a/src/com/android/calendar/AsyncQueryServiceHelper.java b/src/com/android/calendar/AsyncQueryServiceHelper.java
index 36ee581..615a779 100644
--- a/src/com/android/calendar/AsyncQueryServiceHelper.java
+++ b/src/com/android/calendar/AsyncQueryServiceHelper.java
@@ -312,7 +312,14 @@
                     break;
 
                 case Operation.EVENT_ARG_DELETE:
-                    args.result = resolver.delete(args.uri, args.selection, args.selectionArgs);
+                    try {
+                        args.result = resolver.delete(args.uri, args.selection, args.selectionArgs);
+                    } catch (IllegalArgumentException e) {
+                        Log.w(TAG, "Delete failed.");
+                        Log.w(TAG, e.toString());
+                        args.result = 0;
+                    }
+
                     break;
 
                 case Operation.EVENT_ARG_BATCH: