diff options
| author | Fabrice Di Meglio <fdimeglio@google.com> | 2010-11-09 16:13:22 -0800 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2010-11-09 16:13:22 -0800 |
| commit | c184a0b9be120964a9e00266541aea481e0caf13 (patch) | |
| tree | 50cb69a737c75180b9de3cb37ca4b58dfe44b5f8 /core | |
| parent | 2d5cae8cda1a1703c8694024445374baa39082b5 (diff) | |
| parent | 2c410a18fc270eb23007add19834b174af4de7c4 (diff) | |
| download | frameworks_base-c184a0b9be120964a9e00266541aea481e0caf13.zip frameworks_base-c184a0b9be120964a9e00266541aea481e0caf13.tar.gz frameworks_base-c184a0b9be120964a9e00266541aea481e0caf13.tar.bz2 | |
Merge "Fix bug #1776278 (consider supplying our own (unique) eid for calendar entries created on the device)"
Diffstat (limited to 'core')
| -rw-r--r-- | core/java/android/provider/Calendar.java | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/core/java/android/provider/Calendar.java b/core/java/android/provider/Calendar.java index 88ce0f0..c007605 100644 --- a/core/java/android/provider/Calendar.java +++ b/core/java/android/provider/Calendar.java @@ -861,6 +861,8 @@ public final class Calendar { DatabaseUtils.cursorStringToContentValuesIfPresent(cursor, cv, _SYNC_VERSION); DatabaseUtils.cursorIntToContentValuesIfPresent(cursor, cv, EventsColumns.DELETED); DatabaseUtils.cursorStringToContentValuesIfPresent(cursor, cv, Calendars.SYNC1); + DatabaseUtils.cursorStringToContentValuesIfPresent(cursor, cv, + Events.SYNC_ADAPTER_DATA); Entity entity = new Entity(cv); Cursor subCursor; |