Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Added new config to indicate read-only apn types." into nyc-mr1-dev

Browse Source
This commit is contained in:
TreeHugger Robot
2016-09-19 16:30:16 +00:00
committed by Android (Google) Code Review
parent eb7e711571 923963ff31
commit 3dfd09e860
2 changed files with 20 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
telephony/java/android/telephony/CarrierConfigManager.java
View File

@@ -660,6 +660,13 @@ public class CarrierConfigManager {
*/ */
public static final String KEY_ALLOW_ADDING_APNS_BOOL = "allow_adding_apns_bool"; public static final String KEY_ALLOW_ADDING_APNS_BOOL = "allow_adding_apns_bool";
/**
* APN types that user is not allowed to modify
* @hide
*/
public static final String KEY_READ_ONLY_APN_TYPES_STRING_ARRAY =
"read_only_apn_types_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
@@ -1012,6 +1019,7 @@ public class CarrierConfigManager {
sDefaults.putString(KEY_CI_ACTION_ON_SYS_UPDATE_EXTRA_VAL_STRING, ""); sDefaults.putString(KEY_CI_ACTION_ON_SYS_UPDATE_EXTRA_VAL_STRING, "");
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.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);

12
telephony/java/com/android/internal/telephony/PhoneConstants.java
View File

@@ -140,6 +140,18 @@ public class PhoneConstants {
/** APN type for Emergency PDN. This is not an IA apn, but is used /** APN type for Emergency PDN. This is not an IA apn, but is used
* for access to carrier services in an emergency call situation. */ * for access to carrier services in an emergency call situation. */
public static final String APN_TYPE_EMERGENCY = "emergency"; public static final String APN_TYPE_EMERGENCY = "emergency";
/** Array of all APN types */
public static final String[] APN_TYPES = {APN_TYPE_DEFAULT,
APN_TYPE_MMS,
APN_TYPE_SUPL,
APN_TYPE_DUN,
APN_TYPE_HIPRI,
APN_TYPE_FOTA,
APN_TYPE_IMS,
APN_TYPE_CBS,
APN_TYPE_IA,
APN_TYPE_EMERGENCY
};
public static final int RIL_CARD_MAX_APPS = 8; public static final int RIL_CARD_MAX_APPS = 8;