Merge "Update ContactsContract doc." (431ea9b0) · Commits · e / os / android_frameworks_base

api/current.txt

+1 −1

Original line number	Diff line number	Diff line
		@@ -39565,7 +39565,7 @@ 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 @Deprecated public static final String BACKUP_ID = "backup_id";
		field 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";

core/java/android/provider/ContactsContract.java

+8 −12

Original line number	Diff line number	Diff line
		@@ -2381,11 +2381,7 @@ 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";

		/**
		@@ -2450,8 +2446,8 @@ public final class ContactsContract {
		* 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 This column never actually worked since added. It will not supported as
		* of Android version {@link android.os.Build.VERSION_CODES#R}.
		*/
		@Deprecated
		public static final String METADATA_DIRTY = "metadata_dirty";
		@@ -4196,8 +4192,8 @@ 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 This column was never public since added. It will not be supported
		* as of Android version {@link android.os.Build.VERSION_CODES#R}.
		*/
		@Deprecated
		public static final String HASH_ID = "hash_id";
		@@ -9506,8 +9502,8 @@ public final class ContactsContract {

		/**
		* @hide
		* @deprecated These columns are no longer supported as of Android version
		* {@link android.os.Build.VERSION_CODES#R}.
		* @deprecated These columns were never public since added. They will not be supported
		* as of Android version {@link android.os.Build.VERSION_CODES#R}.
		*/
		@Deprecated
		@SystemApi
		@@ -9616,8 +9612,8 @@ 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 These columns were never public since added. They will not be supported
		* as of Android version {@link android.os.Build.VERSION_CODES#R}.
		*/
		@Deprecated
		@SystemApi