Merge "DO NOT MERGE - redo Ib5e519fb40d3191ecac06c03a844872df19f3963" into gingerbread

api/current.xml

@@ -137982,17 +137982,6 @@
  deprecated="not deprecated"
  visibility="protected"
 >
-<field name="CONTACT_CHAT_CAPABILITY"
- type="java.lang.String"
- transient="false"
- volatile="false"
- value="&quot;contact_chat_capability&quot;"
- static="true"
- final="true"
- deprecated="not deprecated"
- visibility="public"
->
-</field>
 <field name="CONTACT_PRESENCE"
  type="java.lang.String"
  transient="false"
@@ -139970,50 +139959,6 @@
  visibility="public"
 >
 </field>
-<field name="CAPABILITY_HAS_CAMERA"
- type="int"
- transient="false"
- volatile="false"
- value="4"
- static="true"
- final="true"
- deprecated="not deprecated"
- visibility="public"
->
-</field>
-<field name="CAPABILITY_HAS_VIDEO_PLAYBACK_ONLY"
- type="int"
- transient="false"
- volatile="false"
- value="1"
- static="true"
- final="true"
- deprecated="not deprecated"
- visibility="public"
->
-</field>
-<field name="CAPABILITY_HAS_VOICE"
- type="int"
- transient="false"
- volatile="false"
- value="2"
- static="true"
- final="true"
- deprecated="not deprecated"
- visibility="public"
->
-</field>
-<field name="CHAT_CAPABILITY"
- type="java.lang.String"
- transient="false"
- volatile="false"
- value="&quot;chat_capability&quot;"
- static="true"
- final="true"
- deprecated="not deprecated"
- visibility="public"
->
-</field>
 <field name="DO_NOT_DISTURB"
  type="int"
  transient="false"

core/java/android/provider/ContactsContract.java

@@ -412,6 +412,7 @@ public final class ContactsContract {
          * Contact Chat Capabilities. See {@link StatusUpdates} for individual
          * definitions.
          * <p>Type: NUMBER</p>
+         * @hide
          */
         public static final String CONTACT_CHAT_CAPABILITY = "contact_chat_capability";
 
@@ -1961,23 +1962,27 @@ public final class ContactsContract {
         /**
          * Contact's audio/video chat capability level.
          * <P>Type: INTEGER (one of the values below)</P>
+         * @hide
          */
         public static final String CHAT_CAPABILITY = "chat_capability";
 
         /**
          * An allowed value of {@link #CHAT_CAPABILITY}. Indicates that the contact's device can
          * display a video feed.
+         * @hide
          */
         public static final int CAPABILITY_HAS_VIDEO_PLAYBACK_ONLY = 1;
 
         /**
          * An allowed value of {@link #CHAT_CAPABILITY}. Indicates audio-chat capability.
+         * @hide
          */
         public static final int CAPABILITY_HAS_VOICE = 2;
 
         /**
          * An allowed value of {@link #CHAT_CAPABILITY}. Indicates that the contact's device has a
          * camera that can be used for video chat (e.g. a front-facing camera on a phone).
+         * @hide
          */
         public static final int CAPABILITY_HAS_CAMERA = 4;
     }
@@ -3119,31 +3124,6 @@ public final class ContactsContract {
      * <li>{@link #AVAILABLE}</li>
      * </ul>
      * </p>
-     * <p>
-     * Since presence status is inherently volatile, the content provider
-     * may choose not to store this field in long-term storage.
-     * </p>
-     * </td>
-     * </tr>
-     * <tr>
-     * <td>int</td>
-     * <td>{@link #CHAT_CAPABILITY}</td>
-     * <td>read/write</td>
-     * <td>Contact IM chat compatibility value. The allowed values are:
-     * <p>
-     * <ul>
-     * <li>{@link #CAPABILITY_HAS_VIDEO_PLAYBACK_ONLY}</li>
-     * <li>{@link #CAPABILITY_HAS_VOICE}</li>
-     * <li>{@link #CAPABILITY_HAS_CAMERA}</li>
-     * </ul>
-     * </p>
-     * <p>
-     * Since chat compatibility is inherently volatile as the contact's availability moves from
-     * one device to another, the content provider may choose not to store this field in long-term
-     * storage.
-     * </p>
-     * </td>
-     * </tr>
      * <tr>
      * <td>String</td>
      * <td>{@link #STATUS}</td>