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

Commit 40cf3c80 authored by Jack Yu's avatar Jack Yu Committed by Automerger Merge Worker
Browse files

Merge "Fixed permananent failure behaviors" am: 3084175e am: 96658f37 

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



Change-Id: Ic7cd33f6253eb9e29f67ce5c4aba68d786786674
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents daea1ed1 96658f37

core/api/current.txt

+1 −1
Original line number Original line Diff line number Diff line
@@ -41227,7 +41227,7 @@ package android.telephony { 
    field public static final String KEY_CARRIER_CONFIG_APPLIED_BOOL = "carrier_config_applied_bool";

    field public static final String KEY_CARRIER_CONFIG_APPLIED_BOOL = "carrier_config_applied_bool";

    field public static final String KEY_CARRIER_CONFIG_VERSION_STRING = "carrier_config_version_string";

    field public static final String KEY_CARRIER_CONFIG_VERSION_STRING = "carrier_config_version_string";

    field public static final String KEY_CARRIER_CROSS_SIM_IMS_AVAILABLE_BOOL = "carrier_cross_sim_ims_available_bool";

    field public static final String KEY_CARRIER_CROSS_SIM_IMS_AVAILABLE_BOOL = "carrier_cross_sim_ims_available_bool";

    field public static final String KEY_CARRIER_DATA_CALL_PERMANENT_FAILURE_STRINGS = "carrier_data_call_permanent_failure_strings";

    field @Deprecated public static final String KEY_CARRIER_DATA_CALL_PERMANENT_FAILURE_STRINGS = "carrier_data_call_permanent_failure_strings";

    field public static final String KEY_CARRIER_DEFAULT_ACTIONS_ON_DCFAILURE_STRING_ARRAY = "carrier_default_actions_on_dcfailure_string_array";

    field public static final String KEY_CARRIER_DEFAULT_ACTIONS_ON_DCFAILURE_STRING_ARRAY = "carrier_default_actions_on_dcfailure_string_array";

    field public static final String KEY_CARRIER_DEFAULT_ACTIONS_ON_DEFAULT_NETWORK_AVAILABLE = "carrier_default_actions_on_default_network_available_string_array";

    field public static final String KEY_CARRIER_DEFAULT_ACTIONS_ON_DEFAULT_NETWORK_AVAILABLE = "carrier_default_actions_on_default_network_available_string_array";

    field public static final String KEY_CARRIER_DEFAULT_ACTIONS_ON_REDIRECTION_STRING_ARRAY = "carrier_default_actions_on_redirection_string_array";

    field public static final String KEY_CARRIER_DEFAULT_ACTIONS_ON_REDIRECTION_STRING_ARRAY = "carrier_default_actions_on_redirection_string_array";

telephony/java/android/telephony/CarrierConfigManager.java

+19 −8
Original line number Original line Diff line number Diff line
@@ -1180,8 +1180,12 @@ public class CarrierConfigManager { 
            "carrier_data_call_retry_network_requested_max_count_int";

            "carrier_data_call_retry_network_requested_max_count_int";





    /**

    /**

     * Data call setup permanent failure causes by the carrier

     * Data call setup permanent failure causes by the carrier.

     *

     * @deprecated This API key was added in mistake and is not used anymore by the telephony data

     * frameworks.

     */

     */

    @Deprecated

    public static final String KEY_CARRIER_DATA_CALL_PERMANENT_FAILURE_STRINGS =

    public static final String KEY_CARRIER_DATA_CALL_PERMANENT_FAILURE_STRINGS =

            "carrier_data_call_permanent_failure_strings";

            "carrier_data_call_permanent_failure_strings";
@@ -8308,7 +8312,8 @@ public class CarrierConfigManager { 
     *

     *

     * The syntax of the retry rule:

     * The syntax of the retry rule:

     * 1. Retry based on {@link NetworkCapabilities}. Note that only APN-type network capabilities

     * 1. Retry based on {@link NetworkCapabilities}. Note that only APN-type network capabilities

     *    are supported.

     *    are supported. If the capabilities are not specified, then the retry rule only applies

     *    to the current failed APN used in setup data call request.

     * "capabilities=[netCaps1|netCaps2|...], [retry_interval=n1|n2|n3|n4...], [maximum_retries=n]"

     * "capabilities=[netCaps1|netCaps2|...], [retry_interval=n1|n2|n3|n4...], [maximum_retries=n]"

     *

     *

     * 2. Retry based on {@link DataFailCause}

     * 2. Retry based on {@link DataFailCause}
@@ -8319,15 +8324,16 @@ public class CarrierConfigManager { 
     * "capabilities=[netCaps1|netCaps2|...], fail_causes=[cause1|cause2|cause3|...],

     * "capabilities=[netCaps1|netCaps2|...], fail_causes=[cause1|cause2|cause3|...],

     *     [retry_interval=n1|n2|n3|n4...], [maximum_retries=n]"

     *     [retry_interval=n1|n2|n3|n4...], [maximum_retries=n]"

     *

     *

     * 4. Permanent fail causes (no timer-based retry) on the current failed APN. Retry interval

     *    is specified for retrying the next available APN.

     * "permanent_fail_causes=8|27|28|29|30|32|33|35|50|51|111|-5|-6|65537|65538|-3|65543|65547|

     *     2252|2253|2254, retry_interval=2500"

     *

     * For example,

     * For example,

     * "capabilities=eims, retry_interval=1000, maximum_retries=20" means if the attached

     * "capabilities=eims, retry_interval=1000, maximum_retries=20" means if the attached

     * network request is emergency, then retry data network setup every 1 second for up to 20

     * network request is emergency, then retry data network setup every 1 second for up to 20

     * times.

     * times.

     *

     *

     * "fail_causes=8|27|28|29|30|32|33|35|50|51|111|-5|-6|65537|65538|-3|2253|2254

     * , maximum_retries=0" means for those fail causes, never retry with timers. Note that

     * when environment changes, retry can still happen.

     *

     * "capabilities=internet|enterprise|dun|ims|fota, retry_interval=2500|3000|"

     * "capabilities=internet|enterprise|dun|ims|fota, retry_interval=2500|3000|"

     * "5000|10000|15000|20000|40000|60000|120000|240000|600000|1200000|1800000"

     * "5000|10000|15000|20000|40000|60000|120000|240000|600000|1200000|1800000"

     * "1800000, maximum_retries=20" means for those capabilities, retry happens in 2.5s, 3s, 5s,

     * "1800000, maximum_retries=20" means for those capabilities, retry happens in 2.5s, 3s, 5s,
@@ -9205,8 +9211,13 @@ public class CarrierConfigManager { 
        sDefaults.putStringArray(

        sDefaults.putStringArray(

                KEY_TELEPHONY_DATA_SETUP_RETRY_RULES_STRING_ARRAY, new String[] {

                KEY_TELEPHONY_DATA_SETUP_RETRY_RULES_STRING_ARRAY, new String[] {

                        "capabilities=eims, retry_interval=1000, maximum_retries=20",

                        "capabilities=eims, retry_interval=1000, maximum_retries=20",

                        "fail_causes=8|27|28|29|30|32|33|35|50|51|111|-5|-6|65537|65538|-3|2252|"

                        // Permanent fail causes. When setup data call fails with the following

                                + "2253|2254, maximum_retries=0", // No retry for those causes

                        // fail causes, telephony data frameworks will stop timer-based retry on

                        // the failed APN until power cycle, APM, or some special events. Note that

                        // even timer-based retry is not performed, condition-based (RAT changes,

                        // registration state changes) retry can still happen.

                        "permanent_fail_causes=8|27|28|29|30|32|33|35|50|51|111|-5|-6|65537|65538|"

                                + "-3|65543|65547|2252|2253|2254, retry_interval=2500",

                        "capabilities=mms|supl|cbs, retry_interval=2000",

                        "capabilities=mms|supl|cbs, retry_interval=2000",

                        "capabilities=internet|enterprise|dun|ims|fota, retry_interval=2500|3000|"

                        "capabilities=internet|enterprise|dun|ims|fota, retry_interval=2500|3000|"

                                + "5000|10000|15000|20000|40000|60000|120000|240000|"

                                + "5000|10000|15000|20000|40000|60000|120000|240000|"