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

Commit 761ffab1 authored by Jordan Liu's avatar Jordan Liu Committed by android-build-merger
Browse files

Merge "Add key to CarrierConfig" am: 154c22d2 am: fda7370d 

am: cf99a8e2

Change-Id: I2eb06df15a6605e8e688de470a0cd926e9989979
parents 43055e69 cf99a8e2

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
@@ -2284,10 +2284,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 -->

core/res/res/values/symbols.xml

+0 −1
Original line number Diff line number Diff line
@@ -2268,7 +2268,6 @@ 
  <java-symbol type="attr" name="windowBackgroundFallback" />

  <java-symbol type="id" name="textSpacerNoButtons" />

  <java-symbol type="array" name="dial_string_replace" />

  <java-symbol type="bool" name="config_restart_radio_on_pdp_fail_regular_deactivation" />

  <java-symbol type="array" name="networks_not_clear_data" />

  <java-symbol type="bool" name="config_switch_phone_on_voice_reg_state_change" />

  <java-symbol type="string" name="whichHomeApplicationNamed" />

telephony/java/android/telephony/CarrierConfigManager.java

+10 −0
Original line number Diff line number Diff line
@@ -86,6 +86,15 @@ public class CarrierConfigManager { 
    public static final String

            KEY_REQUIRE_ENTITLEMENT_CHECKS_BOOL = "require_entitlement_checks_bool";



    /**

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

     * This is false by default.

     * @hide

     */

    public static final String

            KEY_RESTART_RADIO_ON_PDP_FAIL_REGULAR_DEACTIVATION_BOOL =

                    "restart_radio_on_pdp_fail_regular_deactivation_bool";



    /**

     * 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
@@ -1011,6 +1020,7 @@ public class CarrierConfigManager { 
        sDefaults.putBoolean(KEY_VOICE_PRIVACY_DISABLE_UI_BOOL, false);

        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.putInt(KEY_VOLTE_REPLACEMENT_RAT_INT, 0);

        sDefaults.putString(KEY_DEFAULT_SIM_CALL_MANAGER_STRING, "");

        sDefaults.putString(KEY_VVM_DESTINATION_NUMBER_STRING, "");