Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Add RCS UP 2.4 profile string" am: bbe3fe79ee am: 2a4fdc0efd

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

Change-Id: Ice4a6145f157380d2421bacf2f69e5b07be503bb
This commit is contained in:
Joonhun Shin
2022-02-08 00:44:44 +00:00
committed by Automerger Merge Worker
parent 563893b2da 2a4fdc0efd
commit 6ddefa3fde
2 changed files with 10 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
core/api/system-current.txt
View File

@@ -13209,6 +13209,7 @@ package android.telephony.ims {
field @NonNull public static final android.os.Parcelable.Creator<android.telephony.ims.RcsClientConfiguration> CREATOR; 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_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_3 = "UP_2.3";
field public static final String RCS_PROFILE_2_4 = "UP_2.4";
} }
public final class RcsContactPresenceTuple implements android.os.Parcelable { public final class RcsContactPresenceTuple implements android.os.Parcelable {

14
telephony/java/android/telephony/ims/RcsClientConfiguration.java
View File

@@ -34,7 +34,7 @@ public final class RcsClientConfiguration implements Parcelable {
/**@hide*/ /**@hide*/
@StringDef(prefix = "RCS_PROFILE_", @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 {} public @interface StringRcsProfile {}
/** /**
@@ -45,6 +45,10 @@ public final class RcsClientConfiguration implements Parcelable {
* RCS profile UP 2.3 * RCS profile UP 2.3
*/ */
public static final String RCS_PROFILE_2_3 = "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 mRcsVersion;
private String mRcsProfile; private String mRcsProfile;
@@ -58,8 +62,8 @@ public final class RcsClientConfiguration implements Parcelable {
* @param rcsVersion The parameter identifies the RCS version supported * @param rcsVersion The parameter identifies the RCS version supported
* by the client. Refer to GSMA RCC.07 "rcs_version" parameter. * by the client. Refer to GSMA RCC.07 "rcs_version" parameter.
* @param rcsProfile Identifies a fixed set of RCS services that are * @param rcsProfile Identifies a fixed set of RCS services that are
* supported by the client. See {@link #RCS_PROFILE_1_0 } or * supported by the client. See {@link #RCS_PROFILE_1_0 },
* {@link #RCS_PROFILE_2_3 } * {@link #RCS_PROFILE_2_3 } or {@link #RCS_PROFILE_2_4 }
* @param clientVendor Identifies the vendor providing the RCS client. * @param clientVendor Identifies the vendor providing the RCS client.
* @param clientVersion Identifies the RCS client version. Refer to GSMA * @param clientVersion Identifies the RCS client version. Refer to GSMA
* RCC.07 "client_version" parameter. * RCC.07 "client_version" parameter.
@@ -80,8 +84,8 @@ public final class RcsClientConfiguration implements Parcelable {
* @param rcsVersion The parameter identifies the RCS version supported * @param rcsVersion The parameter identifies the RCS version supported
* by the client. Refer to GSMA RCC.07 "rcs_version" parameter. * by the client. Refer to GSMA RCC.07 "rcs_version" parameter.
* @param rcsProfile Identifies a fixed set of RCS services that are * @param rcsProfile Identifies a fixed set of RCS services that are
* supported by the client. See {@link #RCS_PROFILE_1_0 } or * supported by the client. See {@link #RCS_PROFILE_1_0 },
* {@link #RCS_PROFILE_2_3 } * {@link #RCS_PROFILE_2_3 } or {@link #RCS_PROFILE_2_4 }
* @param clientVendor Identifies the vendor providing the RCS client. * @param clientVendor Identifies the vendor providing the RCS client.
* @param clientVersion Identifies the RCS client version. Refer to GSMA * @param clientVersion Identifies the RCS client version. Refer to GSMA
* RCC.07 "client_version" parameter. * RCC.07 "client_version" parameter.