commit 466503d0bd3a128f6d2f22a8f040d508c1b4854b
author Etan Cohen <etancohen@google.com> Wed May 20 21:37:37 2015 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Wed May 20 21:38:07 2015 +0000
tree 3bc95a0c3500848eb0f92e6a74bdfde1da8b5a0f
parent f14c40f911e3dd874d28c3a4c6810bed6201c5ba
parent 534a65d3b674c8c3b7a1ecae008db3750df52888

Merge "Add Carrier Presence to CP2: Phone" into mnc-dev

api/current.txt

diff --git a/api/current.txt b/api/current.txt
index e1d7c2b..e6ddd63 100644
--- a/api/current.txt
+++ b/api/current.txt
@@ -25585,6 +25585,8 @@
   }
 
   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";

api/system-current.txt

diff --git a/api/system-current.txt b/api/system-current.txt
index 5772f6d..93d7577 100644
--- a/api/system-current.txt
+++ b/api/system-current.txt
@@ -27511,6 +27511,8 @@
   }
 
   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";

core/java/android/provider/ContactsContract.java

diff --git a/core/java/android/provider/ContactsContract.java b/core/java/android/provider/ContactsContract.java
index c070924..76a5f967 100644
--- a/core/java/android/provider/ContactsContract.java
+++ b/core/java/android/provider/ContactsContract.java
@@ -4069,6 +4069,21 @@
         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;
     }
 
     /**
@@ -8265,7 +8280,7 @@
         /**
          * 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,