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

Commit b4a19b17 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Add enterprise to metered APN" into udc-qpr-dev am: eb1d54b2 am: adf7b8c3 

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/23752441



Change-Id: I7c962aa48ccde0a652fecd132dc476bbe8a2c74a
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 998d3646 adf7b8c3

telephony/java/android/telephony/CarrierConfigManager.java

+2 −2
Original line number Diff line number Diff line
@@ -9905,9 +9905,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,