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

Commit 1bed728b authored by Jack Yu's avatar Jack Yu Committed by Android (Google) Code Review
Browse files

Merge "Migrated message duplicate detection to cell broadcast service"

parents 0f30d167 ffc2c116

telephony/java/android/telephony/CarrierConfigManager.java

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

            "disable_severe_when_extreme_disabled_bool";



    /**

     * The message expiration time in milliseconds for duplicate detection purposes.

     * @hide

     */

    public static final String KEY_MESSAGE_EXPIRATION_TIME_LONG =

            "message_expiration_time_long";



    /**

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

     * @hide
@@ -3371,7 +3364,6 @@ public class CarrierConfigManager { 
        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.putLong(KEY_MESSAGE_EXPIRATION_TIME_LONG, 86400000L);

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