commit 550cfa4e2ebb03ec0f28b8bbfd466eef8811ef74
author Marc Blank <mblank@google.com> Mon Mar 01 16:18:40 2010 -0800
committer Android (Google) Code Review <android-gerrit@google.com> Mon Mar 01 16:18:40 2010 -0800
tree fc301d62e72740601726d08cf3e42a33b653ccd7
parent 9e318a560b6a56e4d8e1a4b2c89cf5d5a922254b
parent c12fe4704e12519756b8da1a3f9199f2013e48f0

Merge "Handle rename of _SYNC_LOCAL_ID to _SYNC_DATA in Calendar"

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 182b953..4cec5e0 100644
--- a/src/com/android/providers/calendar/CalendarDatabaseHelper.java
+++ b/src/com/android/providers/calendar/CalendarDatabaseHelper.java
@@ -885,8 +885,8 @@
                 + " AS " + Calendar.Events._SYNC_ACCOUNT_TYPE + ","
                 + Tables.EVENTS + "." + Calendar.Events._SYNC_TIME
                 + " AS " + Calendar.Events._SYNC_TIME + ","
-                + Tables.EVENTS + "." + Calendar.Events._SYNC_LOCAL_ID
-                + " AS " + Calendar.Events._SYNC_LOCAL_ID + ","
+                + Tables.EVENTS + "." + Calendar.Events._SYNC_DATA
+                + " AS " + Calendar.Events._SYNC_DATA + ","
                 + Calendar.Calendars.URL + ","
                 + Calendar.Calendars.OWNER_ACCOUNT + ","
                 + Calendar.Calendars.SYNC_EVENTS

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 9bf32f0..784f149 100644
--- a/src/com/android/providers/calendar/CalendarProvider2.java
+++ b/src/com/android/providers/calendar/CalendarProvider2.java
@@ -3001,7 +3001,7 @@
         sEventsProjectionMap.put(Events._SYNC_ID, "_sync_id");
         sEventsProjectionMap.put(Events._SYNC_VERSION, "_sync_version");
         sEventsProjectionMap.put(Events._SYNC_TIME, "_sync_time");
-        sEventsProjectionMap.put(Events._SYNC_LOCAL_ID, "_sync_local_id");
+        sEventsProjectionMap.put(Events._SYNC_DATA, "_sync_local_id");
         sEventsProjectionMap.put(Events._SYNC_DIRTY, "_sync_dirty");
         sEventsProjectionMap.put(Events._SYNC_ACCOUNT, "_sync_account");
         sEventsProjectionMap.put(Events._SYNC_ACCOUNT_TYPE,
@@ -3041,7 +3041,7 @@
         sEventEntitiesProjectionMap.put(Events.DELETED, "deleted");
         sEventEntitiesProjectionMap.put(Events._ID, Events._ID);
         sEventEntitiesProjectionMap.put(Events._SYNC_ID, Events._SYNC_ID);
-        sEventEntitiesProjectionMap.put(Events._SYNC_LOCAL_ID, Events._SYNC_LOCAL_ID);
+        sEventEntitiesProjectionMap.put(Events._SYNC_DATA, Events._SYNC_DATA);
         sEventEntitiesProjectionMap.put(Events._SYNC_VERSION, Events._SYNC_VERSION);
         sEventEntitiesProjectionMap.put(Events._SYNC_DIRTY, Events._SYNC_DIRTY);
         sEventEntitiesProjectionMap.put(Calendars.URL, "url");