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

Commit 8f8fbdd9 authored by Chen Xu's avatar Chen Xu Committed by android-build-merger
Browse files

Merge "Added disallowed APN types configuration support" into qt-r1-dev 

am: a240c312

Change-Id: I49942b6ad8e3631708a5c8d014f7ce460600a7fb
parents 00536436 a240c312

telephony/java/android/telephony/CarrierConfigManager.java

+17 −0
Original line number Diff line number Diff line
@@ -835,6 +835,19 @@ public class CarrierConfigManager { 
    public static final String KEY_CARRIER_METERED_ROAMING_APN_TYPES_STRINGS =

            "carrier_metered_roaming_apn_types_strings";



    /**

     * APN types that are not allowed on cellular

     * @hide

     */

    public static final String KEY_CARRIER_WWAN_DISALLOWED_APN_TYPES_STRING_ARRAY =

            "carrier_wwan_disallowed_apn_types_string_array";



    /**

     * APN types that are not allowed on IWLAN

     * @hide

     */

    public static final String KEY_CARRIER_WLAN_DISALLOWED_APN_TYPES_STRING_ARRAY =

            "carrier_wlan_disallowed_apn_types_string_array";

    /**

     * CDMA carrier ERI (Enhanced Roaming Indicator) file name

     * @hide
@@ -3133,6 +3146,10 @@ public class CarrierConfigManager { 
                new String[]{"default", "mms", "dun", "supl"});

        sDefaults.putStringArray(KEY_CARRIER_METERED_ROAMING_APN_TYPES_STRINGS,

                new String[]{"default", "mms", "dun", "supl"});

        sDefaults.putStringArray(KEY_CARRIER_WWAN_DISALLOWED_APN_TYPES_STRING_ARRAY,

                new String[]{""});

        sDefaults.putStringArray(KEY_CARRIER_WLAN_DISALLOWED_APN_TYPES_STRING_ARRAY,

                new String[]{""});

        sDefaults.putIntArray(KEY_ONLY_SINGLE_DC_ALLOWED_INT_ARRAY,

                new int[]{

                    4, /* IS95A */