am bbc2b4e6: am 5b31498b: add video/audio chat-compatibility modes to ContactsContract

Merge commit 'bbc2b4e69a1788987a8fe959cc0105290b431283'

* commit 'bbc2b4e69a1788987a8fe959cc0105290b431283':
  add video/audio chat-compatibility modes to ContactsContract

2 files changed, 104 insertions, 0 deletions

diff --git a/api/current.xml b/api/current.xml
index 85b8e62..a9b9bad 100644
--- a/api/current.xml
+++ b/api/current.xml
@@ -135869,6 +135869,50 @@
  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"
@@ -138242,6 +138286,17 @@
  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"
diff --git a/core/java/android/provider/ContactsContract.java b/core/java/android/provider/ContactsContract.java
index 30b7fd7..889d3b6 100644
--- a/core/java/android/provider/ContactsContract.java
+++ b/core/java/android/provider/ContactsContract.java
@@ -675,6 +675,13 @@ public final class ContactsContract {
         public static final String CONTACT_PRESENCE = "contact_presence";
 
         /**
+         * Contact Chat Capabilities. See {@link StatusColumns#CHAT_CAPABILITY} for individual
+         * definitions.
+         * <p>Type: NUMBER</p>
+         */
+        public static final String CONTACT_CHAT_CAPABILITY = "contact_chat_capability";
+
+        /**
          * Contact's latest status update.
          * <p>Type: TEXT</p>
          */
@@ -2224,6 +2231,29 @@ public final class ContactsContract {
          * <p>Type: NUMBER</p>
          */
         public static final String STATUS_ICON = "status_icon";
+
+        /**
+         * Contact's audio/video chat capability level.
+         * <P>Type: INTEGER (one of the values below)</P>
+         */
+        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.
+         */
+        public static final int CAPABILITY_HAS_VIDEO_PLAYBACK_ONLY = 1;
+
+        /**
+         * An allowed value of {@link #CHAT_CAPABILITY}. Indicates audio-chat capability.
+         */
+        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).
+         */
+        public static final int CAPABILITY_HAS_CAMERA = 4;
     }
 
     /**
@@ -3377,6 +3407,25 @@ 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 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>
      * <td>read/write</td>