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

Commit 1634d936 authored by Ken Shirriff's avatar Ken Shirriff Committed by Android Git Automerger
Browse files

am f30a19aa: am ba8e4d24: Merge change Ib5343691 into eclair-mr2 

Merge commit 'f30a19aa'

* commit 'f30a19aa':
  Add account name / type query parameters for calendar Events.
parents 6015f4e0 f30a19aa

core/java/android/provider/Calendar.java

+14 −0
Original line number Diff line number Diff line
@@ -583,6 +583,20 @@ public final class Calendar { 
         */

        public static final Uri CONTENT_URI = Uri.parse("content://calendar/event_entities");



        /**

         * The name of the account instance to which this row belongs, which when paired with

         * {@link #ACCOUNT_TYPE} identifies a specific account.

         * <P>Type: TEXT</P>

         */

        public static final String ACCOUNT_NAME = "account_name";



        /**

         * The type of account to which this row belongs, which when paired with

         * {@link #ACCOUNT_NAME} identifies a specific account.

         * <P>Type: TEXT</P>

         */

        public static final String ACCOUNT_TYPE = "account_type";



        public static EntityIterator newEntityIterator(Cursor cursor, ContentResolver resolver) {

            return new EntityIteratorImpl(cursor, resolver);

        }