diff options
| author | Allen Su <allenwtsu@google.com> | 2020-12-22 07:16:06 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-12-22 07:16:06 +0000 |
| commit | 103627d3bc60fe44efae97c2a526dbe20ed3845f (patch) | |
| tree | 06e51bd2d3a0dcdd0363791d55ae5aa4f2c50154 /core/java | |
| parent | 92cbd59571759ffa257c81b325467400184e5612 (diff) | |
| parent | 2fc4cc29bcad1dee8c4eea3c73f129b01966f78b (diff) | |
Merge "[RCS]Add new carrier configs for presence" am: f2fdcff51e am: 992b4ffdf8 am: 2fc4cc29bc
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1511319
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I704895d43045983426ea3fff2363bfed8e9281b8
Diffstat (limited to 'core/java')
| -rw-r--r-- | core/java/android/provider/ContactsContract.java | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/core/java/android/provider/ContactsContract.java b/core/java/android/provider/ContactsContract.java index b2b8db19ac17..376d9421e8d3 100644 --- a/core/java/android/provider/ContactsContract.java +++ b/core/java/android/provider/ContactsContract.java @@ -4313,13 +4313,23 @@ public final class ContactsContract { * <P> * Type: INTEGER (A bitmask of CARRIER_PRESENCE_* fields) * </P> + * + * @deprecated The contacts database will only show presence + * information on devices where + * {@link android.telephony.CarrierConfigManager#KEY_USE_RCS_PRESENCE_BOOL} is true, + * otherwise use {@link android.telephony.ims.RcsUceAdapter}. */ + @Deprecated public static final String CARRIER_PRESENCE = "carrier_presence"; /** * Indicates that the entry is Video Telephony (VT) capable on the * current carrier. An allowed bitmask of {@link #CARRIER_PRESENCE}. + * + * @deprecated Same as {@link DataColumns#CARRIER_PRESENCE}. + * */ + @Deprecated public static final int CARRIER_PRESENCE_VT_CAPABLE = 0x01; /** |