Merge "Deprecated Lychee related APIs in ContactsContract." (2837981c) · Commits · e / os / android_frameworks_base

api/current.txt

+2 −2

Original line number	Diff line number	Diff line
		@@ -38398,11 +38398,11 @@ package android.provider {
		protected static interface ContactsContract.RawContactsColumns {
		field public static final String ACCOUNT_TYPE_AND_DATA_SET = "account_type_and_data_set";
		field public static final String AGGREGATION_MODE = "aggregation_mode";
		field public static final String BACKUP_ID = "backup_id";
		field @Deprecated public static final String BACKUP_ID = "backup_id";
		field public static final String CONTACT_ID = "contact_id";
		field public static final String DATA_SET = "data_set";
		field public static final String DELETED = "deleted";
		field public static final String METADATA_DIRTY = "metadata_dirty";
		field @Deprecated public static final String METADATA_DIRTY = "metadata_dirty";
		field public static final String RAW_CONTACT_IS_READ_ONLY = "raw_contact_is_read_only";
		field public static final String RAW_CONTACT_IS_USER_PROFILE = "raw_contact_is_user_profile";
		}

api/system-current.txt

+28 −28

Original line number	Diff line number	Diff line
		@@ -7087,34 +7087,34 @@ package android.provider {
		field public static final int STATUS_NOT_BLOCKED = 0; // 0x0
		}

		public static final class ContactsContract.MetadataSync implements android.provider.BaseColumns android.provider.ContactsContract.MetadataSyncColumns {
		field public static final String CONTENT_ITEM_TYPE = "vnd.android.cursor.item/contact_metadata";
		field public static final String CONTENT_TYPE = "vnd.android.cursor.dir/contact_metadata";
		field public static final android.net.Uri CONTENT_URI;
		field public static final String METADATA_AUTHORITY = "com.android.contacts.metadata";
		field public static final android.net.Uri METADATA_AUTHORITY_URI;
		}

		protected static interface ContactsContract.MetadataSyncColumns {
		field public static final String ACCOUNT_NAME = "account_name";
		field public static final String ACCOUNT_TYPE = "account_type";
		field public static final String DATA = "data";
		field public static final String DATA_SET = "data_set";
		field public static final String DELETED = "deleted";
		field public static final String RAW_CONTACT_BACKUP_ID = "raw_contact_backup_id";
		}

		public static final class ContactsContract.MetadataSyncState implements android.provider.BaseColumns android.provider.ContactsContract.MetadataSyncStateColumns {
		field public static final String CONTENT_ITEM_TYPE = "vnd.android.cursor.item/contact_metadata_sync_state";
		field public static final String CONTENT_TYPE = "vnd.android.cursor.dir/contact_metadata_sync_state";
		field public static final android.net.Uri CONTENT_URI;
		}

		protected static interface ContactsContract.MetadataSyncStateColumns {
		field public static final String ACCOUNT_NAME = "account_name";
		field public static final String ACCOUNT_TYPE = "account_type";
		field public static final String DATA_SET = "data_set";
		field public static final String STATE = "state";
		@Deprecated public static final class ContactsContract.MetadataSync implements android.provider.BaseColumns android.provider.ContactsContract.MetadataSyncColumns {
		field @Deprecated public static final String CONTENT_ITEM_TYPE = "vnd.android.cursor.item/contact_metadata";
		field @Deprecated public static final String CONTENT_TYPE = "vnd.android.cursor.dir/contact_metadata";
		field @Deprecated public static final android.net.Uri CONTENT_URI;
		field @Deprecated public static final String METADATA_AUTHORITY = "com.android.contacts.metadata";
		field @Deprecated public static final android.net.Uri METADATA_AUTHORITY_URI;
		}

		@Deprecated protected static interface ContactsContract.MetadataSyncColumns {
		field @Deprecated public static final String ACCOUNT_NAME = "account_name";
		field @Deprecated public static final String ACCOUNT_TYPE = "account_type";
		field @Deprecated public static final String DATA = "data";
		field @Deprecated public static final String DATA_SET = "data_set";
		field @Deprecated public static final String DELETED = "deleted";
		field @Deprecated public static final String RAW_CONTACT_BACKUP_ID = "raw_contact_backup_id";
		}

		@Deprecated public static final class ContactsContract.MetadataSyncState implements android.provider.BaseColumns android.provider.ContactsContract.MetadataSyncStateColumns {
		field @Deprecated public static final String CONTENT_ITEM_TYPE = "vnd.android.cursor.item/contact_metadata_sync_state";
		field @Deprecated public static final String CONTENT_TYPE = "vnd.android.cursor.dir/contact_metadata_sync_state";
		field @Deprecated public static final android.net.Uri CONTENT_URI;
		}

		@Deprecated protected static interface ContactsContract.MetadataSyncStateColumns {
		field @Deprecated public static final String ACCOUNT_NAME = "account_name";
		field @Deprecated public static final String ACCOUNT_TYPE = "account_type";
		field @Deprecated public static final String DATA_SET = "data_set";
		field @Deprecated public static final String STATE = "state";
		}

		public final class DeviceConfig {

core/java/android/provider/ContactsContract.java

+23 −0

Original line number	Diff line number	Diff line
		@@ -2381,7 +2381,11 @@ public final class ContactsContract {
		* This id is provided by its own data source, and can be used to backup metadata
		* to the server.
		* This should be unique within each set of account_name/account_type/data_set
		*
		* @deprecated This column is no longer supported as of Android version
		* {@link android.os.Build.VERSION_CODES#R}.
		*/
		@Deprecated
		public static final String BACKUP_ID = "backup_id";

		/**
		@@ -2445,7 +2449,11 @@ public final class ContactsContract {
		* Flag indicating that a raw contact's metadata has changed, and its metadata
		* needs to be synchronized by the server.
		* <P>Type: INTEGER (boolean)</P>
		*
		* @deprecated This column is no longer supported as of Android version
		* {@link android.os.Build.VERSION_CODES#R}.
		*/
		@Deprecated
		public static final String METADATA_DIRTY = "metadata_dirty";
		}

		@@ -4188,7 +4196,10 @@ public final class ContactsContract {
		* Hash id on the data fields, used for backup and restore.
		*
		* @hide
		* @deprecated This column is no longer supported as of Android version
		* {@link android.os.Build.VERSION_CODES#R}.
		*/
		@Deprecated
		public static final String HASH_ID = "hash_id";

		/**
		@@ -9495,7 +9506,10 @@ public final class ContactsContract {

		/**
		* @hide
		* @deprecated These columns are no longer supported as of Android version
		* {@link android.os.Build.VERSION_CODES#R}.
		*/
		@Deprecated
		@SystemApi
		protected interface MetadataSyncColumns {

		@@ -9602,7 +9616,10 @@ public final class ContactsContract {
		* from server before it is merged into other CP2 tables.
		*
		* @hide
		* @deprecated These columns are no longer supported as of Android version
		* {@link android.os.Build.VERSION_CODES#R}.
		*/
		@Deprecated
		@SystemApi
		public static final class MetadataSync implements BaseColumns, MetadataSyncColumns {

		@@ -9638,7 +9655,10 @@ public final class ContactsContract {

		/**
		* @hide
		* @deprecated These columns are no longer supported as of Android version
		* {@link android.os.Build.VERSION_CODES#R}.
		*/
		@Deprecated
		@SystemApi
		protected interface MetadataSyncStateColumns {

		@@ -9672,7 +9692,10 @@ public final class ContactsContract {
		* sync state for a set of accounts.
		*
		* @hide
		* @deprecated These columns are no longer supported as of Android version
		* {@link android.os.Build.VERSION_CODES#R}.
		*/
		@Deprecated
		@SystemApi
		public static final class MetadataSyncState implements BaseColumns, MetadataSyncStateColumns {