Merge "Revert "Add RawContacts insert/update/delete notification URIs."" (f768ba4f) · Commits · e / os / android_frameworks_base

api/system-current.txt

+0 −7

Original line number	Diff line number	Diff line
		@@ -4322,13 +4322,6 @@ package android.provider {
		field public static final java.lang.String STATE = "state";
		}

		public static final class ContactsContract.RawContacts implements android.provider.BaseColumns android.provider.ContactsContract.ContactNameColumns android.provider.ContactsContract.ContactOptionsColumns android.provider.ContactsContract.RawContactsColumns android.provider.ContactsContract.SyncColumns {
		field public static final android.net.Uri RAW_CONTACTS_NOTIFICATION_DELETE_URI;
		field public static final android.net.Uri RAW_CONTACTS_NOTIFICATION_INSERT_URI;
		field public static final android.net.Uri RAW_CONTACTS_NOTIFICATION_UPDATE_URI;
		field public static final android.net.Uri RAW_CONTACTS_NOTIFICATION_URI;
		}

		public abstract class SearchIndexableData {
		ctor public SearchIndexableData();
		ctor public SearchIndexableData(android.content.Context);

+0 −7

Original line number	Diff line number	Diff line
		@@ -936,13 +936,6 @@ package android.provider {
		field public static final android.net.Uri ENTERPRISE_CONTENT_URI;
		}

		public static final class ContactsContract.RawContacts implements android.provider.BaseColumns android.provider.ContactsContract.ContactNameColumns android.provider.ContactsContract.ContactOptionsColumns android.provider.ContactsContract.RawContactsColumns android.provider.ContactsContract.SyncColumns {
		field public static final android.net.Uri RAW_CONTACTS_NOTIFICATION_DELETE_URI;
		field public static final android.net.Uri RAW_CONTACTS_NOTIFICATION_INSERT_URI;
		field public static final android.net.Uri RAW_CONTACTS_NOTIFICATION_UPDATE_URI;
		field public static final android.net.Uri RAW_CONTACTS_NOTIFICATION_URI;
		}

		public static final class ContactsContract.RawContactsEntity implements android.provider.BaseColumns android.provider.ContactsContract.DataColumns android.provider.ContactsContract.RawContactsColumns {
		field public static final android.net.Uri CORP_CONTENT_URI;
		}

+1 −42

Original line number	Diff line number	Diff line
		@@ -2783,48 +2783,7 @@ public final class ContactsContract {
		* The content:// style URI for this table, which requests a directory of
		* raw contact rows matching the selection criteria.
		*/
		public static final Uri CONTENT_URI =
		Uri.withAppendedPath(AUTHORITY_URI, "raw_contacts");

		/**
		* The URI to register for all raw contacts change notification.
		*
		* @hide
		*/
		@SystemApi
		@TestApi
		public static final Uri RAW_CONTACTS_NOTIFICATION_URI =
		Uri.parse("content://com.android.contacts.raw_contacts");

		/**
		* The URI to register for raw contacts insert notification.
		*
		* @hide
		*/
		@SystemApi
		@TestApi
		public static final Uri RAW_CONTACTS_NOTIFICATION_INSERT_URI =
		Uri.withAppendedPath(RAW_CONTACTS_NOTIFICATION_URI, "insert");

		/**
		* The URI to register for raw contacts update notification.
		*
		* @hide
		*/
		@SystemApi
		@TestApi
		public static final Uri RAW_CONTACTS_NOTIFICATION_UPDATE_URI =
		Uri.withAppendedPath(RAW_CONTACTS_NOTIFICATION_URI, "update");

		/**
		* The URI to register for raw contacts delete notification.
		*
		* @hide
		*/
		@SystemApi
		@TestApi
		public static final Uri RAW_CONTACTS_NOTIFICATION_DELETE_URI =
		Uri.withAppendedPath(RAW_CONTACTS_NOTIFICATION_URI, "delete");
		public static final Uri CONTENT_URI = Uri.withAppendedPath(AUTHORITY_URI, "raw_contacts");

		/**
		* The MIME type of the results from {@link #CONTENT_URI} when a specific