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

Commit b3c49982 authored by Evan Millar's avatar Evan Millar
Browse files

Mimetypes in ContactsProvider2 shouldn't overlap with those in ContactsProvider 

This is necessary partly for general hygiene, but mostly because we need
to be able to determine based on the intent type what style URI to
return in the case of startActivityForResult().

Change-Id: Ib313d830b8646a70d5ac3ded11597af614429262
parent 52d6245b

core/java/android/provider/ContactsContract.java

+6 −5
Original line number Diff line number Diff line
@@ -991,13 +991,13 @@ public final class ContactsContract { 
            private Phone() {}



            /** MIME type used when storing this in data table. */

            public static final String CONTENT_ITEM_TYPE = "vnd.android.cursor.item/phone";

            public static final String CONTENT_ITEM_TYPE = "vnd.android.cursor.item/phone_v2";



            /**

             * The MIME type of {@link #CONTENT_URI} providing a directory of

             * phones.

             */

            public static final String CONTENT_TYPE = "vnd.android.cursor.dir/phone";

            public static final String CONTENT_TYPE = "vnd.android.cursor.dir/phone_v2";



            /**

             * The content:// style URI for all data records of the
@@ -1076,7 +1076,7 @@ public final class ContactsContract { 
            private Email() {}



            /** MIME type used when storing this in data table. */

            public static final String CONTENT_ITEM_TYPE = "vnd.android.cursor.item/email";

            public static final String CONTENT_ITEM_TYPE = "vnd.android.cursor.item/email_v2";



            /**

             * The content:// style URI for all data records of the
@@ -1114,13 +1114,14 @@ public final class ContactsContract { 
            }



            /** MIME type used when storing this in data table. */

            public static final String CONTENT_ITEM_TYPE = "vnd.android.cursor.item/postal-address";

            public static final String CONTENT_ITEM_TYPE =

                    "vnd.android.cursor.item/postal-address_v2";



            /**

             * The MIME type of {@link #CONTENT_URI} providing a directory of

             * postal addresses.

             */

            public static final String CONTENT_TYPE = "vnd.android.cursor.dir/postal-address";

            public static final String CONTENT_TYPE = "vnd.android.cursor.dir/postal-address_v2";



            /**

             * The content:// style URI for all data records of the