Merge "Fix bug #2772731 (Start deprecation of "url" Calendars column in favor of "eventsUrl" column)"

1 files changed, 2 insertions, 2 deletions

diff --git a/core/java/android/provider/Calendar.java b/core/java/android/provider/Calendar.java
index 1e96dae74398..74acb9861d5f 100644
--- a/core/java/android/provider/Calendar.java
+++ b/core/java/android/provider/Calendar.java
@@ -269,7 +269,6 @@ public final class Calendar {
                 DatabaseUtils.cursorLongToContentValuesIfPresent(cursor, cv, _SYNC_DIRTY);
                 DatabaseUtils.cursorLongToContentValuesIfPresent(cursor, cv, _SYNC_MARK);
 
-                DatabaseUtils.cursorStringToContentValuesIfPresent(cursor, cv, Calendars.URL);
                 DatabaseUtils.cursorStringToContentValuesIfPresent(cursor, cv, Calendars.SELF_URL);
                 DatabaseUtils.cursorStringToContentValuesIfPresent(cursor, cv,
                         Calendars.EDIT_URL);
@@ -849,7 +848,8 @@ public final class Calendar {
                 DatabaseUtils.cursorLongToContentValuesIfPresent(cursor, cv, _SYNC_DIRTY);
                 DatabaseUtils.cursorStringToContentValuesIfPresent(cursor, cv, _SYNC_VERSION);
                 DatabaseUtils.cursorIntToContentValuesIfPresent(cursor, cv, EventsColumns.DELETED);
-                DatabaseUtils.cursorStringToContentValuesIfPresent(cursor, cv, Calendars.URL);
+                DatabaseUtils.cursorStringToContentValuesIfPresent(cursor, cv,
+                        Calendars.EVENTS_URL);
 
                 Entity entity = new Entity(cv);
                 Cursor subCursor;