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

Commit 2a4fdc0e authored by Joonhun Shin's avatar Joonhun Shin Committed by Automerger Merge Worker
Browse files

Merge "Add RCS UP 2.4 profile string" am: bbe3fe79 

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

Change-Id: I187ebfe9bf2845c04bcebefa4725176c3f19d74b
parents b81bde5c bbe3fe79

core/api/system-current.txt

+1 −0
Original line number Diff line number Diff line
@@ -13209,6 +13209,7 @@ package android.telephony.ims { 
    field @NonNull public static final android.os.Parcelable.Creator<android.telephony.ims.RcsClientConfiguration> CREATOR;

    field public static final String RCS_PROFILE_1_0 = "UP_1.0";

    field public static final String RCS_PROFILE_2_3 = "UP_2.3";

    field public static final String RCS_PROFILE_2_4 = "UP_2.4";

  }















  public final class RcsContactPresenceTuple implements android.os.Parcelable {

























telephony/java/android/telephony/ims/RcsClientConfiguration.java



+9
−5




























Original line number
Diff line number
Diff line








@@ -34,7 +34,7 @@ public final class RcsClientConfiguration implements Parcelable {





























    /**@hide*/















    @StringDef(prefix = "RCS_PROFILE_",













            value = {RCS_PROFILE_1_0, RCS_PROFILE_2_3})













            value = {RCS_PROFILE_1_0, RCS_PROFILE_2_3, RCS_PROFILE_2_4})















    public @interface StringRcsProfile {}































    /**









@@ -45,6 +45,10 @@ public final class RcsClientConfiguration implements Parcelable {













     * RCS profile UP 2.3















     */















    public static final String RCS_PROFILE_2_3 = "UP_2.3";













    /**













     * RCS profile UP 2.4













     */













    public static final String RCS_PROFILE_2_4 = "UP_2.4";































    private String mRcsVersion;















    private String mRcsProfile;









@@ -58,8 +62,8 @@ public final class RcsClientConfiguration implements Parcelable {













     * @param rcsVersion The parameter identifies the RCS version supported















     * by the client. Refer to GSMA RCC.07 "rcs_version" parameter.















     * @param rcsProfile Identifies a fixed set of RCS services that are













     * supported by the client. See {@link #RCS_PROFILE_1_0 } or













     * {@link #RCS_PROFILE_2_3 }













     * supported by the client. See {@link #RCS_PROFILE_1_0 },













     * {@link #RCS_PROFILE_2_3 } or {@link #RCS_PROFILE_2_4 }















     * @param clientVendor Identifies the vendor providing the RCS client.















     * @param clientVersion Identifies the RCS client version. Refer to GSMA















     * RCC.07 "client_version" parameter.









@@ -80,8 +84,8 @@ public final class RcsClientConfiguration implements Parcelable {













     * @param rcsVersion The parameter identifies the RCS version supported















     * by the client. Refer to GSMA RCC.07 "rcs_version" parameter.















     * @param rcsProfile Identifies a fixed set of RCS services that are













     * supported by the client. See {@link #RCS_PROFILE_1_0 } or













     * {@link #RCS_PROFILE_2_3 }













     * supported by the client. See {@link #RCS_PROFILE_1_0 },













     * {@link #RCS_PROFILE_2_3 } or {@link #RCS_PROFILE_2_4 }















     * @param clientVendor Identifies the vendor providing the RCS client.















     * @param clientVersion Identifies the RCS client version. Refer to GSMA















     * RCC.07 "client_version" parameter.