diff --git a/api/current.txt b/api/current.txt index fc67af608df4a..17399a3c522a6 100644 --- a/api/current.txt +++ b/api/current.txt @@ -25934,6 +25934,7 @@ package android.provider { protected static abstract interface ContactsContract.RawContactsColumns { field public static final java.lang.String ACCOUNT_TYPE_AND_DATA_SET = "account_type_and_data_set"; field public static final java.lang.String AGGREGATION_MODE = "aggregation_mode"; + field public static final java.lang.String BACKUP_ID = "backup_id"; field public static final java.lang.String CONTACT_ID = "contact_id"; field public static final java.lang.String DATA_SET = "data_set"; field public static final java.lang.String DELETED = "deleted"; diff --git a/api/system-current.txt b/api/system-current.txt index 81af889284075..abde3464cd1d4 100644 --- a/api/system-current.txt +++ b/api/system-current.txt @@ -27752,6 +27752,23 @@ package android.provider { field public static final java.lang.String TERTIARY_PHONE_TYPE = "tertiary_phone_type"; } + public static final class ContactsContract.MetadataSync implements android.provider.BaseColumns android.provider.ContactsContract.MetadataSyncColumns { + field public static final java.lang.String CONTENT_ITEM_TYPE = "vnd.android.cursor.item/contact_metadata"; + field public static final java.lang.String CONTENT_TYPE = "vnd.android.cursor.dir/contact_metadata"; + field public static final android.net.Uri CONTENT_URI; + field public static final java.lang.String METADATA_AUTHORITY = "com.android.contacts.metadata"; + field public static final android.net.Uri METADATA_AUTHORITY_URI; + } + + protected static abstract interface ContactsContract.MetadataSyncColumns { + field public static final java.lang.String ACCOUNT_NAME = "account_name"; + field public static final java.lang.String ACCOUNT_TYPE = "account_type"; + field public static final java.lang.String DATA = "data"; + field public static final java.lang.String DATA_SET = "data_set"; + field public static final java.lang.String DELETED = "deleted"; + field public static final java.lang.String RAW_CONTACT_BACKUP_ID = "raw_contact_backup_id"; + } + public static final class ContactsContract.PhoneLookup implements android.provider.BaseColumns android.provider.ContactsContract.ContactOptionsColumns android.provider.ContactsContract.ContactsColumns android.provider.ContactsContract.PhoneLookupColumns { field public static final android.net.Uri CONTENT_FILTER_URI; field public static final android.net.Uri ENTERPRISE_CONTENT_FILTER_URI; @@ -27864,6 +27881,7 @@ package android.provider { protected static abstract interface ContactsContract.RawContactsColumns { field public static final java.lang.String ACCOUNT_TYPE_AND_DATA_SET = "account_type_and_data_set"; field public static final java.lang.String AGGREGATION_MODE = "aggregation_mode"; + field public static final java.lang.String BACKUP_ID = "backup_id"; field public static final java.lang.String CONTACT_ID = "contact_id"; field public static final java.lang.String DATA_SET = "data_set"; field public static final java.lang.String DELETED = "deleted"; diff --git a/core/java/android/provider/ContactsContract.java b/core/java/android/provider/ContactsContract.java index 52d992acfd252..7e644f52565db 100644 --- a/core/java/android/provider/ContactsContract.java +++ b/core/java/android/provider/ContactsContract.java @@ -17,6 +17,7 @@ package android.provider; import android.accounts.Account; +import android.annotation.SystemApi; import android.app.Activity; import android.app.admin.DevicePolicyManager; import android.content.ActivityNotFoundException; @@ -2216,8 +2217,6 @@ 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 - * - * @hide */ public static final String BACKUP_ID = "backup_id"; @@ -8942,30 +8941,25 @@ public final class ContactsContract { /** * @hide */ + @SystemApi protected interface MetadataSyncColumns { /** * The raw contact backup id. * A reference to the {@link ContactsContract.RawContacts#BACKUP_ID} that save the * persistent unique id for each raw contact within its source system. - * - * @hide */ public static final String RAW_CONTACT_BACKUP_ID = "raw_contact_backup_id"; /** * The account type to which the raw_contact of this item is associated. See * {@link RawContacts#ACCOUNT_TYPE} - * - * @hide */ public static final String ACCOUNT_TYPE = "account_type"; /** * The account name to which the raw_contact of this item is associated. See * {@link RawContacts#ACCOUNT_NAME} - * - * @hide */ public static final String ACCOUNT_NAME = "account_name"; @@ -8974,8 +8968,6 @@ public final class ContactsContract { * multiple sync adapters for the same account type to distinguish between * each others' data. * {@link RawContacts#DATA_SET} - * - * @hide */ public static final String DATA_SET = "data_set"; @@ -9037,8 +9029,6 @@ public final class ContactsContract { * ] * } * - * - * @hide */ public static final String DATA = "data"; @@ -9048,8 +9038,6 @@ public final class ContactsContract { * called on a raw contact, updating MetadataSync table to set the flag of the raw contact * as "1", then metadata sync adapter deletes the raw contact metadata on the server. *

Type: INTEGER

- * - * @hide */ public static final String DELETED = "deleted"; } @@ -9060,6 +9048,7 @@ public final class ContactsContract { * * @hide */ + @SystemApi public static final class MetadataSync implements BaseColumns, MetadataSyncColumns { /** The authority for the contacts metadata */