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

Commit 7ba4751e authored by Brian Attwell's avatar Brian Attwell Committed by Android (Google) Code Review
Browse files

Merge "Add Insert.EXTRA_{ACCOUNT,DATA_SET} to API. P #1/2"

parents cd4c8525 63f859b2

api/current.txt

+2 −0
Original line number Diff line number Diff line
@@ -24813,6 +24813,8 @@ package android.provider { 
    field public static final java.lang.String EMAIL = "email";

    field public static final java.lang.String EMAIL_ISPRIMARY = "email_isprimary";

    field public static final java.lang.String EMAIL_TYPE = "email_type";

    field public static final java.lang.String EXTRA_ACCOUNT = "android.provider.extra.ACCOUNT";

    field public static final java.lang.String EXTRA_DATA_SET = "android.provider.extra.DATA_SET";

    field public static final java.lang.String FULL_MODE = "full_mode";

    field public static final java.lang.String IM_HANDLE = "im_handle";

    field public static final java.lang.String IM_ISPRIMARY = "im_isprimary";

api/system-current.txt

+2 −0
Original line number Diff line number Diff line
@@ -26402,6 +26402,8 @@ package android.provider { 
    field public static final java.lang.String EMAIL = "email";

    field public static final java.lang.String EMAIL_ISPRIMARY = "email_isprimary";

    field public static final java.lang.String EMAIL_TYPE = "email_type";

    field public static final java.lang.String EXTRA_ACCOUNT = "android.provider.extra.ACCOUNT";

    field public static final java.lang.String EXTRA_DATA_SET = "android.provider.extra.DATA_SET";

    field public static final java.lang.String FULL_MODE = "full_mode";

    field public static final java.lang.String IM_HANDLE = "im_handle";

    field public static final java.lang.String IM_ISPRIMARY = "im_isprimary";

core/java/android/provider/ContactsContract.java

+2 −6
Original line number Diff line number Diff line
@@ -8709,10 +8709,8 @@ public final class ContactsContract { 
             * dialog to chose an account

             * <p>

             * Type: {@link Account}

             *

             * @hide

             */

            public static final String ACCOUNT = "com.android.contacts.extra.ACCOUNT";

            public static final String EXTRA_ACCOUNT = "android.provider.extra.ACCOUNT";



            /**

             * Used to specify the data set within the account in which to create the
@@ -8722,10 +8720,8 @@ public final class ContactsContract { 
             * created in the base account, with no data set.

             * <p>

             * Type: String

             *

             * @hide

             */

            public static final String DATA_SET = "com.android.contacts.extra.DATA_SET";

            public static final String EXTRA_DATA_SET = "android.provider.extra.DATA_SET";

        }

    }

}