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

Commit 6436a282 authored by Hyunho Shin's avatar Hyunho Shin Committed by Automerger Merge Worker
Browse files

Merge "Add the feature tags for the pager mode, larege message mode, deffered... 

Merge "Add the feature tags for the pager mode, larege message mode, deffered messaging and large-pager mode." am: fe011e06

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2392836



Change-Id: I4faf86f09ce65b11946bc6d76ae8a6ca5afe4e0a
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents f02f774e fe011e06

core/api/system-current.txt

+1 −0
Original line number Diff line number Diff line
@@ -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";

  }

telephony/java/android/telephony/ims/RcsContactPresenceTuple.java

+11 −2
Original line number Diff line number Diff line
@@ -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 {}