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

Commit 338566df authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Made severe and extreme alert configuration dependency configurable" into nyc-mr1-dev

parents 5b330438 e7941984

telephony/java/android/telephony/CarrierConfigManager.java

+8 −0
Original line number Diff line number Diff line
@@ -402,6 +402,13 @@ 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 APN retry configuration for default type APN.

     * @hide
@@ -945,6 +952,7 @@ public class CarrierConfigManager { 
        sDefaults.putBoolean(KEY_ALLOW_ADDING_APNS_BOOL, true);

        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.putString(KEY_CARRIER_DATA_CALL_RETRY_CONFIG_DEFAULT_STRING,

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

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