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

Commit a5a8b593 authored by Jordan Liu's avatar Jordan Liu
Browse files

Add key to CarrierConfig 

Add RESTART_RADIO_ON_PDP_FAIL_REGULAR_DEACTIVATION and default value
(false) to CarrierConfigManager, and remove the old configs.

This value exists because:
http://b/10131736, requires radio restart.
http://b/16308209, http://b/17567651 require that we do not restart.

Bug: 29873049
Change-Id: I4e199d7fe73b82fa39475f31825e5b8ae58d180f
parent 1fd68ad9

api/current.txt

+1 −0
Original line number Diff line number Diff line
@@ -36940,6 +36940,7 @@ package android.telephony { 
    field public static final java.lang.String KEY_PREFER_2G_BOOL = "prefer_2g_bool";

    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 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";

    field public static final java.lang.String KEY_SHOW_ICCID_IN_SIM_STATUS_BOOL = "show_iccid_in_sim_status_bool";

api/system-current.txt

+1 −0
Original line number Diff line number Diff line
@@ -40022,6 +40022,7 @@ package android.telephony { 
    field public static final java.lang.String KEY_PREFER_2G_BOOL = "prefer_2g_bool";

    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 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";

    field public static final java.lang.String KEY_SHOW_ICCID_IN_SIM_STATUS_BOOL = "show_iccid_in_sim_status_bool";

api/test-current.txt

+1 −0
Original line number Diff line number Diff line
@@ -37020,6 +37020,7 @@ package android.telephony { 
    field public static final java.lang.String KEY_PREFER_2G_BOOL = "prefer_2g_bool";

    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 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";

    field public static final java.lang.String KEY_SHOW_ICCID_IN_SIM_STATUS_BOOL = "show_iccid_in_sim_status_bool";

core/res/res/values-mcc310-mnc410/config.xml

+0 −3
Original line number Diff line number Diff line
@@ -67,7 +67,4 @@ 
        <item>"#8"</item>

        <item>"#9"</item>

    </string-array>

    <!-- Flag indicating whether radio is to be restarted on the error of

         PDP_FAIL_REGULAR_DEACTIVATION/0x24 -->

    <bool name="config_restart_radio_on_pdp_fail_regular_deactivation">true</bool>

</resources>

core/res/res/values/config.xml

+0 −4
Original line number Diff line number Diff line
@@ -2287,10 +2287,6 @@ 
    <string-array translatable="false" name="dial_string_replace">

    </string-array>



    <!-- Flag indicating whether radio is to be restarted on the error of

         PDP_FAIL_REGULAR_DEACTIVATION/0x24 -->

    <bool name="config_restart_radio_on_pdp_fail_regular_deactivation">false</bool>



    <!-- networks that don't want data deactivate when shutdown the phone

         note this is dependent on the operator of the network we're on,

         not operator on the SIM -->