Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge into jb-mr1-dev

Browse Source 
Change-Id: Ie68309c7525b59f12b7bd22beb06ab5e5e4f05f5
This commit is contained in:
Jean-Baptiste Queru
2012-09-25 09:30:43 -07:00
parent fd5be7087b 4d6f90ea50
commit 1b24275976
2 changed files with 9 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
api/current.txt
View File

@@ -17305,6 +17305,7 @@ package android.provider {
field public static final java.lang.String SYNC_DATA8 = "sync_data8";
field public static final java.lang.String SYNC_DATA9 = "sync_data9";
field public static final java.lang.String TITLE = "title";
field public static final java.lang.String UID_2445 = "uid2445";
}
public static final class CalendarContract.EventsEntity implements android.provider.BaseColumns android.provider.CalendarContract.EventsColumns android.provider.CalendarContract.SyncColumns {

8
core/java/android/provider/CalendarContract.java
View File

@@ -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>