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

Commit eb1d54b2 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Add enterprise to metered APN" into udc-qpr-dev

parents b164dcb7 c7b1211b

telephony/java/android/telephony/CarrierConfigManager.java

+2 −2
Original line number Diff line number Diff line
@@ -9897,9 +9897,9 @@ public class CarrierConfigManager { 
        sDefaults.putString(KEY_CARRIER_ERI_FILE_NAME_STRING, "eri.xml");

        sDefaults.putInt(KEY_DURATION_BLOCKING_DISABLED_AFTER_EMERGENCY_INT, 7200);

        sDefaults.putStringArray(KEY_CARRIER_METERED_APN_TYPES_STRINGS,

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

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

        sDefaults.putStringArray(KEY_CARRIER_METERED_ROAMING_APN_TYPES_STRINGS,

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

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

        sDefaults.putIntArray(KEY_ONLY_SINGLE_DC_ALLOWED_INT_ARRAY,

                new int[] {TelephonyManager.NETWORK_TYPE_CDMA, TelephonyManager.NETWORK_TYPE_1xRTT,

                        TelephonyManager.NETWORK_TYPE_EVDO_0, TelephonyManager.NETWORK_TYPE_EVDO_A,