diff options
| author | 2023-01-21 04:44:58 +0000 | |
|---|---|---|
| committer | 2023-01-21 04:44:58 +0000 | |
| commit | 38961854031bfd8e7bb154e6f0ee40a3782249e4 (patch) | |
| tree | f4e14f8334ba001578880030d697d0ee377e83ae | |
| parent | 65717388fd4eb34015faa254be6050151ba8e2ee (diff) | |
| parent | 6436a28291e3d322592f36239ce81a2cbc102f17 (diff) | |
Merge "Add the feature tags for the pager mode, larege message mode, deffered messaging and large-pager mode." am: fe011e06b5 am: 6436a28291
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2392836
Change-Id: Ib302b13d0405154c9a5ee6aa86e63c8426536dfa
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
| -rw-r--r-- | core/api/system-current.txt | 1 | ||||
| -rw-r--r-- | telephony/java/android/telephony/ims/RcsContactPresenceTuple.java | 13 |
2 files changed, 12 insertions, 2 deletions
diff --git a/core/api/system-current.txt b/core/api/system-current.txt index 49a5aa76a6ac..8a1d6f2c9fcf 100644 --- a/core/api/system-current.txt +++ b/core/api/system-current.txt @@ -14968,6 +14968,7 @@ package android.telephony.ims { field public static final String SERVICE_ID_POST_CALL = "org.3gpp.urn:urn-7:3gpp-service.ims.icsi.gsma.callunanswered"; field public static final String SERVICE_ID_SHARED_MAP = "org.3gpp.urn:urn-7:3gpp-service.ims.icsi.gsma.sharedmap"; field public static final String SERVICE_ID_SHARED_SKETCH = "org.3gpp.urn:urn-7:3gpp-service.ims.icsi.gsma.sharedsketch"; + field public static final String SERVICE_ID_SLM = "org.openmobilealliance:StandaloneMsg"; field public static final String TUPLE_BASIC_STATUS_CLOSED = "closed"; field public static final String TUPLE_BASIC_STATUS_OPEN = "open"; } diff --git a/telephony/java/android/telephony/ims/RcsContactPresenceTuple.java b/telephony/java/android/telephony/ims/RcsContactPresenceTuple.java index 6a6c3063483e..74bac22c4d00 100644 --- a/telephony/java/android/telephony/ims/RcsContactPresenceTuple.java +++ b/telephony/java/android/telephony/ims/RcsContactPresenceTuple.java @@ -147,7 +147,7 @@ public final class RcsContactPresenceTuple implements Parcelable { "org.3gpp.urn:urn-7:3gpp-application.ims.iari.rcs.chatbot"; /** - * The service ID used to indicate that the Standalone Messaging is available. + * The service ID used to indicate that the Chatbot using Standalone Messaging is available. * <p> * See the GSMA RCC.07 specification for more information. */ @@ -161,6 +161,14 @@ public final class RcsContactPresenceTuple implements Parcelable { */ public static final String SERVICE_ID_CHATBOT_ROLE = "org.gsma.rcs.isbot"; + /** + * The service ID used to indicate that the Standalone Messaging is available. + * <p> + * See the GSMA RCC.07 RCS5_1_advanced_communications_specification_v4.0 specification + * for more information. + */ + public static final String SERVICE_ID_SLM = "org.openmobilealliance:StandaloneMsg"; + /** @hide */ @Retention(RetentionPolicy.SOURCE) @StringDef(prefix = "SERVICE_ID_", value = { @@ -177,7 +185,8 @@ public final class RcsContactPresenceTuple implements Parcelable { SERVICE_ID_SHARED_SKETCH, SERVICE_ID_CHATBOT, SERVICE_ID_CHATBOT_STANDALONE, - SERVICE_ID_CHATBOT_ROLE + SERVICE_ID_CHATBOT_ROLE, + SERVICE_ID_SLM }) public @interface ServiceId {} |