Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit e85a3e54 authored by Etan Cohen's avatar Etan Cohen Committed by Android Git Automerger
Browse files

am 33a95f93: am 14c60bb1: am 466503d0: Merge "Add Carrier Presence to CP2: Phone" into mnc-dev 

* commit '33a95f93':
  Add Carrier Presence to CP2: Phone
parents 6b05ac51 33a95f93

api/current.txt

+2 −0
Original line number Diff line number Diff line
@@ -25587,6 +25587,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";

























api/system-current.txt



+2
−0




























Original line number
Diff line number
Diff line








@@ -27513,6 +27513,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";

























core/java/android/provider/ContactsContract.java



+16
−1




























Original line number
Diff line number
Diff line








@@ -4076,6 +4076,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;















    }































    /**