Merge "Added new config to indicate uneditable APN fields." into nyc-mr1-dev

This commit is contained in:
TreeHugger Robot
2016-09-21 01:45:49 +00:00
committed by Android (Google) Code Review

View File

@@ -667,6 +667,13 @@ public class CarrierConfigManager {
public static final String KEY_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
* @hide
@@ -1020,6 +1027,7 @@ public class CarrierConfigManager {
sDefaults.putBoolean(KEY_CSP_ENABLED_BOOL, false);
sDefaults.putBoolean(KEY_ALLOW_ADDING_APNS_BOOL, true);
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_ALWAYS_SHOW_EMERGENCY_ALERT_ONOFF_BOOL, false);
sDefaults.putBoolean(KEY_DISABLE_SEVERE_WHEN_EXTREME_DISABLED_BOOL, true);