Merge "Fix enterprise contacts APIs naming and docs" into nyc-dev (ecab71c9) · Commits · e / os / android_frameworks_base

api/current.txt

+1 −1

Original line number	Diff line number	Diff line
		@@ -31558,7 +31558,7 @@ package android.provider {

		public static final class ContactsContract.Directory implements android.provider.BaseColumns {
		method public static boolean isEnterpriseDirectoryId(long);
		method public static boolean isRemoteDirectory(long);
		method public static boolean isRemoteDirectoryId(long);
		method public static void notifyDirectoryChange(android.content.ContentResolver);
		field public static final java.lang.String ACCOUNT_NAME = "accountName";
		field public static final java.lang.String ACCOUNT_TYPE = "accountType";

api/system-current.txt

+1 −1

Original line number	Diff line number	Diff line
		@@ -34125,7 +34125,7 @@ package android.provider {

		public static final class ContactsContract.Directory implements android.provider.BaseColumns {
		method public static boolean isEnterpriseDirectoryId(long);
		method public static boolean isRemoteDirectory(long);
		method public static boolean isRemoteDirectoryId(long);
		method public static void notifyDirectoryChange(android.content.ContentResolver);
		field public static final java.lang.String ACCOUNT_NAME = "accountName";
		field public static final java.lang.String ACCOUNT_TYPE = "accountType";

api/test-current.txt

+1 −1

Original line number	Diff line number	Diff line
		@@ -31631,7 +31631,7 @@ package android.provider {

		public static final class ContactsContract.Directory implements android.provider.BaseColumns {
		method public static boolean isEnterpriseDirectoryId(long);
		method public static boolean isRemoteDirectory(long);
		method public static boolean isRemoteDirectoryId(long);
		method public static void notifyDirectoryChange(android.content.ContentResolver);
		field public static final java.lang.String ACCOUNT_NAME = "accountName";
		field public static final java.lang.String ACCOUNT_TYPE = "accountType";

core/java/android/provider/ContactsContract.java

+15 −5

Original line number	Diff line number	Diff line
		@@ -607,13 +607,23 @@ public final class ContactsContract {
		/**
		* Return TRUE if it is a remote stored directory.
		*/
		public static boolean isRemoteDirectory(long directoryId) {
		public static boolean isRemoteDirectoryId(long directoryId) {
		return directoryId != Directory.DEFAULT
		&& directoryId != Directory.LOCAL_INVISIBLE
		&& directoryId != Directory.ENTERPRISE_DEFAULT
		&& directoryId != Directory.ENTERPRISE_LOCAL_INVISIBLE;
		}

		/**
		* Return TRUE if it is a remote stored directory. TODO: Remove this method once all
		* internal apps are not using this API.
		*
		* @hide
		*/
		public static boolean isRemoteDirectory(long directoryId) {
		return isRemoteDirectoryId(directoryId);
		}

		/**
		* Return TRUE if a directory ID is from the contacts provider on the enterprise profile.
		*
		@@ -1659,7 +1669,7 @@ public final class ContactsContract {
		/**
		* It supports the similar semantics as {@link #CONTENT_FILTER_URI} and returns the same
		* columns. This URI requires {@link ContactsContract#DIRECTORY_PARAM_KEY} in parameters,
		* otherwise it will throw UnsupportedOperationException.
		* otherwise it will throw IllegalArgumentException.
		*/
		public static final Uri ENTERPRISE_CONTENT_FILTER_URI = Uri.withAppendedPath(
		CONTENT_URI, "filter_enterprise");
		@@ -5962,7 +5972,7 @@ public final class ContactsContract {
		/**
		* It supports the similar semantics as {@link #CONTENT_FILTER_URI} and returns the same
		* columns. This URI requires {@link ContactsContract#DIRECTORY_PARAM_KEY} in
		* parameters, otherwise it will throw UnsupportedOperationException.
		* parameters, otherwise it will throw IllegalArgumentException.
		*/
		public static final Uri ENTERPRISE_CONTENT_FILTER_URI = Uri.withAppendedPath(
		CONTENT_URI, "filter_enterprise");
		@@ -6242,7 +6252,7 @@ public final class ContactsContract {
		/**
		* It supports the similar semantics as {@link #CONTENT_FILTER_URI} and returns the same
		* columns. This URI requires {@link ContactsContract#DIRECTORY_PARAM_KEY} in
		* parameters, otherwise it will throw UnsupportedOperationException.
		* parameters, otherwise it will throw IllegalArgumentException.
		*/
		public static final Uri ENTERPRISE_CONTENT_FILTER_URI = Uri.withAppendedPath(
		CONTENT_URI, "filter_enterprise");
		@@ -7464,7 +7474,7 @@ public final class ContactsContract {
		/**
		* Similar to {@link Phone#ENTERPRISE_CONTENT_FILTER_URI}, but allows users to filter
		* callable data. This URI requires {@link ContactsContract#DIRECTORY_PARAM_KEY} in
		* parameters, otherwise it will throw UnsupportedOperationException.
		* parameters, otherwise it will throw IllegalArgumentException.
		*/
		public static final Uri ENTERPRISE_CONTENT_FILTER_URI = Uri.withAppendedPath(
		CONTENT_URI, "filter_enterprise");