Merge "Fix crash when inserting reminder/attendee/extended property to a non-existent event" into mnc-dev

1 files changed, 5 insertions, 14 deletions

diff --git a/src/com/android/providers/calendar/CalendarDatabaseHelper.java b/src/com/android/providers/calendar/CalendarDatabaseHelper.java
index 407e21a..bb979c6 100644
--- a/src/com/android/providers/calendar/CalendarDatabaseHelper.java
+++ b/src/com/android/providers/calendar/CalendarDatabaseHelper.java
@@ -3368,21 +3368,12 @@ import java.util.TimeZone;
      */
     protected void duplicateEvent(final long id) {
         final SQLiteDatabase db = getWritableDatabase();
-        try {
-            final long canPartiallyUpdate = DatabaseUtils.longForQuery(db, "SELECT "
-                    + Calendars.CAN_PARTIALLY_UPDATE + " FROM " + Views.EVENTS
-                    + " WHERE " + Events._ID + " = ?", new String[] {
+        final long canPartiallyUpdate = DatabaseUtils.longForQuery(db, "SELECT "
+                + Calendars.CAN_PARTIALLY_UPDATE + " FROM " + Views.EVENTS
+                + " WHERE " + Events._ID + " = ?", new String[]{
                 String.valueOf(id)
-            });
-            if (canPartiallyUpdate == 0) {
-                return;
-            }
-        } catch (SQLiteDoneException e) {
-            // b/11392862
-            // If no results are returned, this will be thrown. This can happen if the Events View
-            // has no rows for the provided id. This might happen for example if someone inserts a
-            // reminder that refers to a non existent event id.
-            // Return without doing anything because there is no event to duplicate.
+        });
+        if (canPartiallyUpdate == 0) {
             return;
         }