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

Commit ad1cf550 authored by Rambo Wang's avatar Rambo Wang Committed by Android (Google) Code Review
Browse files

Merge "Expose metered APN types carrier config keys"

parents acc7ed5a c1029513

core/api/current.txt

+2 −0
Original line number Diff line number Diff line
@@ -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";

telephony/java/android/telephony/CarrierConfigManager.java

+45 −4
Original line number Diff line number Diff line
@@ -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";