From 149a6c90345c475501c1660609ad73f747f612e2 Mon Sep 17 00:00:00 2001 From: Ricky Wai Date: Mon, 25 Apr 2016 12:14:53 +0100 Subject: [PATCH] Fix enterprise contacts APIs naming and docs Bug: 28295752 Change-Id: I504af42ab1146c6c82f54773c25450d41445345c --- api/current.txt | 2 +- api/system-current.txt | 2 +- api/test-current.txt | 2 +- .../android/provider/ContactsContract.java | 20 ++++++++++++++----- 4 files changed, 18 insertions(+), 8 deletions(-) diff --git a/api/current.txt b/api/current.txt index 15fc14909231a..feb2ce0267f18 100644 --- a/api/current.txt +++ b/api/current.txt @@ -31589,7 +31589,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"; diff --git a/api/system-current.txt b/api/system-current.txt index c489435bc0930..81ec8264a7454 100644 --- a/api/system-current.txt +++ b/api/system-current.txt @@ -34176,7 +34176,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"; diff --git a/api/test-current.txt b/api/test-current.txt index f6340b205d60d..de231cd97a8ee 100644 --- a/api/test-current.txt +++ b/api/test-current.txt @@ -31661,7 +31661,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"; diff --git a/core/java/android/provider/ContactsContract.java b/core/java/android/provider/ContactsContract.java index 3658df9a84434..5798da37b9d90 100644 --- a/core/java/android/provider/ContactsContract.java +++ b/core/java/android/provider/ContactsContract.java @@ -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");