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

Commit e288ec2d authored by Chen Xu's avatar Chen Xu Committed by android-build-merger
Browse files

Merge "move carrierconfig key disable_severe_when_extreme_disabled to res" 

am: 7be5365d

Change-Id: I5d01026c76c48658a1b02850becdf17dc11a6312
parents 52432f57 7be5365d

telephony/java/android/telephony/CarrierConfigManager.java

+0 −8
Original line number Diff line number Diff line
@@ -853,13 +853,6 @@ public class CarrierConfigManager { 
    public static final String KEY_ALWAYS_SHOW_EMERGENCY_ALERT_ONOFF_BOOL =

            "always_show_emergency_alert_onoff_bool";



    /**

     * The flag to disable cell broadcast severe alert when extreme alert is disabled.

     * @hide

     */

    public static final String KEY_DISABLE_SEVERE_WHEN_EXTREME_DISABLED_BOOL =

            "disable_severe_when_extreme_disabled_bool";



    /**

     * The data call retry configuration for different types of APN.

     * @hide
@@ -3492,7 +3485,6 @@ public class CarrierConfigManager { 
        sDefaults.putStringArray(KEY_APN_SETTINGS_DEFAULT_APN_TYPES_STRING_ARRAY, null);

        sDefaults.putBoolean(KEY_BROADCAST_EMERGENCY_CALL_STATE_CHANGES_BOOL, false);

        sDefaults.putBoolean(KEY_ALWAYS_SHOW_EMERGENCY_ALERT_ONOFF_BOOL, false);

        sDefaults.putBoolean(KEY_DISABLE_SEVERE_WHEN_EXTREME_DISABLED_BOOL, true);

        sDefaults.putStringArray(KEY_CARRIER_DATA_CALL_RETRY_CONFIG_STRINGS, new String[]{

                "default:default_randomization=2000,5000,10000,20000,40000,80000:5000,160000:5000,"

                        + "320000:5000,640000:5000,1280000:5000,1800000:5000",