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

Commit 549b5bb2 authored by SongFerng Wang's avatar SongFerng Wang Committed by android-build-merger
Browse files

Merge "Create carrier config to define specific default value of APN types."... 

Merge "Create carrier config to define specific default value of APN types." into qt-qpr1-dev am: c1a2db23
am: 18fdaa98

Change-Id: I2d3528a2cf3c55ed2be24e15806c7df0a45468ae
parents 05c94cec 18fdaa98

telephony/java/android/telephony/CarrierConfigManager.java

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

            "read_only_apn_fields_string_array";



    /**

     * Default value of APN types field if not specified by user when adding/modifying an APN.

     * @hide

     */

    public static final String KEY_APN_SETTINGS_DEFAULT_APN_TYPES_STRING_ARRAY =

            "apn_settings_default_apn_types_string_array";



    /**

     * Boolean indicating if intent for emergency call state changes should be broadcast

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

        sDefaults.putStringArray(KEY_READ_ONLY_APN_TYPES_STRING_ARRAY, new String[] {"dun"});

        sDefaults.putStringArray(KEY_READ_ONLY_APN_FIELDS_STRING_ARRAY, null);

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