Merge "API changes per API review for contacts" into lmp-preview-dev (8089ce7c) · Commits · e / os / android_frameworks_base

api/current.txt

+0 −40

Original line number	Diff line number	Diff line
		@@ -22862,16 +22862,6 @@ package android.provider {
		field public static final deprecated android.net.Uri DELETED_CONTENT_URI;
		field public static final deprecated java.lang.String GROUP_ANDROID_STARRED = "Starred in Android";
		field public static final deprecated java.lang.String GROUP_MY_CONTACTS = "Contacts";
		field public static final java.lang.String NON_SYNCABLE_ACCOUNT = "non_syncable";
		field public static final java.lang.String NON_SYNCABLE_ACCOUNT_TYPE = "android.local";
		field public static final java.lang.String _SYNC_ACCOUNT = "_sync_account";
		field public static final java.lang.String _SYNC_ACCOUNT_TYPE = "_sync_account_type";
		field public static final java.lang.String _SYNC_DIRTY = "_sync_dirty";
		field public static final java.lang.String _SYNC_ID = "_sync_id";
		field public static final java.lang.String _SYNC_LOCAL_ID = "_sync_local_id";
		field public static final java.lang.String _SYNC_MARK = "_sync_mark";
		field public static final java.lang.String _SYNC_TIME = "_sync_time";
		field public static final java.lang.String _SYNC_VERSION = "_sync_version";
		}

		public static abstract deprecated interface Contacts.GroupsColumns {
		@@ -22973,19 +22963,9 @@ package android.provider {
		field public static final deprecated android.net.Uri CONTENT_URI;
		field public static final deprecated java.lang.String DEFAULT_SORT_ORDER = "name ASC";
		field public static final deprecated android.net.Uri DELETED_CONTENT_URI;
		field public static final java.lang.String NON_SYNCABLE_ACCOUNT = "non_syncable";
		field public static final java.lang.String NON_SYNCABLE_ACCOUNT_TYPE = "android.local";
		field public static final deprecated java.lang.String PRIMARY_EMAIL_ID = "primary_email";
		field public static final deprecated java.lang.String PRIMARY_ORGANIZATION_ID = "primary_organization";
		field public static final deprecated java.lang.String PRIMARY_PHONE_ID = "primary_phone";
		field public static final java.lang.String _SYNC_ACCOUNT = "_sync_account";
		field public static final java.lang.String _SYNC_ACCOUNT_TYPE = "_sync_account_type";
		field public static final java.lang.String _SYNC_DIRTY = "_sync_dirty";
		field public static final java.lang.String _SYNC_ID = "_sync_id";
		field public static final java.lang.String _SYNC_LOCAL_ID = "_sync_local_id";
		field public static final java.lang.String _SYNC_MARK = "_sync_mark";
		field public static final java.lang.String _SYNC_TIME = "_sync_time";
		field public static final java.lang.String _SYNC_VERSION = "_sync_version";
		}

		public static final deprecated class Contacts.People.ContactMethods implements android.provider.BaseColumns android.provider.Contacts.ContactMethodsColumns android.provider.Contacts.PeopleColumns {
		@@ -23048,16 +23028,6 @@ package android.provider {
		field public static final deprecated java.lang.String CONTENT_DIRECTORY = "photo";
		field public static final deprecated android.net.Uri CONTENT_URI;
		field public static final deprecated java.lang.String DEFAULT_SORT_ORDER = "person ASC";
		field public static final java.lang.String NON_SYNCABLE_ACCOUNT = "non_syncable";
		field public static final java.lang.String NON_SYNCABLE_ACCOUNT_TYPE = "android.local";
		field public static final java.lang.String _SYNC_ACCOUNT = "_sync_account";
		field public static final java.lang.String _SYNC_ACCOUNT_TYPE = "_sync_account_type";
		field public static final java.lang.String _SYNC_DIRTY = "_sync_dirty";
		field public static final java.lang.String _SYNC_ID = "_sync_id";
		field public static final java.lang.String _SYNC_LOCAL_ID = "_sync_local_id";
		field public static final java.lang.String _SYNC_MARK = "_sync_mark";
		field public static final java.lang.String _SYNC_TIME = "_sync_time";
		field public static final java.lang.String _SYNC_VERSION = "_sync_version";
		}

		public static abstract deprecated interface Contacts.PhotosColumns {
		@@ -23378,7 +23348,6 @@ package android.provider {
		protected static abstract interface ContactsContract.ContactOptionsColumns {
		field public static final java.lang.String CUSTOM_RINGTONE = "custom_ringtone";
		field public static final java.lang.String LAST_TIME_CONTACTED = "last_time_contacted";
		field public static final java.lang.String PINNED = "pinned";
		field public static final java.lang.String SEND_TO_VOICEMAIL = "send_to_voicemail";
		field public static final java.lang.String STARRED = "starred";
		field public static final java.lang.String TIMES_CONTACTED = "times_contacted";
		@@ -23656,15 +23625,6 @@ package android.provider {
		field public static final int UNDEFINED = 0; // 0x0
		}

		public static final class ContactsContract.PinnedPositions {
		ctor public ContactsContract.PinnedPositions();
		field public static final int DEMOTED = -1; // 0xffffffff
		field public static final java.lang.String STAR_WHEN_PINNING = "star_when_pinning";
		field public static final java.lang.String UNDEMOTE = "undemote";
		field public static final int UNPINNED = 2147483647; // 0x7fffffff
		field public static final android.net.Uri UPDATE_URI;
		}

		public static final class ContactsContract.Preferences {
		ctor public ContactsContract.Preferences();
		field public static final java.lang.String DISPLAY_ORDER = "android.contacts.DISPLAY_ORDER";

core/java/android/provider/Contacts.java

+5 −5

Original line number	Diff line number	Diff line
		@@ -337,7 +337,7 @@ public class Contacts {
		* @deprecated see {@link android.provider.ContactsContract}
		*/
		@Deprecated
		public static final class People implements BaseColumns, SyncConstValue, PeopleColumns,
		public static final class People implements BaseColumns, PeopleColumns,
		PhonesColumns, PresenceColumns {
		/**
		* no public constructor since this is a utility class
		@@ -790,7 +790,7 @@ public class Contacts {
		*/
		@Deprecated
		public static final class Groups
		implements BaseColumns, SyncConstValue, GroupsColumns {
		implements BaseColumns, GroupsColumns {
		/**
		* no public constructor since this is a utility class
		*/
		@@ -1864,7 +1864,7 @@ public class Contacts {
		* @deprecated see {@link android.provider.ContactsContract}
		*/
		@Deprecated
		public static final class Photos implements BaseColumns, PhotosColumns, SyncConstValue {
		public static final class Photos implements BaseColumns, PhotosColumns {
		/**
		* no public constructor since this is a utility class
		*/

core/java/android/provider/ContactsContract.java

+9 −3

Original line number	Diff line number	Diff line
		@@ -184,9 +184,9 @@ public final class ContactsContract {
		public static final String DEFERRED_SNIPPETING_QUERY = "deferred_snippeting_query";

		/**
		* A boolean parameter for {@link CommonDataKinds.Phone#CONTENT_URI},
		* {@link CommonDataKinds.Email#CONTENT_URI}, and
		* {@link CommonDataKinds.StructuredPostal#CONTENT_URI}.
		* A boolean parameter for {@link CommonDataKinds.Phone#CONTENT_URI Phone.CONTENT_URI},
		* {@link CommonDataKinds.Email#CONTENT_URI Email.CONTENT_URI}, and
		* {@link CommonDataKinds.StructuredPostal#CONTENT_URI StructuredPostal.CONTENT_URI}.
		* This enables a content provider to remove duplicate entries in results.
		*/
		public static final String REMOVE_DUPLICATE_ENTRIES = "remove_duplicate_entries";
		@@ -244,6 +244,9 @@ public final class ContactsContract {
		public static final String KEY_AUTHORIZED_URI = "authorized_uri";
		}

		/*
		* @hide
		*/
		public static final class Preferences {

		/**
		@@ -808,6 +811,7 @@ public final class ContactsContract {
		* The position at which the contact is pinned. If {@link PinnedPositions#UNPINNED},
		* the contact is not pinned. Also see {@link PinnedPositions}.
		* <P>Type: INTEGER </P>
		* @hide
		*/
		public static final String PINNED = "pinned";

		@@ -7764,6 +7768,8 @@ public final class ContactsContract {
		* {@link PinnedPositions#STAR_WHEN_PINNING} to true to force all pinned and unpinned
		* contacts to be automatically starred and unstarred.
		* </p>
		*
		* @hide
		*/
		public static final class PinnedPositions {