Merge "Deprecate the SipAddress and Im in the ContactsContract." into main (0977bb69) · Commits · e / os / android_frameworks_base

core/api/current.txt

+20 −20

Original line number	Diff line number	Diff line
		@@ -35874,19 +35874,19 @@ package android.provider {
		field public static final String NAMESPACE = "data2";
		}

		public static final class ContactsContract.CommonDataKinds.Im implements android.provider.ContactsContract.CommonDataKinds.CommonColumns android.provider.ContactsContract.DataColumnsWithJoins {
		method public static CharSequence getProtocolLabel(android.content.res.Resources, int, CharSequence);
		method public static int getProtocolLabelResource(int);
		method public static CharSequence getTypeLabel(android.content.res.Resources, int, @Nullable CharSequence);
		method public static int getTypeLabelResource(int);
		field public static final String CONTENT_ITEM_TYPE = "vnd.android.cursor.item/im";
		field public static final String CUSTOM_PROTOCOL = "data6";
		@Deprecated public static final class ContactsContract.CommonDataKinds.Im implements android.provider.ContactsContract.CommonDataKinds.CommonColumns android.provider.ContactsContract.DataColumnsWithJoins {
		method @Deprecated public static CharSequence getProtocolLabel(android.content.res.Resources, int, CharSequence);
		method @Deprecated public static int getProtocolLabelResource(int);
		method @Deprecated public static CharSequence getTypeLabel(android.content.res.Resources, int, @Nullable CharSequence);
		method @Deprecated public static int getTypeLabelResource(int);
		field @Deprecated public static final String CONTENT_ITEM_TYPE = "vnd.android.cursor.item/im";
		field @Deprecated public static final String CUSTOM_PROTOCOL = "data6";
		field public static final String EXTRA_ADDRESS_BOOK_INDEX = "android.provider.extra.ADDRESS_BOOK_INDEX";
		field public static final String EXTRA_ADDRESS_BOOK_INDEX_COUNTS = "android.provider.extra.ADDRESS_BOOK_INDEX_COUNTS";
		field public static final String EXTRA_ADDRESS_BOOK_INDEX_TITLES = "android.provider.extra.ADDRESS_BOOK_INDEX_TITLES";
		field public static final String PROTOCOL = "data5";
		field @Deprecated public static final String PROTOCOL = "data5";
		field @Deprecated public static final int PROTOCOL_AIM = 0; // 0x0
		field public static final int PROTOCOL_CUSTOM = -1; // 0xffffffff
		field @Deprecated public static final int PROTOCOL_CUSTOM = -1; // 0xffffffff
		field @Deprecated public static final int PROTOCOL_GOOGLE_TALK = 5; // 0x5
		field @Deprecated public static final int PROTOCOL_ICQ = 6; // 0x6
		field @Deprecated public static final int PROTOCOL_JABBER = 7; // 0x7
		@@ -35895,9 +35895,9 @@ package android.provider {
		field @Deprecated public static final int PROTOCOL_QQ = 4; // 0x4
		field @Deprecated public static final int PROTOCOL_SKYPE = 3; // 0x3
		field @Deprecated public static final int PROTOCOL_YAHOO = 2; // 0x2
		field public static final int TYPE_HOME = 1; // 0x1
		field public static final int TYPE_OTHER = 3; // 0x3
		field public static final int TYPE_WORK = 2; // 0x2
		field @Deprecated public static final int TYPE_HOME = 1; // 0x1
		field @Deprecated public static final int TYPE_OTHER = 3; // 0x3
		field @Deprecated public static final int TYPE_WORK = 2; // 0x2
		}

		public static final class ContactsContract.CommonDataKinds.Nickname implements android.provider.ContactsContract.CommonDataKinds.CommonColumns android.provider.ContactsContract.DataColumnsWithJoins {
		@@ -36012,17 +36012,17 @@ package android.provider {
		field public static final int TYPE_SPOUSE = 14; // 0xe
		}

		public static final class ContactsContract.CommonDataKinds.SipAddress implements android.provider.ContactsContract.CommonDataKinds.CommonColumns android.provider.ContactsContract.DataColumnsWithJoins {
		method public static CharSequence getTypeLabel(android.content.res.Resources, int, @Nullable CharSequence);
		method public static int getTypeLabelResource(int);
		field public static final String CONTENT_ITEM_TYPE = "vnd.android.cursor.item/sip_address";
		@Deprecated public static final class ContactsContract.CommonDataKinds.SipAddress implements android.provider.ContactsContract.CommonDataKinds.CommonColumns android.provider.ContactsContract.DataColumnsWithJoins {
		method @Deprecated public static CharSequence getTypeLabel(android.content.res.Resources, int, @Nullable CharSequence);
		method @Deprecated public static int getTypeLabelResource(int);
		field @Deprecated public static final String CONTENT_ITEM_TYPE = "vnd.android.cursor.item/sip_address";
		field public static final String EXTRA_ADDRESS_BOOK_INDEX = "android.provider.extra.ADDRESS_BOOK_INDEX";
		field public static final String EXTRA_ADDRESS_BOOK_INDEX_COUNTS = "android.provider.extra.ADDRESS_BOOK_INDEX_COUNTS";
		field public static final String EXTRA_ADDRESS_BOOK_INDEX_TITLES = "android.provider.extra.ADDRESS_BOOK_INDEX_TITLES";
		field public static final String SIP_ADDRESS = "data1";
		field public static final int TYPE_HOME = 1; // 0x1
		field public static final int TYPE_OTHER = 3; // 0x3
		field public static final int TYPE_WORK = 2; // 0x2
		field @Deprecated public static final String SIP_ADDRESS = "data1";
		field @Deprecated public static final int TYPE_HOME = 1; // 0x1
		field @Deprecated public static final int TYPE_OTHER = 3; // 0x3
		field @Deprecated public static final int TYPE_WORK = 2; // 0x2
		}

		public static final class ContactsContract.CommonDataKinds.StructuredName implements android.provider.ContactsContract.DataColumnsWithJoins {

core/java/android/provider/ContactsContract.java

+8 −0

Original line number	Diff line number	Diff line
		@@ -6911,7 +6911,11 @@ public final class ContactsContract {
		* <td></td>
		* </tr>
		* </table>
		*
		* @deprecated This field may not be well supported by some contacts apps and is discouraged
		* to use.
		*/
		@Deprecated
		public static final class Im implements DataColumnsWithJoins, CommonColumns, ContactCounts {
		/**
		* This utility class cannot be instantiated
		@@ -7721,7 +7725,11 @@ public final class ContactsContract {
		* <td></td>
		* </tr>
		* </table>
		*
		* @deprecated This field may not be well supported by some contacts apps and is discouraged
		* to use.
		*/
		@Deprecated
		public static final class SipAddress implements DataColumnsWithJoins, CommonColumns,
		ContactCounts {
		/**