diff options
| -rw-r--r-- | core/api/current.txt | 2 | ||||
| -rw-r--r-- | telephony/java/android/telephony/CarrierConfigManager.java | 49 |
2 files changed, 47 insertions, 4 deletions
diff --git a/core/api/current.txt b/core/api/current.txt index 1eb4c02ed1c3..32bdec010647 100644 --- a/core/api/current.txt +++ b/core/api/current.txt @@ -41342,6 +41342,8 @@ package android.telephony { field public static final String KEY_CARRIER_INSTANT_LETTERING_ESCAPED_CHARS_STRING = "carrier_instant_lettering_escaped_chars_string"; field public static final String KEY_CARRIER_INSTANT_LETTERING_INVALID_CHARS_STRING = "carrier_instant_lettering_invalid_chars_string"; field public static final String KEY_CARRIER_INSTANT_LETTERING_LENGTH_LIMIT_INT = "carrier_instant_lettering_length_limit_int"; + field public static final String KEY_CARRIER_METERED_APN_TYPES_STRINGS = "carrier_metered_apn_types_strings"; + field public static final String KEY_CARRIER_METERED_ROAMING_APN_TYPES_STRINGS = "carrier_metered_roaming_apn_types_strings"; field public static final String KEY_CARRIER_NAME_OVERRIDE_BOOL = "carrier_name_override_bool"; field public static final String KEY_CARRIER_NAME_STRING = "carrier_name_string"; field public static final String KEY_CARRIER_NR_AVAILABILITIES_INT_ARRAY = "carrier_nr_availabilities_int_array"; diff --git a/telephony/java/android/telephony/CarrierConfigManager.java b/telephony/java/android/telephony/CarrierConfigManager.java index 5ad4edf71075..4af8cde4364c 100644 --- a/telephony/java/android/telephony/CarrierConfigManager.java +++ b/telephony/java/android/telephony/CarrierConfigManager.java @@ -1175,14 +1175,55 @@ public class CarrierConfigManager { "carrier_data_call_permanent_failure_strings"; /** - * Default APN types that are metered by the carrier - * @hide + * A string array indicating the default APN types that are metered by the carrier. + * + * The string in the array is the name of the APN type. For example, "default" for + * {@link ApnSetting#TYPE_DEFAULT}, "mms" for {@link ApnSetting#TYPE_MMS}, etc. + * + * The default value is {@code {"default", "mms", "dun", "supl"}}. + * + * @see ApnSetting#TYPE_DEFAULT + * @see ApnSetting#TYPE_MMS + * @see ApnSetting#TYPE_SUPL + * @see ApnSetting#TYPE_DUN + * @see ApnSetting#TYPE_HIPRI + * @see ApnSetting#TYPE_FOTA + * @see ApnSetting#TYPE_IMS + * @see ApnSetting#TYPE_CBS + * @see ApnSetting#TYPE_IA + * @see ApnSetting#TYPE_EMERGENCY + * @see ApnSetting#TYPE_MCX + * @see ApnSetting#TYPE_XCAP + * @see ApnSetting#TYPE_BIP + * @see ApnSetting#TYPE_VSIM + * @see ApnSetting#TYPE_ENTERPRISE */ public static final String KEY_CARRIER_METERED_APN_TYPES_STRINGS = "carrier_metered_apn_types_strings"; + /** - * Default APN types that are roaming-metered by the carrier - * @hide + * A string array indicating the default APN types that are roaming-metered by the carrier. + * + * The string in the array is the name of the APN type. For example, "default" for + * {@link ApnSetting#TYPE_DEFAULT}, "mms" for {@link ApnSetting#TYPE_MMS}, etc. + * + * The default value is {@code {"default", "mms", "dun", "supl"}}. + * + * @see ApnSetting#TYPE_DEFAULT + * @see ApnSetting#TYPE_MMS + * @see ApnSetting#TYPE_SUPL + * @see ApnSetting#TYPE_DUN + * @see ApnSetting#TYPE_HIPRI + * @see ApnSetting#TYPE_FOTA + * @see ApnSetting#TYPE_IMS + * @see ApnSetting#TYPE_CBS + * @see ApnSetting#TYPE_IA + * @see ApnSetting#TYPE_EMERGENCY + * @see ApnSetting#TYPE_MCX + * @see ApnSetting#TYPE_XCAP + * @see ApnSetting#TYPE_BIP + * @see ApnSetting#TYPE_VSIM + * @see ApnSetting#TYPE_ENTERPRISE */ public static final String KEY_CARRIER_METERED_ROAMING_APN_TYPES_STRINGS = "carrier_metered_roaming_apn_types_strings"; |