diff options
| author | Jean-Baptiste Queru <jbq@google.com> | 2012-09-25 09:30:43 -0700 |
|---|---|---|
| committer | Jean-Baptiste Queru <jbq@google.com> | 2012-09-25 09:31:15 -0700 |
| commit | 1b242759763205fa529591738cbe213fcc25150e (patch) | |
| tree | af08caf35b0c9f74c70e353fd95217c57c38983f /core/java/android/provider | |
| parent | fd5be7087be67adc0abc73ded5a0b72b025e2a80 (diff) | |
| parent | 4d6f90ea503c65009b47881ed117f8c15c660cc0 (diff) | |
| download | frameworks_base-1b242759763205fa529591738cbe213fcc25150e.zip frameworks_base-1b242759763205fa529591738cbe213fcc25150e.tar.gz frameworks_base-1b242759763205fa529591738cbe213fcc25150e.tar.bz2 | |
Merge into jb-mr1-dev
Change-Id: Ie68309c7525b59f12b7bd22beb06ab5e5e4f05f5
Diffstat (limited to 'core/java/android/provider')
| -rw-r--r-- | core/java/android/provider/CalendarContract.java | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/core/java/android/provider/CalendarContract.java b/core/java/android/provider/CalendarContract.java index fd0324b..af6e88e9 100644 --- a/core/java/android/provider/CalendarContract.java +++ b/core/java/android/provider/CalendarContract.java @@ -1245,6 +1245,12 @@ public final class CalendarContract { */ public static final String CUSTOM_APP_URI = "customAppUri"; + /** + * The UID for events added from the RFC 2445 iCalendar format. + * Column name. + * <P>Type: TEXT</P> + */ + public static final String UID_2445 = "uid2445"; } /** @@ -1382,6 +1388,7 @@ public final class CalendarContract { DatabaseUtils.cursorIntToContentValuesIfPresent(cursor, cv, GUESTS_CAN_SEE_GUESTS); DatabaseUtils.cursorStringToContentValuesIfPresent(cursor, cv, CUSTOM_APP_PACKAGE); DatabaseUtils.cursorStringToContentValuesIfPresent(cursor, cv, CUSTOM_APP_URI); + DatabaseUtils.cursorStringToContentValuesIfPresent(cursor, cv, UID_2445); DatabaseUtils.cursorStringToContentValuesIfPresent(cursor, cv, ORGANIZER); DatabaseUtils.cursorStringToContentValuesIfPresent(cursor, cv, IS_ORGANIZER); DatabaseUtils.cursorStringToContentValuesIfPresent(cursor, cv, _SYNC_ID); @@ -1587,6 +1594,7 @@ public final class CalendarContract { * <li>{@link #GUESTS_CAN_SEE_GUESTS}</li> * <li>{@link #CUSTOM_APP_PACKAGE}</li> * <li>{@link #CUSTOM_APP_URI}</li> + * <li>{@link #UID_2445}</li> * </ul> * The following Events columns are writable only by a sync adapter * <ul> |