diff options
| author | Etan Cohen <etancohen@google.com> | 2015-05-20 21:37:37 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2015-05-20 21:38:07 +0000 |
| commit | 466503d0bd3a128f6d2f22a8f040d508c1b4854b (patch) | |
| tree | 3bc95a0c3500848eb0f92e6a74bdfde1da8b5a0f /core/java/android/provider | |
| parent | f14c40f911e3dd874d28c3a4c6810bed6201c5ba (diff) | |
| parent | 534a65d3b674c8c3b7a1ecae008db3750df52888 (diff) | |
| download | frameworks_base-466503d0bd3a128f6d2f22a8f040d508c1b4854b.zip frameworks_base-466503d0bd3a128f6d2f22a8f040d508c1b4854b.tar.gz frameworks_base-466503d0bd3a128f6d2f22a8f040d508c1b4854b.tar.bz2 | |
Merge "Add Carrier Presence to CP2: Phone" into mnc-dev
Diffstat (limited to 'core/java/android/provider')
| -rw-r--r-- | core/java/android/provider/ContactsContract.java | 17 |
1 files changed, 16 insertions, 1 deletions
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 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, |