Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
* commit '14c60bb126f00435647d466f730449d3cfa6457f':
  Add Carrier Presence to CP2: Phone
This commit is contained in:
Etan Cohen
2015-05-20 22:06:44 +00:00
committed by Android Git Automerger
parent 65dbdc79ed 14c60bb126
commit 33a95f93ca
3 changed files with 20 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
api/current.txt
View File

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

2
api/system-current.txt
View File

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

17
core/java/android/provider/ContactsContract.java
View File

@@ -4069,6 +4069,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;
}
/**
@@ -8265,7 +8280,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,