Skip to content

Commit 1b24275

Browse files
author
Jean-Baptiste Queru
committed
Merge into jb-mr1-dev
Change-Id: Ie68309c7525b59f12b7bd22beb06ab5e5e4f05f5
2 parents fd5be70 + 4d6f90e commit 1b24275

File tree

2 files changed

+9
-0
lines changed

2 files changed

+9
-0
lines changed

api/current.txt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17305,6 +17305,7 @@ package android.provider {
1730517305
field public static final java.lang.String SYNC_DATA8 = "sync_data8";
1730617306
field public static final java.lang.String SYNC_DATA9 = "sync_data9";
1730717307
field public static final java.lang.String TITLE = "title";
17308+
field public static final java.lang.String UID_2445 = "uid2445";
1730817309
}
1730917310

1731017311
public static final class CalendarContract.EventsEntity implements android.provider.BaseColumns android.provider.CalendarContract.EventsColumns android.provider.CalendarContract.SyncColumns {

core/java/android/provider/CalendarContract.java

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1245,6 +1245,12 @@ protected interface EventsColumns {
12451245
*/
12461246
public static final String CUSTOM_APP_URI = "customAppUri";
12471247

1248+
/**
1249+
* The UID for events added from the RFC 2445 iCalendar format.
1250+
* Column name.
1251+
* <P>Type: TEXT</P>
1252+
*/
1253+
public static final String UID_2445 = "uid2445";
12481254
}
12491255

12501256
/**
@@ -1382,6 +1388,7 @@ public Entity getEntityAndIncrementCursor(Cursor cursor) throws RemoteException
13821388
DatabaseUtils.cursorIntToContentValuesIfPresent(cursor, cv, GUESTS_CAN_SEE_GUESTS);
13831389
DatabaseUtils.cursorStringToContentValuesIfPresent(cursor, cv, CUSTOM_APP_PACKAGE);
13841390
DatabaseUtils.cursorStringToContentValuesIfPresent(cursor, cv, CUSTOM_APP_URI);
1391+
DatabaseUtils.cursorStringToContentValuesIfPresent(cursor, cv, UID_2445);
13851392
DatabaseUtils.cursorStringToContentValuesIfPresent(cursor, cv, ORGANIZER);
13861393
DatabaseUtils.cursorStringToContentValuesIfPresent(cursor, cv, IS_ORGANIZER);
13871394
DatabaseUtils.cursorStringToContentValuesIfPresent(cursor, cv, _SYNC_ID);
@@ -1587,6 +1594,7 @@ public Entity getEntityAndIncrementCursor(Cursor cursor) throws RemoteException
15871594
* <li>{@link #GUESTS_CAN_SEE_GUESTS}</li>
15881595
* <li>{@link #CUSTOM_APP_PACKAGE}</li>
15891596
* <li>{@link #CUSTOM_APP_URI}</li>
1597+
* <li>{@link #UID_2445}</li>
15901598
* </ul>
15911599
* The following Events columns are writable only by a sync adapter
15921600
* <ul>

0 commit comments

Comments
 (0)