From dfa834eee1bcd000e911e56dac821aa5ea7234c2 Mon Sep 17 00:00:00 2001
From: Vasu Nori <vnori@google.com>
Date: Mon, 20 Sep 2010 14:48:38 -0700
Subject: [PATCH] (do not merge)hide videochat changes in gingerbread.
 bug:3001483

do not merge to master
Change-Id: Ib5e519fb40d3191ecac06c03a844872df19f3963
---
 api/current.xml                               | 55 -------------------
 .../android/provider/ContactsContract.java    | 25 ++-------
 2 files changed, 5 insertions(+), 75 deletions(-)

diff --git a/api/current.xml b/api/current.xml
index 51315ab0cc2d5..4b5b832b3f7e8 100644
--- a/api/current.xml
+++ b/api/current.xml
@@ -149648,17 +149648,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"
@@ -152195,50 +152184,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"
- type="int"
- transient="false"
- volatile="false"
- value="2"
- static="true"
- final="true"
- deprecated="not deprecated"
- visibility="public"
->
-</field>
-<field name="CAPABILITY_HAS_VOICE"
- type="int"
- transient="false"
- volatile="false"
- value="1"
- 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"
diff --git a/core/java/android/provider/ContactsContract.java b/core/java/android/provider/ContactsContract.java
index b2c1c2de79ce2..afbc8ada04052 100644
--- a/core/java/android/provider/ContactsContract.java
+++ b/core/java/android/provider/ContactsContract.java
@@ -716,6 +716,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";
 
@@ -2412,24 +2413,28 @@ 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 flag of {@link #CHAT_CAPABILITY}. Indicates audio-chat capability (microphone
          * and speaker)
+         * @hide
          */
         public static final int CAPABILITY_HAS_VOICE = 1;
 
         /**
          * An allowed flag of {@link #CHAT_CAPABILITY}. Indicates that the contact's device can
          * display a video feed.
+         * @hide
          */
         public static final int CAPABILITY_HAS_VIDEO = 2;
 
         /**
          * An allowed flag 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;
     }
@@ -3593,26 +3598,6 @@ public final class ContactsContract {
      * </td>
      * </tr>
      * <tr>
-     * <td>int</td>
-     * <td>{@link #CHAT_CAPABILITY}</td>
-     * <td>read/write</td>
-     * <td>Contact IM chat compatibility value. The allowed values combinations of the following
-     * flags. If None of these flags is set, the device can only do text messaging.
-     * <p>
-     * <ul>
-     * <li>{@link #CAPABILITY_HAS_VIDEO}</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>
      * <td>read/write</td>