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

Commit 03fbd24e authored by Sara Ting's avatar Sara Ting Committed by Android Git Automerger
Browse files

am 696608fd: am db8f10ad: Merge "Adding support for new \'uid2445\' column in... 

am 696608fd: am db8f10ad: Merge "Adding support for new \'uid2445\' column in Calendar\'s Events table." into jb-mr1-dev

* commit '696608fd':
  Adding support for new 'uid2445' column in Calendar's Events table.
parents c1f1c79a 696608fd

api/current.txt

+1 −0
Original line number Original line Diff line number Diff line
@@ -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_DATA8 = "sync_data8";

    field public static final java.lang.String SYNC_DATA9 = "sync_data9";

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







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

























core/java/android/provider/CalendarContract.java



+8
−0




























Original line number
Original line
Diff line number
Diff line








@@ -1245,6 +1245,12 @@ public final class CalendarContract {









         */







         */











        public static final String CUSTOM_APP_URI = "customAppUri";







        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.cursorIntToContentValuesIfPresent(cursor, cv, GUESTS_CAN_SEE_GUESTS);











                DatabaseUtils.cursorStringToContentValuesIfPresent(cursor, cv, CUSTOM_APP_PACKAGE);







                DatabaseUtils.cursorStringToContentValuesIfPresent(cursor, cv, CUSTOM_APP_PACKAGE);











                DatabaseUtils.cursorStringToContentValuesIfPresent(cursor, cv, CUSTOM_APP_URI);







                DatabaseUtils.cursorStringToContentValuesIfPresent(cursor, cv, CUSTOM_APP_URI);














                DatabaseUtils.cursorStringToContentValuesIfPresent(cursor, cv, UID_2445);











                DatabaseUtils.cursorStringToContentValuesIfPresent(cursor, cv, ORGANIZER);







                DatabaseUtils.cursorStringToContentValuesIfPresent(cursor, cv, ORGANIZER);











                DatabaseUtils.cursorStringToContentValuesIfPresent(cursor, cv, IS_ORGANIZER);







                DatabaseUtils.cursorStringToContentValuesIfPresent(cursor, cv, IS_ORGANIZER);











                DatabaseUtils.cursorStringToContentValuesIfPresent(cursor, cv, _SYNC_ID);







                DatabaseUtils.cursorStringToContentValuesIfPresent(cursor, cv, _SYNC_ID);










@@ -1587,6 +1594,7 @@ public final class CalendarContract {









     * <li>{@link #GUESTS_CAN_SEE_GUESTS}</li>







     * <li>{@link #GUESTS_CAN_SEE_GUESTS}</li>











     * <li>{@link #CUSTOM_APP_PACKAGE}</li>







     * <li>{@link #CUSTOM_APP_PACKAGE}</li>











     * <li>{@link #CUSTOM_APP_URI}</li>







     * <li>{@link #CUSTOM_APP_URI}</li>














     * <li>{@link #UID_2445}</li>











     * </ul>







     * </ul>











     * The following Events columns are writable only by a sync adapter







     * The following Events columns are writable only by a sync adapter











     * <ul>







     * <ul>