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

Commit 6bf12e12 authored by James Lin's avatar James Lin Committed by Automerger Merge Worker
Browse files

Merge "Add carrier config for the SIP 486 request forbidden and add API for... 

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: 011be0d1 am: b776230e am: 50c3a90c

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

Change-Id: If268eafc96cf72b9e241290952fc2d005001ea8e
parents fd653dee 50c3a90c

telephony/java/android/telephony/CarrierConfigManager.java

+22 −0
Original line number Original line Diff line number Diff line
@@ -4279,6 +4279,26 @@ public class CarrierConfigManager { 
        public static final String KEY_RCS_FEATURE_TAG_ALLOWED_STRING_ARRAY =

        public static final String KEY_RCS_FEATURE_TAG_ALLOWED_STRING_ARRAY =

                KEY_PREFIX + "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 Ims() {}





        private static PersistableBundle getDefaults() {

        private static PersistableBundle getDefaults() {
@@ -4292,6 +4312,8 @@ public class CarrierConfigManager { 
            defaults.putBoolean(KEY_RCS_BULK_CAPABILITY_EXCHANGE_BOOL, false);

            defaults.putBoolean(KEY_RCS_BULK_CAPABILITY_EXCHANGE_BOOL, false);

            defaults.putBoolean(KEY_ENABLE_PRESENCE_GROUP_SUBSCRIBE_BOOL, true);

            defaults.putBoolean(KEY_ENABLE_PRESENCE_GROUP_SUBSCRIBE_BOOL, true);

            defaults.putInt(KEY_NON_RCS_CAPABILITIES_CACHE_EXPIRATION_SEC_INT, 30 * 24 * 60 * 60);

            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[]{

            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.msg\"",

                    "+g.3gpp.icsi-ref=\"urn%3Aurn-7%3A3gpp-service.ims.icsi.oma.cpm.largemsg\"",

                    "+g.3gpp.icsi-ref=\"urn%3Aurn-7%3A3gpp-service.ims.icsi.oma.cpm.largemsg\"",

telephony/java/com/android/internal/telephony/ITelephony.aidl

+6 −0
Original line number Original line Diff line number Diff line
@@ -2427,6 +2427,12 @@ interface ITelephony { 
     */

     */

    String getLastUcePidfXmlShell(int subId);

    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

     * Set a SignalStrengthUpdateRequest to receive notification when Signal Strength breach the

     * specified thresholds.

     * specified thresholds.