commit c874ed5c6cc0fcc6ac06ae7d20db0eab7d749608
author Ken Shirriff <kens@google.com> Thu Feb 11 14:58:50 2010 -0800
committer Ken Shirriff <kens@google.com> Thu Feb 11 17:02:00 2010 -0800
tree 592cf2b8a7bd5a2e99455a5663a1b77d8b4bf164
parent dbaad88527665d5144a8a178fa822f58d2bc7d05

Fix instance expansion.

Was getting a constraint violation due to using insert instead of replace.
bug 2439297

src/com/android/providers/calendar/CalendarDatabaseHelper.java

diff --git a/src/com/android/providers/calendar/CalendarDatabaseHelper.java b/src/com/android/providers/calendar/CalendarDatabaseHelper.java
index aa2e5f5..fcb6751 100644
--- a/src/com/android/providers/calendar/CalendarDatabaseHelper.java
+++ b/src/com/android/providers/calendar/CalendarDatabaseHelper.java
@@ -86,6 +86,10 @@
         return mInstancesInserter.insert(values);
     }
 
+    public long instancesReplace(ContentValues values) {
+        return mInstancesInserter.replace(values);
+    }
+
     public long attendeesInsert(ContentValues values) {
         return mAttendeesInserter.insert(values);
     }

src/com/android/providers/calendar/CalendarProvider2.java

diff --git a/src/com/android/providers/calendar/CalendarProvider2.java b/src/com/android/providers/calendar/CalendarProvider2.java
index 2a5965f..95b8296 100644
--- a/src/com/android/providers/calendar/CalendarProvider2.java
+++ b/src/com/android/providers/calendar/CalendarProvider2.java
@@ -1279,7 +1279,7 @@
                 values.remove(Events.ORIGINAL_INSTANCE_TIME);
                 values.remove(Events.STATUS);
 
-                mDbHelper.instancesInsert(values);
+                mDbHelper.instancesReplace(values);
             }
         }
     }