Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Fix enterprise contacts APIs naming and docs" into nyc-dev am: 13532bdd2e

Browse Source 
am: ecab71c9f7

* commit 'ecab71c9f77cb0386a1be1c78e73bedf2524a536':
  Fix enterprise contacts APIs naming and docs

Change-Id: Idad8e3ee643ba955951a58185f4a8640579db206
This commit is contained in:
Tony Mak
2016-05-06 12:23:58 +00:00
committed by android-build-merger
parent d56153c1d5 ecab71c9f7
commit a31f37dc1c
4 changed files with 18 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
api/current.txt
View File

@@ -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";

2
api/system-current.txt
View File

@@ -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";

2
api/test-current.txt
View File

@@ -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";

20
core/java/android/provider/ContactsContract.java
View File

@@ -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");