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

am 0c23212e: Re-hide the contacts APIs, the droiddoc build is failing.

Browse Source 
Merge commit '0c23212ebdfbe008aca95d2ace2e52ca0a0b7ec7' into eclair-plus-aosp

* commit '0c23212ebdfbe008aca95d2ace2e52ca0a0b7ec7':
  Re-hide the contacts APIs, the droiddoc build is failing.
This commit is contained in:
Jeff Hamilton
2009-09-23 22:34:33 -07:00
committed by Android Git Automerger
parent 4653512fc1 0c23212ebd
commit f4c102c4a8
1 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -40,7 +40,10 @@ import java.io.InputStream;
/** /**
* The contract between the contacts provider and applications. Contains definitions * The contract between the contacts provider and applications. Contains definitions
* for the supported URIs and columns. These APIs supersede {@link Contacts}. * for the supported URIs and columns. These APIs supersede {@link Contacts}.
*
* @hide
*/ */
@SuppressWarnings("unused")
public final class ContactsContract { public final class ContactsContract {
/** The authority for the contacts provider */ /** The authority for the contacts provider */
public static final String AUTHORITY = "com.android.contacts"; public static final String AUTHORITY = "com.android.contacts";
@@ -225,7 +228,7 @@ public final class ContactsContract {
public static final String IN_VISIBLE_GROUP = "in_visible_group"; public static final String IN_VISIBLE_GROUP = "in_visible_group";
/** /**
* Contact presence status. See {@link android.provider.Im.CommonPresenceColumns} * Contact presence status. See {@link PresenceColumns}
* for individual status definitions. This column is only returned if explicitly * for individual status definitions. This column is only returned if explicitly
* requested in the query projection. * requested in the query projection.
* <p>Type: NUMBER</p> * <p>Type: NUMBER</p>
@@ -2531,8 +2534,6 @@ public final class ContactsContract {
/** /**
* The extra field for the IM protocol * The extra field for the IM protocol
* <P>Type: the result of {@link CommonDataKinds.Im#encodePredefinedImProtocol(int)}
* or {@link CommonDataKinds.Im#encodeCustomImProtocol(String)}.</P>
*/ */
public static final String IM_PROTOCOL = "im_protocol"; public static final String IM_PROTOCOL = "im_protocol";