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

Commit 75c6b500 authored by Android Build Merger (Role)'s avatar Android Build Merger (Role) Committed by Android (Google) Code Review
Browse files

Merge changes from topic 'am-15128313c71649e3bd36a27ab8405fce' into nyc-mr1-dev-plus-aosp 

* changes:
  Merge "Added new config to indicate uneditable APN fields." into nyc-mr1-dev am: 3ef3f62f am: 9730f8ba
  Added new config to indicate uneditable APN fields. am: 71e9ea67 am: 49985fb9
parents f53d0f49 96a00297

telephony/java/android/telephony/CarrierConfigManager.java

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

    public static final String KEY_READ_ONLY_APN_TYPES_STRING_ARRAY =

            "read_only_apn_types_string_array";

            "read_only_apn_types_string_array";





    /**

     * APN fields that user is not allowed to modify

     * @hide

     */

    public static final String KEY_READ_ONLY_APN_FIELDS_STRING_ARRAY =

            "read_only_apn_fields_string_array";



    /**

    /**

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

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

     * @hide

     * @hide
@@ -1020,6 +1027,7 @@ public class CarrierConfigManager { 
        sDefaults.putBoolean(KEY_CSP_ENABLED_BOOL, false);

        sDefaults.putBoolean(KEY_CSP_ENABLED_BOOL, false);

        sDefaults.putBoolean(KEY_ALLOW_ADDING_APNS_BOOL, true);

        sDefaults.putBoolean(KEY_ALLOW_ADDING_APNS_BOOL, true);

        sDefaults.putStringArray(KEY_READ_ONLY_APN_TYPES_STRING_ARRAY, null);

        sDefaults.putStringArray(KEY_READ_ONLY_APN_TYPES_STRING_ARRAY, null);

        sDefaults.putStringArray(KEY_READ_ONLY_APN_FIELDS_STRING_ARRAY, null);

        sDefaults.putBoolean(KEY_BROADCAST_EMERGENCY_CALL_STATE_CHANGES_BOOL, false);

        sDefaults.putBoolean(KEY_BROADCAST_EMERGENCY_CALL_STATE_CHANGES_BOOL, false);

        sDefaults.putBoolean(KEY_ALWAYS_SHOW_EMERGENCY_ALERT_ONOFF_BOOL, false);

        sDefaults.putBoolean(KEY_ALWAYS_SHOW_EMERGENCY_ALERT_ONOFF_BOOL, false);

        sDefaults.putBoolean(KEY_DISABLE_SEVERE_WHEN_EXTREME_DISABLED_BOOL, true);

        sDefaults.putBoolean(KEY_DISABLE_SEVERE_WHEN_EXTREME_DISABLED_BOOL, true);