am f4c289dc: Merge "ContactsContract API changes" into lmp-dev (954f358f) · Commits · e / os / android_frameworks_base

api/current.txt

+58 −8

Original line number	Diff line number	Diff line
		@@ -24335,8 +24335,11 @@ package android.provider {

		public static final class ContactsContract.CommonDataKinds.Callable implements android.provider.ContactsContract.CommonDataKinds.CommonColumns android.provider.ContactsContract.DataColumnsWithJoins {
		ctor public ContactsContract.CommonDataKinds.Callable();
		field public static final java.lang.String ADDRESS_BOOK_INDEX_EXTRAS = "address_book_index_extras";
		field public static final android.net.Uri CONTENT_FILTER_URI;
		field public static final android.net.Uri CONTENT_URI;
		field public static final java.lang.String EXTRA_ADDRESS_BOOK_INDEX_COUNTS = "address_book_index_counts";
		field public static final java.lang.String EXTRA_ADDRESS_BOOK_INDEX_TITLES = "address_book_index_titles";
		}

		protected static abstract interface ContactsContract.CommonDataKinds.CommonColumns implements android.provider.ContactsContract.CommonDataKinds.BaseTypes {
		@@ -24347,8 +24350,11 @@ package android.provider {

		public static final class ContactsContract.CommonDataKinds.Contactables implements android.provider.ContactsContract.CommonDataKinds.CommonColumns android.provider.ContactsContract.DataColumnsWithJoins {
		ctor public ContactsContract.CommonDataKinds.Contactables();
		field public static final java.lang.String ADDRESS_BOOK_INDEX_EXTRAS = "address_book_index_extras";
		field public static final android.net.Uri CONTENT_FILTER_URI;
		field public static final android.net.Uri CONTENT_URI;
		field public static final java.lang.String EXTRA_ADDRESS_BOOK_INDEX_COUNTS = "address_book_index_counts";
		field public static final java.lang.String EXTRA_ADDRESS_BOOK_INDEX_TITLES = "address_book_index_titles";
		field public static final java.lang.String VISIBLE_CONTACTS_ONLY = "visible_contacts_only";
		}

		@@ -24356,12 +24362,15 @@ package android.provider {
		method public static final java.lang.CharSequence getTypeLabel(android.content.res.Resources, int, java.lang.CharSequence);
		method public static final int getTypeLabelResource(int);
		field public static final java.lang.String ADDRESS = "data1";
		field public static final java.lang.String ADDRESS_BOOK_INDEX_EXTRAS = "address_book_index_extras";
		field public static final android.net.Uri CONTENT_FILTER_URI;
		field public static final java.lang.String CONTENT_ITEM_TYPE = "vnd.android.cursor.item/email_v2";
		field public static final android.net.Uri CONTENT_LOOKUP_URI;
		field public static final java.lang.String CONTENT_TYPE = "vnd.android.cursor.dir/email_v2";
		field public static final android.net.Uri CONTENT_URI;
		field public static final java.lang.String DISPLAY_NAME = "data4";
		field public static final java.lang.String EXTRA_ADDRESS_BOOK_INDEX_COUNTS = "address_book_index_counts";
		field public static final java.lang.String EXTRA_ADDRESS_BOOK_INDEX_TITLES = "address_book_index_titles";
		field public static final int TYPE_HOME = 1; // 0x1
		field public static final int TYPE_MOBILE = 4; // 0x4
		field public static final int TYPE_OTHER = 3; // 0x3
		@@ -24371,7 +24380,10 @@ package android.provider {
		public static final class ContactsContract.CommonDataKinds.Event implements android.provider.ContactsContract.CommonDataKinds.CommonColumns android.provider.ContactsContract.DataColumnsWithJoins {
		method public static final java.lang.CharSequence getTypeLabel(android.content.res.Resources, int, java.lang.CharSequence);
		method public static int getTypeResource(java.lang.Integer);
		field public static final java.lang.String ADDRESS_BOOK_INDEX_EXTRAS = "address_book_index_extras";
		field public static final java.lang.String CONTENT_ITEM_TYPE = "vnd.android.cursor.item/contact_event";
		field public static final java.lang.String EXTRA_ADDRESS_BOOK_INDEX_COUNTS = "address_book_index_counts";
		field public static final java.lang.String EXTRA_ADDRESS_BOOK_INDEX_TITLES = "address_book_index_titles";
		field public static final java.lang.String START_DATE = "data1";
		field public static final int TYPE_ANNIVERSARY = 1; // 0x1
		field public static final int TYPE_BIRTHDAY = 3; // 0x3
		@@ -24379,13 +24391,19 @@ package android.provider {
		}

		public static final class ContactsContract.CommonDataKinds.GroupMembership implements android.provider.ContactsContract.DataColumnsWithJoins {
		field public static final java.lang.String ADDRESS_BOOK_INDEX_EXTRAS = "address_book_index_extras";
		field public static final java.lang.String CONTENT_ITEM_TYPE = "vnd.android.cursor.item/group_membership";
		field public static final java.lang.String EXTRA_ADDRESS_BOOK_INDEX_COUNTS = "address_book_index_counts";
		field public static final java.lang.String EXTRA_ADDRESS_BOOK_INDEX_TITLES = "address_book_index_titles";
		field public static final java.lang.String GROUP_ROW_ID = "data1";
		field public static final java.lang.String GROUP_SOURCE_ID = "group_sourceid";
		}

		public static final class ContactsContract.CommonDataKinds.Identity implements android.provider.ContactsContract.DataColumnsWithJoins {
		field public static final java.lang.String ADDRESS_BOOK_INDEX_EXTRAS = "address_book_index_extras";
		field public static final java.lang.String CONTENT_ITEM_TYPE = "vnd.android.cursor.item/identity";
		field public static final java.lang.String EXTRA_ADDRESS_BOOK_INDEX_COUNTS = "address_book_index_counts";
		field public static final java.lang.String EXTRA_ADDRESS_BOOK_INDEX_TITLES = "address_book_index_titles";
		field public static final java.lang.String IDENTITY = "data1";
		field public static final java.lang.String NAMESPACE = "data2";
		}
		@@ -24395,8 +24413,11 @@ package android.provider {
		method public static final int getProtocolLabelResource(int);
		method public static final java.lang.CharSequence getTypeLabel(android.content.res.Resources, int, java.lang.CharSequence);
		method public static final int getTypeLabelResource(int);
		field public static final java.lang.String ADDRESS_BOOK_INDEX_EXTRAS = "address_book_index_extras";
		field public static final java.lang.String CONTENT_ITEM_TYPE = "vnd.android.cursor.item/im";
		field public static final java.lang.String CUSTOM_PROTOCOL = "data6";
		field public static final java.lang.String EXTRA_ADDRESS_BOOK_INDEX_COUNTS = "address_book_index_counts";
		field public static final java.lang.String EXTRA_ADDRESS_BOOK_INDEX_TITLES = "address_book_index_titles";
		field public static final java.lang.String PROTOCOL = "data5";
		field public static final int PROTOCOL_AIM = 0; // 0x0
		field public static final int PROTOCOL_CUSTOM = -1; // 0xffffffff
		@@ -24414,7 +24435,10 @@ package android.provider {
		}

		public static final class ContactsContract.CommonDataKinds.Nickname implements android.provider.ContactsContract.CommonDataKinds.CommonColumns android.provider.ContactsContract.DataColumnsWithJoins {
		field public static final java.lang.String ADDRESS_BOOK_INDEX_EXTRAS = "address_book_index_extras";
		field public static final java.lang.String CONTENT_ITEM_TYPE = "vnd.android.cursor.item/nickname";
		field public static final java.lang.String EXTRA_ADDRESS_BOOK_INDEX_COUNTS = "address_book_index_counts";
		field public static final java.lang.String EXTRA_ADDRESS_BOOK_INDEX_TITLES = "address_book_index_titles";
		field public static final java.lang.String NAME = "data1";
		field public static final int TYPE_DEFAULT = 1; // 0x1
		field public static final int TYPE_INITIALS = 5; // 0x5
		@@ -24425,16 +24449,22 @@ package android.provider {
		}

		public static final class ContactsContract.CommonDataKinds.Note implements android.provider.ContactsContract.DataColumnsWithJoins {
		field public static final java.lang.String ADDRESS_BOOK_INDEX_EXTRAS = "address_book_index_extras";
		field public static final java.lang.String CONTENT_ITEM_TYPE = "vnd.android.cursor.item/note";
		field public static final java.lang.String EXTRA_ADDRESS_BOOK_INDEX_COUNTS = "address_book_index_counts";
		field public static final java.lang.String EXTRA_ADDRESS_BOOK_INDEX_TITLES = "address_book_index_titles";
		field public static final java.lang.String NOTE = "data1";
		}

		public static final class ContactsContract.CommonDataKinds.Organization implements android.provider.ContactsContract.CommonDataKinds.CommonColumns android.provider.ContactsContract.DataColumnsWithJoins {
		method public static final java.lang.CharSequence getTypeLabel(android.content.res.Resources, int, java.lang.CharSequence);
		method public static final int getTypeLabelResource(int);
		field public static final java.lang.String ADDRESS_BOOK_INDEX_EXTRAS = "address_book_index_extras";
		field public static final java.lang.String COMPANY = "data1";
		field public static final java.lang.String CONTENT_ITEM_TYPE = "vnd.android.cursor.item/organization";
		field public static final java.lang.String DEPARTMENT = "data5";
		field public static final java.lang.String EXTRA_ADDRESS_BOOK_INDEX_COUNTS = "address_book_index_counts";
		field public static final java.lang.String EXTRA_ADDRESS_BOOK_INDEX_TITLES = "address_book_index_titles";
		field public static final java.lang.String JOB_DESCRIPTION = "data6";
		field public static final java.lang.String OFFICE_LOCATION = "data9";
		field public static final java.lang.String PHONETIC_NAME = "data8";
		@@ -24447,10 +24477,13 @@ package android.provider {
		public static final class ContactsContract.CommonDataKinds.Phone implements android.provider.ContactsContract.CommonDataKinds.CommonColumns android.provider.ContactsContract.DataColumnsWithJoins {
		method public static final java.lang.CharSequence getTypeLabel(android.content.res.Resources, int, java.lang.CharSequence);
		method public static final int getTypeLabelResource(int);
		field public static final java.lang.String ADDRESS_BOOK_INDEX_EXTRAS = "address_book_index_extras";
		field public static final android.net.Uri CONTENT_FILTER_URI;
		field public static final java.lang.String CONTENT_ITEM_TYPE = "vnd.android.cursor.item/phone_v2";
		field public static final java.lang.String CONTENT_TYPE = "vnd.android.cursor.dir/phone_v2";
		field public static final android.net.Uri CONTENT_URI;
		field public static final java.lang.String EXTRA_ADDRESS_BOOK_INDEX_COUNTS = "address_book_index_counts";
		field public static final java.lang.String EXTRA_ADDRESS_BOOK_INDEX_TITLES = "address_book_index_titles";
		field public static final java.lang.String NORMALIZED_NUMBER = "data4";
		field public static final java.lang.String NUMBER = "data1";
		field public static final java.lang.String SEARCH_DISPLAY_NAME_KEY = "search_display_name";
		@@ -24478,7 +24511,10 @@ package android.provider {
		}

		public static final class ContactsContract.CommonDataKinds.Photo implements android.provider.ContactsContract.DataColumnsWithJoins {
		field public static final java.lang.String ADDRESS_BOOK_INDEX_EXTRAS = "address_book_index_extras";
		field public static final java.lang.String CONTENT_ITEM_TYPE = "vnd.android.cursor.item/photo";
		field public static final java.lang.String EXTRA_ADDRESS_BOOK_INDEX_COUNTS = "address_book_index_counts";
		field public static final java.lang.String EXTRA_ADDRESS_BOOK_INDEX_TITLES = "address_book_index_titles";
		field public static final java.lang.String PHOTO = "data15";
		field public static final java.lang.String PHOTO_FILE_ID = "data14";
		}
		@@ -24486,7 +24522,10 @@ package android.provider {
		public static final class ContactsContract.CommonDataKinds.Relation implements android.provider.ContactsContract.CommonDataKinds.CommonColumns android.provider.ContactsContract.DataColumnsWithJoins {
		method public static final java.lang.CharSequence getTypeLabel(android.content.res.Resources, int, java.lang.CharSequence);
		method public static final int getTypeLabelResource(int);
		field public static final java.lang.String ADDRESS_BOOK_INDEX_EXTRAS = "address_book_index_extras";
		field public static final java.lang.String CONTENT_ITEM_TYPE = "vnd.android.cursor.item/relation";
		field public static final java.lang.String EXTRA_ADDRESS_BOOK_INDEX_COUNTS = "address_book_index_counts";
		field public static final java.lang.String EXTRA_ADDRESS_BOOK_INDEX_TITLES = "address_book_index_titles";
		field public static final java.lang.String NAME = "data1";
		field public static final int TYPE_ASSISTANT = 1; // 0x1
		field public static final int TYPE_BROTHER = 2; // 0x2
		@@ -24507,7 +24546,10 @@ package android.provider {
		public static final class ContactsContract.CommonDataKinds.SipAddress implements android.provider.ContactsContract.CommonDataKinds.CommonColumns android.provider.ContactsContract.DataColumnsWithJoins {
		method public static final java.lang.CharSequence getTypeLabel(android.content.res.Resources, int, java.lang.CharSequence);
		method public static final int getTypeLabelResource(int);
		field public static final java.lang.String ADDRESS_BOOK_INDEX_EXTRAS = "address_book_index_extras";
		field public static final java.lang.String CONTENT_ITEM_TYPE = "vnd.android.cursor.item/sip_address";
		field public static final java.lang.String EXTRA_ADDRESS_BOOK_INDEX_COUNTS = "address_book_index_counts";
		field public static final java.lang.String EXTRA_ADDRESS_BOOK_INDEX_TITLES = "address_book_index_titles";
		field public static final java.lang.String SIP_ADDRESS = "data1";
		field public static final int TYPE_HOME = 1; // 0x1
		field public static final int TYPE_OTHER = 3; // 0x3
		@@ -24515,8 +24557,11 @@ package android.provider {
		}

		public static final class ContactsContract.CommonDataKinds.StructuredName implements android.provider.ContactsContract.DataColumnsWithJoins {
		field public static final java.lang.String ADDRESS_BOOK_INDEX_EXTRAS = "address_book_index_extras";
		field public static final java.lang.String CONTENT_ITEM_TYPE = "vnd.android.cursor.item/name";
		field public static final java.lang.String DISPLAY_NAME = "data1";
		field public static final java.lang.String EXTRA_ADDRESS_BOOK_INDEX_COUNTS = "address_book_index_counts";
		field public static final java.lang.String EXTRA_ADDRESS_BOOK_INDEX_TITLES = "address_book_index_titles";
		field public static final java.lang.String FAMILY_NAME = "data3";
		field public static final java.lang.String FULL_NAME_STYLE = "data10";
		field public static final java.lang.String GIVEN_NAME = "data2";
		@@ -24531,11 +24576,14 @@ package android.provider {
		public static final class ContactsContract.CommonDataKinds.StructuredPostal implements android.provider.ContactsContract.CommonDataKinds.CommonColumns android.provider.ContactsContract.DataColumnsWithJoins {
		method public static final java.lang.CharSequence getTypeLabel(android.content.res.Resources, int, java.lang.CharSequence);
		method public static final int getTypeLabelResource(int);
		field public static final java.lang.String ADDRESS_BOOK_INDEX_EXTRAS = "address_book_index_extras";
		field public static final java.lang.String CITY = "data7";
		field public static final java.lang.String CONTENT_ITEM_TYPE = "vnd.android.cursor.item/postal-address_v2";
		field public static final java.lang.String CONTENT_TYPE = "vnd.android.cursor.dir/postal-address_v2";
		field public static final android.net.Uri CONTENT_URI;
		field public static final java.lang.String COUNTRY = "data10";
		field public static final java.lang.String EXTRA_ADDRESS_BOOK_INDEX_COUNTS = "address_book_index_counts";
		field public static final java.lang.String EXTRA_ADDRESS_BOOK_INDEX_TITLES = "address_book_index_titles";
		field public static final java.lang.String FORMATTED_ADDRESS = "data1";
		field public static final java.lang.String NEIGHBORHOOD = "data6";
		field public static final java.lang.String POBOX = "data5";
		@@ -24548,7 +24596,10 @@ package android.provider {
		}

		public static final class ContactsContract.CommonDataKinds.Website implements android.provider.ContactsContract.CommonDataKinds.CommonColumns android.provider.ContactsContract.DataColumnsWithJoins {
		field public static final java.lang.String ADDRESS_BOOK_INDEX_EXTRAS = "address_book_index_extras";
		field public static final java.lang.String CONTENT_ITEM_TYPE = "vnd.android.cursor.item/website";
		field public static final java.lang.String EXTRA_ADDRESS_BOOK_INDEX_COUNTS = "address_book_index_counts";
		field public static final java.lang.String EXTRA_ADDRESS_BOOK_INDEX_TITLES = "address_book_index_titles";
		field public static final int TYPE_BLOG = 2; // 0x2
		field public static final int TYPE_FTP = 6; // 0x6
		field public static final int TYPE_HOME = 4; // 0x4
		@@ -24559,13 +24610,6 @@ package android.provider {
		field public static final java.lang.String URL = "data1";
		}

		public static final class ContactsContract.ContactCounts {
		ctor public ContactsContract.ContactCounts();
		field public static final java.lang.String ADDRESS_BOOK_INDEX_EXTRAS = "address_book_index_extras";
		field public static final java.lang.String EXTRA_ADDRESS_BOOK_INDEX_COUNTS = "address_book_index_counts";
		field public static final java.lang.String EXTRA_ADDRESS_BOOK_INDEX_TITLES = "address_book_index_titles";
		}

		protected static abstract interface ContactsContract.ContactNameColumns {
		field public static final java.lang.String DISPLAY_NAME_ALTERNATIVE = "display_name_alt";
		field public static final java.lang.String DISPLAY_NAME_PRIMARY = "display_name";
		@@ -24603,6 +24647,7 @@ package android.provider {
		method public static deprecated void markAsContacted(android.content.ContentResolver, long);
		method public static java.io.InputStream openContactPhotoInputStream(android.content.ContentResolver, android.net.Uri, boolean);
		method public static java.io.InputStream openContactPhotoInputStream(android.content.ContentResolver, android.net.Uri);
		field public static final java.lang.String ADDRESS_BOOK_INDEX_EXTRAS = "address_book_index_extras";
		field public static final android.net.Uri CONTENT_FILTER_URI;
		field public static final android.net.Uri CONTENT_FREQUENT_URI;
		field public static final android.net.Uri CONTENT_GROUP_URI;
		@@ -24615,6 +24660,8 @@ package android.provider {
		field public static final android.net.Uri CONTENT_URI;
		field public static final java.lang.String CONTENT_VCARD_TYPE = "text/x-vcard";
		field public static final android.net.Uri CONTENT_VCARD_URI;
		field public static final java.lang.String EXTRA_ADDRESS_BOOK_INDEX_COUNTS = "address_book_index_counts";
		field public static final java.lang.String EXTRA_ADDRESS_BOOK_INDEX_TITLES = "address_book_index_titles";
		}

		public static final class ContactsContract.Contacts.AggregationSuggestions implements android.provider.BaseColumns android.provider.ContactsContract.ContactOptionsColumns android.provider.ContactsContract.ContactStatusColumns android.provider.ContactsContract.ContactsColumns {
		@@ -24659,8 +24706,11 @@ package android.provider {

		public static final class ContactsContract.Data implements android.provider.ContactsContract.DataColumnsWithJoins {
		method public static android.net.Uri getContactLookupUri(android.content.ContentResolver, android.net.Uri);
		field public static final java.lang.String ADDRESS_BOOK_INDEX_EXTRAS = "address_book_index_extras";
		field public static final java.lang.String CONTENT_TYPE = "vnd.android.cursor.dir/data";
		field public static final android.net.Uri CONTENT_URI;
		field public static final java.lang.String EXTRA_ADDRESS_BOOK_INDEX_COUNTS = "address_book_index_counts";
		field public static final java.lang.String EXTRA_ADDRESS_BOOK_INDEX_TITLES = "address_book_index_titles";
		field public static final java.lang.String VISIBLE_CONTACTS_ONLY = "visible_contacts_only";
		}

		@@ -24866,8 +24916,8 @@ package android.provider {

		public static final class ContactsContract.PinnedPositions {
		ctor public ContactsContract.PinnedPositions();
		method public static void undemote(android.content.ContentResolver, long);
		field public static final int DEMOTED = -1; // 0xffffffff
		field public static final java.lang.String UNDEMOTE_METHOD = "undemote";
		field public static final int UNPINNED = 0; // 0x0
		}

core/java/android/provider/ContactsContract.java

+56 −46

File changed.

Preview size limit exceeded, changes collapsed.