From 534a65d3b674c8c3b7a1ecae008db3750df52888 Mon Sep 17 00:00:00 2001
From: Etan Cohen <etancohen@google.com>
Date: Fri, 1 May 2015 11:03:24 -0700
Subject: [PATCH] Add Carrier Presence to CP2: Phone

Carrier Presence (RCS-based) is required for IMS-based telephony
services: VoLTE, WFC, and VT (Video Telephony). Public API in the
form of Presence column is added to Phone. Initial bit-field is
defined for for VT capability.

Change-Id: Ice78f895acf89a91f7478115e64caeb8d26f5456
---
 api/current.txt                                 |  2 ++
 api/system-current.txt                          |  2 ++
 .../java/android/provider/ContactsContract.java | 17 ++++++++++++++++-
 3 files changed, 20 insertions(+), 1 deletion(-)

diff --git a/api/current.txt b/api/current.txt
index 2bbe2f1ffb21e..619ff4f97c0c9 100644
--- a/api/current.txt
+++ b/api/current.txt
@@ -25853,6 +25853,8 @@ package android.provider {
   }
 
   protected static abstract interface ContactsContract.DataColumns {
+    field public static final java.lang.String CARRIER_PRESENCE = "carrier_presence";
+    field public static final int CARRIER_PRESENCE_VT_CAPABLE = 1; // 0x1
     field public static final java.lang.String DATA1 = "data1";
     field public static final java.lang.String DATA10 = "data10";
     field public static final java.lang.String DATA11 = "data11";
diff --git a/api/system-current.txt b/api/system-current.txt
index 0cc763bafcccd..afbdc9094102d 100644
--- a/api/system-current.txt
+++ b/api/system-current.txt
@@ -27763,6 +27763,8 @@ package android.provider {
   }
 
   protected static abstract interface ContactsContract.DataColumns {
+    field public static final java.lang.String CARRIER_PRESENCE = "carrier_presence";
+    field public static final int CARRIER_PRESENCE_VT_CAPABLE = 1; // 0x1
     field public static final java.lang.String DATA1 = "data1";
     field public static final java.lang.String DATA10 = "data10";
     field public static final java.lang.String DATA11 = "data11";
diff --git a/core/java/android/provider/ContactsContract.java b/core/java/android/provider/ContactsContract.java
index 396cf19df1b33..68b33d49b48f0 100644
--- a/core/java/android/provider/ContactsContract.java
+++ b/core/java/android/provider/ContactsContract.java
@@ -4067,6 +4067,21 @@ public final class ContactsContract {
         public static final String SYNC3 = "data_sync3";
         /** Generic column for use by sync adapters. */
         public static final String SYNC4 = "data_sync4";
+
+        /**
+         * Carrier presence information.
+         * <P>
+         * Type: INTEGER (A bitmask of CARRIER_PRESENCE_* fields)
+         * </P>
+         */
+        public static final String CARRIER_PRESENCE = "carrier_presence";
+
+        /**
+         * Bitmask flags for CARRIER_PRESENCE column. Each value represents
+         * a bit (or a set of bits) which may be set independently of each
+         * other.
+         */
+        public static final int CARRIER_PRESENCE_VT_CAPABLE = 0x01;
     }
 
     /**
@@ -8261,7 +8276,7 @@ public final class ContactsContract {
         /**
          * Constructs a QuickContacts intent based on an incoming intent for DevicePolicyManager
          * to strip off anything not necessary.
-         * 
+         *
          * @hide
          */
         public static Intent rebuildManagedQuickContactsIntent(String lookupKey, long contactId,