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

Commit 284a5288 authored by Jack Yu's avatar Jack Yu Committed by Amit Mahajan
Browse files

Added disallowed APN types configuration support 

The change added the configuration support for disallowed APN
types for WWAN or WLAN transport. This is to meet carrier policy
that certain traffic for APN types are not allowed on given
transport.

Bug: 135551751
Test: Manual + unit tests
Merged-in: I63c44d1e774b7491929406929e1a5a556db9515a
Change-Id: I63c44d1e774b7491929406929e1a5a556db9515a
(cherry picked from commit ac9a731d)
parent 781ac9ef

telephony/java/android/telephony/CarrierConfigManager.java

+17 −0
Original line number Diff line number Diff line
@@ -851,6 +851,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
@@ -2889,6 +2902,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 */