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

Commit 5afeed50 authored by Jack Yu's avatar Jack Yu Committed by android-build-merger
Browse files

Merge "Added a new carrier config for data connection failed radio restart" 

am: 2947e54c

Change-Id: I651d8092b3ee17fbcb8123f0cafedafeff68eb2c
parents f02b6d66 2947e54c

api/current.txt

+2 −1
Original line number Diff line number Diff line
@@ -41789,9 +41789,10 @@ package android.telephony { 
    field public static final java.lang.String KEY_ONLY_SINGLE_DC_ALLOWED_INT_ARRAY = "only_single_dc_allowed_int_array";

    field public static final java.lang.String KEY_OPERATOR_SELECTION_EXPAND_BOOL = "operator_selection_expand_bool";

    field public static final java.lang.String KEY_PREFER_2G_BOOL = "prefer_2g_bool";

    field public static final java.lang.String KEY_RADIO_RESTART_FAILURE_CAUSES_INT_ARRAY = "radio_restart_failure_causes_int_array";

    field public static final java.lang.String KEY_RCS_CONFIG_SERVER_URL_STRING = "rcs_config_server_url_string";

    field public static final java.lang.String KEY_REQUIRE_ENTITLEMENT_CHECKS_BOOL = "require_entitlement_checks_bool";

    field public static final java.lang.String KEY_RESTART_RADIO_ON_PDP_FAIL_REGULAR_DEACTIVATION_BOOL = "restart_radio_on_pdp_fail_regular_deactivation_bool";

    field public static final deprecated java.lang.String KEY_RESTART_RADIO_ON_PDP_FAIL_REGULAR_DEACTIVATION_BOOL = "restart_radio_on_pdp_fail_regular_deactivation_bool";

    field public static final java.lang.String KEY_RTT_SUPPORTED_BOOL = "rtt_supported_bool";

    field public static final java.lang.String KEY_SHOW_APN_SETTING_CDMA_BOOL = "show_apn_setting_cdma_bool";

    field public static final java.lang.String KEY_SHOW_CDMA_CHOICES_BOOL = "show_cdma_choices_bool";

telephony/java/android/telephony/CarrierConfigManager.java

+14 −3
Original line number Diff line number Diff line
@@ -162,11 +162,21 @@ public class CarrierConfigManager { 
    /**

     * Flag indicating whether radio is to be restarted on error PDP_FAIL_REGULAR_DEACTIVATION

     * This is false by default.

     *

     * @deprecated Use {@link @KEY_RADIO_RESTART_FAILURE_CAUSES_INT_ARRAY} instead

     */

    public static final String

            KEY_RESTART_RADIO_ON_PDP_FAIL_REGULAR_DEACTIVATION_BOOL =

    @Deprecated

    public static final String KEY_RESTART_RADIO_ON_PDP_FAIL_REGULAR_DEACTIVATION_BOOL =

            "restart_radio_on_pdp_fail_regular_deactivation_bool";



    /**

     * A list of failure cause codes that will trigger a modem restart when telephony receiving

     * one of those during data setup. The cause codes are defined in 3GPP TS 24.008 Annex I and

     * TS 24.301 Annex B.

     */

    public static final String KEY_RADIO_RESTART_FAILURE_CAUSES_INT_ARRAY =

            "radio_restart_failure_causes_int_array";



    /**

     * If true, enable vibration (haptic feedback) for key presses in the EmergencyDialer activity.

     * The pattern is set on a per-platform basis using config_virtualKeyVibePattern. To be
@@ -2112,6 +2122,7 @@ public class CarrierConfigManager { 
        sDefaults.putBoolean(KEY_WORLD_PHONE_BOOL, false);

        sDefaults.putBoolean(KEY_REQUIRE_ENTITLEMENT_CHECKS_BOOL, true);

        sDefaults.putBoolean(KEY_RESTART_RADIO_ON_PDP_FAIL_REGULAR_DEACTIVATION_BOOL, false);

        sDefaults.putIntArray(KEY_RADIO_RESTART_FAILURE_CAUSES_INT_ARRAY, new int[]{});

        sDefaults.putInt(KEY_VOLTE_REPLACEMENT_RAT_INT, 0);

        sDefaults.putString(KEY_DEFAULT_SIM_CALL_MANAGER_STRING, "");

        sDefaults.putString(KEY_VVM_DESTINATION_NUMBER_STRING, "");