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

Commit a7aa3d68 authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Add enterprise to metered APN" am: 852b5df9 

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



Change-Id: I6ce9831c3814bd5891660fe847bdeddbe5e1d987
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 06edff9b 852b5df9

telephony/java/android/telephony/CarrierConfigManager.java

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