diff options
author | Michael Chan <mchan@android.com> | 2012-12-07 09:35:13 -0800 |
---|---|---|
committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2012-12-07 09:35:14 -0800 |
commit | 6bad39e5ef80d30c441bea5dfda00a1341fb4685 (patch) | |
tree | 119758eb272e0c2e636b9a2410c2ce1ff6488dc7 | |
parent | ce2719263ef6cc77ea2c24d5cb8602c763a5c895 (diff) | |
parent | ae0a1002a66b13fcedffaa9561f3e9c92eb99f95 (diff) | |
download | Calendar-jb-mr1-dev-plus-aosp.tar.gz |
Merge "fix calendar crash when deleting events in agenda view"jb-mr1-dev-plus-aosp
-rw-r--r-- | src/com/android/calendar/AsyncQueryServiceHelper.java | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/src/com/android/calendar/AsyncQueryServiceHelper.java b/src/com/android/calendar/AsyncQueryServiceHelper.java index 36ee581b..615a779f 100644 --- a/src/com/android/calendar/AsyncQueryServiceHelper.java +++ b/src/com/android/calendar/AsyncQueryServiceHelper.java @@ -312,7 +312,14 @@ public class AsyncQueryServiceHelper extends IntentService { 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: |