diff options
| author | Amit Mahajan <amitmahajan@google.com> | 2015-10-14 23:42:13 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-10-14 23:42:13 +0000 |
| commit | 8fb8c37ca7c2c57466b07548effa24044e5b3ef6 (patch) | |
| tree | 8e4e54bffdccb0988579f11262a683eec57409c5 /telephony/java | |
| parent | ecf89edf3616800cdacec000e112e487134adb64 (diff) | |
| parent | 7b28e6ec96dfcb20cef1f321ac7539bac439d726 (diff) | |
| download | frameworks_base-8fb8c37ca7c2c57466b07548effa24044e5b3ef6.zip frameworks_base-8fb8c37ca7c2c57466b07548effa24044e5b3ef6.tar.gz frameworks_base-8fb8c37ca7c2c57466b07548effa24044e5b3ef6.tar.bz2 | |
am 7b28e6ec: Merge "Adding config to allow/disallow user to add APNs." into mnc-dr-dev
* commit '7b28e6ec96dfcb20cef1f321ac7539bac439d726':
Adding config to allow/disallow user to add APNs.
Diffstat (limited to 'telephony/java')
| -rw-r--r-- | telephony/java/android/telephony/CarrierConfigManager.java | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/telephony/java/android/telephony/CarrierConfigManager.java b/telephony/java/android/telephony/CarrierConfigManager.java index aa4da4b..744028a 100644 --- a/telephony/java/android/telephony/CarrierConfigManager.java +++ b/telephony/java/android/telephony/CarrierConfigManager.java @@ -191,7 +191,7 @@ public class CarrierConfigManager { public static final String KEY_DISABLE_CDMA_ACTIVATION_CODE_BOOL = "disable_cdma_activation_code_bool"; - /** + /** * Override the platform's notion of a network operator being considered roaming. * Value is string array of MCCMNCs to be considered roaming for 3GPP RATs. */ @@ -428,6 +428,12 @@ public class CarrierConfigManager { */ public static final String KEY_CSP_ENABLED_BOOL = "csp_enabled_bool"; + /** + * Allow user to add APNs + * @hide + */ + public static final String KEY_ALLOW_ADDING_APNS_BOOL = "allow_adding_apns_bool"; + // These variables are used by the MMS service and exposed through another API, {@link // SmsManager}. The variable names and string values are copied from there. public static final String KEY_MMS_ALIAS_ENABLED_BOOL = "aliasEnabled"; @@ -524,6 +530,7 @@ public class CarrierConfigManager { sDefaults.putString(KEY_CI_ACTION_ON_SYS_UPDATE_EXTRA_STRING, ""); sDefaults.putString(KEY_CI_ACTION_ON_SYS_UPDATE_EXTRA_VAL_STRING, ""); sDefaults.putBoolean(KEY_CSP_ENABLED_BOOL, false); + sDefaults.putBoolean(KEY_ALLOW_ADDING_APNS_BOOL, true); sDefaults.putBoolean(KEY_ALWAYS_SHOW_EMERGENCY_ALERT_ONOFF_BOOL, false); sDefaults.putStringArray(KEY_GSM_ROAMING_NETWORKS_STRING_ARRAY, null); |