Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 2f7a247c authored by Fabrice Di Meglio's avatar Fabrice Di Meglio Committed by Android (Google) Code Review
Browse files

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

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

core/java/android/provider/Calendar.java

+2 −2
Original line number Diff line number Diff line
@@ -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;