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

Merge "Add carrier config for the SIP 486 request forbidden and add API for SHELL command to remove the UCE requests cannot be sent the network status." am: 011be0d15a am: b776230e12

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

Change-Id: Idf731b0b9ee15a4bb85677cc368b6271ba873bf4
This commit is contained in:
James Lin
2021-05-09 15:41:09 +00:00
committed by Automerger Merge Worker
parent 074175209a b776230e12
commit 50c3a90cb3
2 changed files with 28 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
telephony/java/android/telephony/CarrierConfigManager.java
View File

@@ -4106,6 +4106,26 @@ public class CarrierConfigManager {
public static final String KEY_RCS_FEATURE_TAG_ALLOWED_STRING_ARRAY =
KEY_PREFIX + "rcs_feature_tag_allowed_string_array";
/**
* Flag indicating whether or not carrier forbids device send the RCS request when the
* device receive the network response with the SIP code 489 BAD EVENT.
* <p>
* The default value for this key is {@code false}.
* @hide
*/
public static final String KEY_RCS_REQUEST_FORBIDDEN_BY_SIP_489_BOOL =
KEY_PREFIX + "rcs_request_forbidden_by_sip_489_bool";
/**
* Indicates the interval that SUBSCRIBE requests from applications will be retried at when
* the carrier network has responded to a previous request with a forbidden error.
* <p>
* The default value for this key is 20 minutes.
* @hide
*/
public static final String KEY_RCS_REQUEST_RETRY_INTERVAL_MILLIS_LONG =
KEY_PREFIX + "rcs_request_retry_interval_millis_long";
private Ims() {}
private static PersistableBundle getDefaults() {
@@ -4119,6 +4139,8 @@ public class CarrierConfigManager {
defaults.putBoolean(KEY_RCS_BULK_CAPABILITY_EXCHANGE_BOOL, false);
defaults.putBoolean(KEY_ENABLE_PRESENCE_GROUP_SUBSCRIBE_BOOL, true);
defaults.putInt(KEY_NON_RCS_CAPABILITIES_CACHE_EXPIRATION_SEC_INT, 30 * 24 * 60 * 60);
defaults.putBoolean(KEY_RCS_REQUEST_FORBIDDEN_BY_SIP_489_BOOL, false);
defaults.putLong(KEY_RCS_REQUEST_RETRY_INTERVAL_MILLIS_LONG, 20 * 60 * 1000);
defaults.putStringArray(KEY_RCS_FEATURE_TAG_ALLOWED_STRING_ARRAY, new String[]{
"+g.3gpp.icsi-ref=\"urn%3Aurn-7%3A3gpp-service.ims.icsi.oma.cpm.msg\"",
"+g.3gpp.icsi-ref=\"urn%3Aurn-7%3A3gpp-service.ims.icsi.oma.cpm.largemsg\"",

6
telephony/java/com/android/internal/telephony/ITelephony.aidl
View File

@@ -2402,6 +2402,12 @@ interface ITelephony {
*/
String getLastUcePidfXmlShell(int subId);
/**
* Remove UCE requests cannot be sent to the network status.
* Note: This is designed for a SHELL command only.
*/
boolean removeUceRequestDisallowedStatus(int subId);
/**
* Set a SignalStrengthUpdateRequest to receive notification when Signal Strength breach the
* specified thresholds.