Snap for 11180250 from b19be5dfdca154bda81a61c677582f3897195fc8 to 24Q1-releaseandroid-14.0.0_r33android-14.0.0_r32android-14.0.0_r31android-14.0.0_r30android-14.0.0_r29android14-qpr2-s3-releaseandroid14-qpr2-s2-releaseandroid14-qpr2-s1-releaseandroid14-qpr2-release

Change-Id: I92486b3c5d1bb9a6a19c1865aed61df024ac7642

1 files changed, 3 insertions, 142 deletions

diff --git a/etc/apns-full-conf.xml b/etc/apns-full-conf.xml
index 4915da1..6c8f296 100644
--- a/etc/apns-full-conf.xml
+++ b/etc/apns-full-conf.xml
@@ -503,7 +503,6 @@
       user="Uniroam@inet.cs.com"
       password="cs3g"
       authtype ="3"
-      mmsport=""
       mmsc="http://pix.cspire.com"
       mvno_type="spn"
       mvno_match_data="C Spire"
@@ -517,7 +516,6 @@
       mnc="04"
       apn="admin.cs4glte.com"
       server="*"
-      mmsport=""
       mmsc="http://pix.cspire.com"
       mvno_type="spn"
       mvno_match_data="C Spire"
@@ -531,7 +529,6 @@
       mnc="04"
       apn="tethering.cs4glte.com"
       server="*"
-      mmsport=""
       mmsc="http://pix.cspire.com"
       mvno_type="spn"
       mvno_match_data="C Spire"
@@ -11276,7 +11273,6 @@
       mvno_type="spn"
       mvno_match_data="bluewire"
       mmsc="http://mms.blueunlimited.com"
-      mmsport="8514"
       type="mms"
       carrier_enabled="false"
       protocol="IPV4V6"
@@ -11337,7 +11333,6 @@
       mnc="000"
       apn="VZWINTERNET"
       mmsc="http://mms.blueunlimited.com"
-      mmsport="8514"
       mvno_type="spn"
       mvno_match_data="bluewire"
       type="default,ia,mms,dun,supl"
@@ -11351,7 +11346,6 @@
       mnc="000"
       apn="VZWINTERNET"
       mmsc="http://mms.blueunlimited.com"
-      mmsport="8514"
       mvno_type="spn"
       mvno_match_data="bluewire"
       type="default,ia,mms,dun,supl"
@@ -11367,7 +11361,6 @@
       mvno_type="spn"
       mvno_match_data="flatwire"
       mmsc="http://mmsc.cleartalk.csky.us/"
-      mmsport=""
       type="mms"
       carrier_enabled="false"
       protocol="IPV4V6"
@@ -11428,7 +11421,6 @@
       mnc="000"
       apn="VZWINTERNET"
       mmsc="http://mmsc.cleartalk.csky.us/"
-      mmsport=""
       mvno_type="spn"
       mvno_match_data="flatwire"
       type="default,ia,mms,dun,supl"
@@ -11442,7 +11434,6 @@
       mnc="000"
       apn="VZWINTERNET"
       mmsc="http://mmsc.cleartalk.csky.us/"
-      mmsport=""
       mvno_type="spn"
       mvno_match_data="flatwire"
       type="default,ia,mms,dun,supl"
@@ -11458,7 +11449,6 @@
       mvno_type="spn"
       mvno_match_data="mobipcs"
       mmsc="http://mms.mobipcs.com"
-      mmsport=""
       type="mms"
       carrier_enabled="false"
       protocol="IPV4V6"
@@ -11519,7 +11509,6 @@
       mnc="000"
       apn="VZWINTERNET"
       mmsc="http://mms.mobipcs.com"
-      mmsport=""
       mvno_type="spn"
       mvno_match_data="mobipcs"
       type="default,ia,mms,dun,supl"
@@ -11533,7 +11522,6 @@
       mnc="000"
       apn="VZWINTERNET"
       mmsc="http://mms.mobipcs.com"
-      mmsport=""
       mvno_type="spn"
       mvno_match_data="mobipcs"
       type="default,ia,mms,dun,supl"
@@ -11643,7 +11631,6 @@
       mvno_type="spn"
       mvno_match_data="mohave"
       mmsc="http://mms.mohavewireless.com"
-      mmsport=""
       type="mms"
       carrier_enabled="false"
       protocol="IPV4V6"
@@ -11704,7 +11691,6 @@
       mnc="000"
       apn="VZWINTERNET"
       mmsc="http://mms.mohavewireless.com"
-      mmsport=""
       mvno_type="spn"
       mvno_match_data="mohave"
       type="default,ia,mms,dun,supl"
@@ -11718,7 +11704,6 @@
       mnc="000"
       apn="VZWINTERNET"
       mmsc="http://mms.mohavewireless.com"
-      mmsport=""
       mvno_type="spn"
       mvno_match_data="mohave"
       type="default,ia,mms,dun,supl"
@@ -11734,7 +11719,6 @@
       mvno_type="spn"
       mvno_match_data="peopleswire"
       mmsc="http://172.16.16.130/mms/"
-      mmsport="80"
       type="mms"
       carrier_enabled="false"
       protocol="IPV4V6"
@@ -11795,7 +11779,6 @@
       mnc="000"
       apn="VZWINTERNET"
       mmsc="http://172.16.16.130/mms/"
-      mmsport="80"
       mvno_type="spn"
       mvno_match_data="Peopleswire"
       type="default,ia,mms,dun,supl"
@@ -11809,7 +11792,6 @@
       mnc="000"
       apn="VZWINTERNET"
       mmsc="http://172.16.16.130/mms/"
-      mmsport="80"
       mvno_type="spn"
       mvno_match_data="Peopleswire"
       type="default,ia,mms,dun,supl"
@@ -11825,7 +11807,6 @@
       mvno_type="spn"
       mvno_match_data="revol"
       mmsc="http://mms.revol.us/revol/mms.php"
-      mmsport=""
       type="mms"
       carrier_enabled="false"
       protocol="IPV4V6"
@@ -11886,7 +11867,6 @@
       mnc="000"
       apn="VZWINTERNET"
       mmsc="http://mms.revol.us/revol/mms.php"
-      mmsport=""
       mvno_type="spn"
       mvno_match_data="revol"
       type="default,ia,mms,dun,supl"
@@ -11900,7 +11880,6 @@
       mnc="000"
       apn="VZWINTERNET"
       mmsc="http://mms.revol.us/revol/mms.php"
-      mmsport=""
       mvno_type="spn"
       mvno_match_data="revol"
       type="default,ia,mms,dun,supl"
@@ -11916,7 +11895,6 @@
       mvno_type="spn"
       mvno_match_data="commnet"
       mmsc="http://mmsc.cccomm.csky.us"
-      mmsport="6672"
       type="mms"
       carrier_enabled="false"
       protocol="IPV4V6"
@@ -11931,7 +11909,6 @@
       mvno_type="spn"
       mvno_match_data="distribution"
       mmsc="http://mms.dst.com/mms/"
-      mmsport=""
       type="mms"
       carrier_enabled="false"
       protocol="IPV4V6"
@@ -11992,7 +11969,6 @@
       mnc="000"
       apn="VZWINTERNET"
       mmsc="http://mms.dst.com/mms/"
-      mmsport=""
       mvno_type="spn"
       mvno_match_data="distribution"
       type="default,ia,mms,dun,supl"
@@ -12006,7 +11982,6 @@
       mnc="000"
       apn="VZWINTERNET"
       mmsc="http://mms.dst.com/mms/"
-      mmsport=""
       mvno_type="spn"
       mvno_match_data="distribution"
       type="default,ia,mms,dun,supl"
@@ -12221,7 +12196,7 @@
       apn="VZWINTERNET"
       mvno_type="spn"
       mvno_match_data="itewire"
-      type="default,ia,mms,dun,supl"
+      type="default,ia,dun,supl"
       protocol="IPV4V6"
       roaming_protocol="IPV4V6"
       network_type_bitmask="14"
@@ -12233,7 +12208,7 @@
       apn="VZWINTERNET"
       mvno_type="spn"
       mvno_match_data="itewire"
-      type="default,ia,mms,dun,supl"
+      type="default,ia,dun,supl"
       protocol="IPV4V6"
       roaming_protocol="IPV4V6"
       network_type_bitmask="13"
@@ -12247,7 +12222,6 @@
       mvno_type="spn"
       mvno_match_data="etex"
       mmsc="http://mmsi.etex.mobi"
-      mmsport=""
       type="mms"
       carrier_enabled="false"
       protocol="IPV4V6"
@@ -12313,7 +12287,6 @@
       mnc="035"
       apn="VZWINTERNET"
       mmsc="http://mmsi.etex.mobi"
-      mmsport=""
       mvno_type="spn"
       mvno_match_data="etex"
       type="default,ia,mms,dun,supl"
@@ -12328,7 +12301,6 @@
       mnc="035"
       apn="VZWINTERNET"
       mmsc="http://mmsi.etex.mobi"
-      mmsport=""
       mvno_type="spn"
       mvno_match_data="etex"
       type="default,ia,mms,dun,supl"
@@ -12431,7 +12403,6 @@
       mvno_type="spn"
       mvno_match_data="alaskacomm"
       mmsc="http://mmsc1.acsalaska.net/servlets/mms"
-      mmsport=""
       type="mms"
       carrier_enabled="false"
       protocol="IPV4V6"
@@ -12492,7 +12463,6 @@
       mnc="050"
       apn="VZWINTERNET"
       mmsc="http://mmsc1.acsalaska.net/servlets/mms"
-      mmsport=""
       mvno_type="spn"
       mvno_match_data="alaskacomm"
       type="default,ia,mms,dun,supl"
@@ -12506,7 +12476,6 @@
       mnc="050"
       apn="VZWINTERNET"
       mmsc="http://mmsc1.acsalaska.net/servlets/mms"
-      mmsport=""
       mvno_type="spn"
       mvno_match_data="alaskacomm"
       protocol="IPV4V6"
@@ -12956,7 +12925,6 @@
       proxy=""
       port=""
       mmsc="http://wholesale.mmsmvno.com/mms/wapenc"
-      mmsport="80"
       type="default,ia,mms,supl,hipri"
       mvno_type="gid"
       mvno_match_data="2AC9"
@@ -13650,7 +13618,6 @@
       mnc="360"
       apn="CdmaNai"
       mmsc="http://mms1.zsend.com"
-      mmsport=""
       type="mms"
       carrier_enabled="false"
       protocol="IPV4V6"
@@ -13708,7 +13675,6 @@
       mnc="360"
       apn="VZWINTERNET"
       mmsc="http://mms1.zsend.com"
-      mmsport=""
       type="default,ia,mms,dun,supl"
       protocol="IPV4V6"
       roaming_protocol="IPV4V6"
@@ -13721,7 +13687,6 @@
       mnc="360"
       apn="VZWINTERNET"
       mmsc="http://mms1.zsend.com"
-      mmsport=""
       type="default,ia,mms,dun,supl"
       protocol="IPV4V6"
       roaming_protocol="IPV4V6"
@@ -14325,7 +14290,6 @@
       mvno_type="spn"
       mvno_match_data="gci"
       mmsc="http://mmsc.akdt.dataonair.net:6672/"
-      mmsport=""
       type="mms"
       carrier_enabled="false"
       protocol="IPV4V6"
@@ -14386,7 +14350,6 @@
       mnc="430"
       apn="VZWINTERNET"
       mmsc="http://mmsc.akdt.dataonair.net:6672/"
-      mmsport=""
       mvno_type="spn"
       mvno_match_data="gci"
       type="default,ia,mms,dun,supl"
@@ -14400,7 +14363,6 @@
       mnc="430"
       apn="VZWINTERNET"
       mmsc="http://mmsc.akdt.dataonair.net:6672/"
-      mmsport=""
       mvno_type="spn"
       mvno_match_data="gci"
       type="default,ia,mms,dun,supl"
@@ -14493,7 +14455,6 @@
       mnc="470"
       apn="CdmaNai"
       mmsc="http://mms.ntelospcs.net/"
-      mmsport=""
       type="mms"
       carrier_enabled="false"
       protocol="IPV4V6"
@@ -14552,7 +14513,6 @@
       mnc="580"
       apn="CdmaNai"
       mmsc="http://mms.inland3g.com/inland/mms.php"
-      mmsport=""
       type="mms"
       carrier_enabled="false"
       protocol="IPV4V6"
@@ -14610,7 +14570,6 @@
       mnc="580"
       apn="VZWINTERNET"
       mmsc="http://mms.inland3g.com/inland/mms.php"
-      mmsport=""
       type="default,ia,mms,dun,supl"
       protocol="IPV4V6"
       roaming_protocol="IPV4V6"
@@ -14623,7 +14582,6 @@
       mnc="580"
       apn="VZWINTERNET"
       mmsc="http://mms.inland3g.com/inland/mms.php"
-      mmsport=""
       type="default,ia,mms,dun,supl"
       protocol="IPV4V6"
       roaming_protocol="IPV4V6"
@@ -14649,7 +14607,6 @@
       mnc="600"
       apn="CdmaNai"
       mmsc="http://mms.cellcom.com/cellcom/mms.php"
-      mmsport=""
       type="mms"
       carrier_enabled="false"
       protocol="IPV4V6"
@@ -14707,7 +14664,6 @@
       mnc="600"
       apn="VZWINTERNET"
       mmsc="http://mms.cellcom.com/cellcom/mms.php"
-      mmsport=""
       type="default,ia,mms,dun,supl"
       protocol="IPV4V6"
       roaming_protocol="IPV4V6"
@@ -14720,7 +14676,6 @@
       mnc="600"
       apn="VZWINTERNET"
       mmsc="http://mms.cellcom.com/cellcom/mms.php"
-      mmsport=""
       type="default,ia,mms,dun,supl"
       protocol="IPV4V6"
       roaming_protocol="IPV4V6"
@@ -14811,7 +14766,6 @@
       mnc="750"
       apn="CdmaNai"
       mmsc="http://mms.ekn.com"
-      mmsport="80"
       type="mms"
       carrier_enabled="false"
       protocol="IPV4V6"
@@ -14869,7 +14823,6 @@
       mnc="750"
       apn="VZWINTERNET"
       mmsc="http://mms.ekn.com"
-      mmsport="80"
       type="default,ia,mms,dun,supl"
       protocol="IPV4V6"
       roaming_protocol="IPV4V6"
@@ -14882,7 +14835,6 @@
       mnc="750"
       apn="VZWINTERNET"
       mmsc="http://mms.ekn.com"
-      mmsport="80"
       type="default,ia,mms,dun,supl"
       protocol="IPV4V6"
       roaming_protocol="IPV4V6"
@@ -14938,7 +14890,6 @@
       mvno_type="spn"
       mvno_match_data="nepa"
       mmsc="http://mmsc.c1nepa.csky.us:6672/"
-      mmsport=""
       type="mms"
       carrier_enabled="false"
       protocol="IPV4V6"
@@ -15004,7 +14955,6 @@
       mnc="820"
       apn="VZWINTERNET"
       mmsc="http://mmsc.c1nepa.csky.us:6672/"
-      mmsport=""
       mvno_type="spn"
       mvno_match_data="nepa"
       type="default,ia,mms,dun,supl"
@@ -15019,7 +14969,6 @@
       mnc="820"
       apn="VZWINTERNET"
       mmsc="http://mmsc.c1nepa.csky.us:6672/"
-      mmsport=""
       mvno_type="spn"
       mvno_match_data="nepa"
       type="default,ia,mms,dun,supl"
@@ -15257,7 +15206,6 @@
       mnc="930"
       apn="CdmaNai"
       mmsc="http://cvwmms.com/servlets/mms"
-      mmsport=""
       type="mms"
       carrier_enabled="false"
       protocol="IPV4V6"
@@ -15315,7 +15263,6 @@
       mnc="930"
       apn="VZWINTERNET"
       mmsc="http://cvwmms.com/servlets/mms"
-      mmsport=""
       type="default,ia,mms,dun,supl"
       protocol="IPV4V6"
       roaming_protocol="IPV4V6"
@@ -15328,7 +15275,6 @@
       mnc="930"
       apn="VZWINTERNET"
       mmsc="http://cvwmms.com/servlets/mms"
-      mmsport=""
       type="default,ia,mms,dun,supl"
       protocol="IPV4V6"
       roaming_protocol="IPV4V6"
@@ -15811,7 +15757,6 @@
       mvno_type="spn"
       mvno_match_data="nntcwire"
       mmsc="http://mms.rinawireless.com"
-      mmsport=""
       type="mms"
       carrier_enabled="false"
       protocol="IPV4V6"
@@ -15877,7 +15822,6 @@
       mnc="960"
       apn="VZWINTERNET"
       mmsc="http://mms.rinawireless.com"
-      mmsport=""
       mvno_type="spn"
       mvno_match_data="nntcwire"
       type="default,ia,mms,dun,supl"
@@ -15892,7 +15836,6 @@
       mnc="960"
       apn="VZWINTERNET"
       mmsc="http://mms.rinawireless.com"
-      mmsport=""
       mvno_type="spn"
       mvno_match_data="nntcwire"
       type="default,ia,mms,dun,supl"
@@ -15909,7 +15852,6 @@
       mvno_type="spn"
       mvno_match_data="silverstar"
       mmsc="http://mms.rinawireless.com"
-      mmsport=""
       type="mms"
       carrier_enabled="false"
       protocol="IPV4V6"
@@ -15975,7 +15917,6 @@
       mnc="960"
       apn="VZWINTERNET"
       mmsc="http://mms.rinawireless.com"
-      mmsport=""
       mvno_type="spn"
       mvno_match_data="silverstar"
       type="default,ia,mms,dun,supl"
@@ -15990,7 +15931,6 @@
       mnc="960"
       apn="VZWINTERNET"
       mmsc="http://mms.rinawireless.com"
-      mmsport=""
       mvno_type="spn"
       mvno_match_data="silverstar"
       type="default,ia,mms,dun,supl"
@@ -16007,7 +15947,6 @@
       mvno_type="spn"
       mvno_match_data="snakeriver"
       mmsc="http://mms.rinawireless.com"
-      mmsport=""
       type="mms"
       carrier_enabled="false"
       protocol="IPV4V6"
@@ -16073,7 +16012,6 @@
       mnc="960"
       apn="VZWINTERNET"
       mmsc="http://mms.rinawireless.com"
-      mmsport=""
       mvno_type="spn"
       mvno_match_data="snakeriver"
       type="default,ia,mms,dun,supl"
@@ -16088,7 +16026,6 @@
       mnc="960"
       apn="VZWINTERNET"
       mmsc="http://mms.rinawireless.com"
-      mmsport=""
       mvno_type="spn"
       mvno_match_data="snakeriver"
       type="default,ia,mms,dun,supl"
@@ -16105,7 +16042,6 @@
       mvno_type="spn"
       mvno_match_data="southcentral"
       mmsc="http://mms.rinawireless.com"
-      mmsport=""
       type="mms"
       carrier_enabled="false"
       protocol="IPV4V6"
@@ -16171,7 +16107,6 @@
       mnc="960"
       apn="VZWINTERNET"
       mmsc="http://mms.rinawireless.com"
-      mmsport=""
       mvno_type="spn"
       mvno_match_data="southcentral"
       type="default,ia,mms,dun,supl"
@@ -16186,7 +16121,6 @@
       mnc="960"
       apn="VZWINTERNET"
       mmsc="http://mms.rinawireless.com"
-      mmsport=""
       mvno_type="spn"
       mvno_match_data="southcentral"
       type="default,ia,mms,dun,supl"
@@ -16203,7 +16137,6 @@
       mvno_type="spn"
       mvno_match_data="strata"
       mmsc="http://mms.rinawireless.com"
-      mmsport=""
       type="mms"
       carrier_enabled="false"
       protocol="IPV4V6"
@@ -16269,7 +16202,6 @@
       mnc="960"
       apn="VZWINTERNET"
       mmsc="http://mms.rinawireless.com"
-      mmsport=""
       mvno_type="spn"
       mvno_match_data="strata"
       type="default,ia,mms,dun,supl"
@@ -16284,7 +16216,6 @@
       mnc="960"
       apn="VZWINTERNET"
       mmsc="http://mms.rinawireless.com"
-      mmsport=""
       mvno_type="spn"
       mvno_match_data="strata"
       type="default,ia,mms,dun,supl"
@@ -16300,7 +16231,6 @@
       mvno_type="spn"
       mvno_match_data="syringa"
       mmsc="http://mms.rinawireless.com"
-      mmsport=""
       type="mms"
       carrier_enabled="false"
       protocol="IPV4V6"
@@ -16361,7 +16291,6 @@
       mnc="960"
       apn="VZWINTERNET"
       mmsc="http://mms.rinawireless.com"
-      mmsport=""
       mvno_type="spn"
       mvno_match_data="syringa"
       type="default,ia,mms,dun,supl"
@@ -16375,7 +16304,6 @@
       mnc="960"
       apn="VZWINTERNET"
       mmsc="http://mms.rinawireless.com"
-      mmsport=""
       mvno_type="spn"
       mvno_match_data="syringa"
       type="default,ia,mms,dun,supl"
@@ -16390,7 +16318,6 @@
       mnc="050"
       apn="CdmaNai"
       mmsc="http://mms.thumbcell.com/thumb/mms.php"
-      mmsport=""
       type="mms"
       carrier_enabled="false"
       protocol="IPV4V6"
@@ -16448,7 +16375,6 @@
       mnc="050"
       apn="VZWINTERNET"
       mmsc="http://mms.thumbcell.com/thumb/mms.php"
-      mmsport=""
       type="default,ia,mms,dun,supl"
       protocol="IPV4V6"
       roaming_protocol="IPV4V6"
@@ -16461,7 +16387,6 @@
       mnc="050"
       apn="VZWINTERNET"
       mmsc="http://mms.thumbcell.com/thumb/mms.php"
-      mmsport=""
       type="default,ia,mms,dun,supl"
       protocol="IPV4V6"
       roaming_protocol="IPV4V6"
@@ -16476,7 +16401,6 @@
       mvno_type="spn"
       mvno_match_data="elementmobile"
       mmsc="http://mms.elementmobile.net"
-      mmsport="8080"
       type="mms"
       carrier_enabled="false"
       protocol="IPV4V6"
@@ -16542,7 +16466,6 @@
       mnc="070"
       apn="VZWINTERNET"
       mmsc="http://mms.elementmobile.net"
-      mmsport="8080"
       mvno_type="spn"
       mvno_match_data="elementmobile"
       type="default,ia,mms,dun,supl"
@@ -16557,7 +16480,6 @@
       mnc="070"
       apn="VZWINTERNET"
       mmsc="http://mms.elementmobile.net"
-      mmsport="8080"
       mvno_type="spn"
       mvno_match_data="elementmobile"
       type="default,ia,mms,dun,supl"
@@ -16596,7 +16518,6 @@
       mvno_type="spn"
       mvno_match_data="sprocket"
       mmsc="http://mms.sprocketwireless.com"
-      mmsport=""
       type="mms"
       carrier_enabled="false"
       protocol="IPV4V6"
@@ -16662,7 +16583,6 @@
       mnc="140"
       apn="VZWINTERNET"
       mmsc="http://mms.sprocketwireless.com"
-      mmsport=""
       mvno_type="spn"
       mvno_match_data="sprocket"
       type="default,ia,mms,dun,supl"
@@ -16677,7 +16597,6 @@
       mnc="140"
       apn="VZWINTERNET"
       mmsc="http://mms.sprocketwireless.com"
-      mmsport=""
       mvno_type="spn"
       mvno_match_data="sprocket"
       type="default,ia,mms,dun,supl"
@@ -17663,7 +17582,6 @@
       mnc="230"
       apn="admin.cs4glte.com"
       server="*"
-      mmsport=""
       mmsc="http://pix.cspire.com"
       type="fota"
       network_type_bitmask="13"
@@ -17676,7 +17594,6 @@
       mnc="230"
       apn="admin.cs4glte.com"
       server="*"
-      mmsport=""
       mmsc="http://pix.cspire.com"
       type="fota"
       network_type_bitmask="14"
@@ -17689,7 +17606,6 @@
       mnc="230"
       apn="internet.cs4glte.com"
       server="*"
-      mmsport=""
       mmsc="http://pix.cspire.com"
       type="default,ia,mms"
       protocol="IPV4V6"
@@ -17701,7 +17617,6 @@
       mnc="230"
       apn="tethering.cs4glte.com"
       server="*"
-      mmsport=""
       mmsc="http://pix.cspire.com"
       type="dun"
       network_type_bitmask="14"
@@ -17714,7 +17629,6 @@
       mnc="230"
       apn="tethering.cs4glte.com"
       server="*"
-      mmsport=""
       mmsc="http://pix.cspire.com"
       type="dun"
       network_type_bitmask="13"
@@ -17742,7 +17656,6 @@
       mnc="310"
       apn="CdmaNai"
       mmsc="http://204.181.155.217/mms/"
-      mmsport=""
       type="mms"
       carrier_enabled="false"
       protocol="IPV4V6"
@@ -17800,7 +17713,6 @@
       mnc="310"
       apn="VZWINTERNET"
       mmsc="http://204.181.155.217/mms/"
-      mmsport=""
       type="default,ia,mms,dun,supl"
       protocol="IPV4V6"
       roaming_protocol="IPV4V6"
@@ -17813,7 +17725,6 @@
       mnc="310"
       apn="VZWINTERNET"
       mmsc="http://204.181.155.217/mms/"
-      mmsport=""
       type="default,ia,mms,dun,supl"
       protocol="IPV4V6"
       roaming_protocol="IPV4V6"
@@ -17826,7 +17737,6 @@
       mnc="340"
       apn="CdmaNai"
       mmsc="http://mms.iot1.com/ivc/mms.php"
-      mmsport=""
       type="mms"
       carrier_enabled="false"
       protocol="IPV4V6"
@@ -17884,7 +17794,6 @@
       mnc="340"
       apn="VZWINTERNET"
       mmsc="http://mms.iot1.com/ivc/mms.php"
-      mmsport=""
       type="default,ia,mms,dun,supl"
       protocol="IPV4V6"
       roaming_protocol="IPV4V6"
@@ -17897,7 +17806,6 @@
       mnc="340"
       apn="VZWINTERNET"
       mmsc="http://mms.iot1.com/ivc/mms.php"
-      mmsport=""
       type="default,ia,mms,dun,supl"
       protocol="IPV4V6"
       roaming_protocol="IPV4V6"
@@ -17912,7 +17820,6 @@
       mvno_type="spn"
       mvno_match_data="nemont"
       mmsc="http://mms.nemont.mobi/mms/"
-      mmsport=""
       type="mms"
       carrier_enabled="false"
       protocol="IPV4V6"
@@ -17978,7 +17885,6 @@
       mnc="350"
       apn="VZWINTERNET"
       mmsc="http://mms.nemont.mobi/mms/"
-      mmsport=""
       mvno_type="spn"
       mvno_match_data="nemont"
       type="default,ia,mms,dun,supl"
@@ -17993,7 +17899,6 @@
       mnc="350"
       apn="VZWINTERNET"
       mmsc="http://mms.nemont.mobi/mms/"
-      mmsport=""
       mvno_type="spn"
       mvno_match_data="nemont"
       type="default,ia,mms,dun,supl"
@@ -18153,7 +18058,6 @@
       mnc="410"
       apn="CdmaNai"
       mmsc="http://mmsc.hawkeyeswitch.net/mms/"
-      mmsport="80"
       type="mms"
       carrier_enabled="false"
       protocol="IPV4V6"
@@ -18211,7 +18115,6 @@
       mnc="410"
       apn="VZWINTERNET"
       mmsc="http://mmsc.hawkeyeswitch.net/mms/"
-      mmsport="80"
       type="default,ia,mms,dun,supl"
       protocol="IPV4V6"
       roaming_protocol="IPV4V6"
@@ -18224,7 +18127,6 @@
       mnc="410"
       apn="VZWINTERNET"
       mmsc="http://mmsc.hawkeyeswitch.net/mms/"
-      mmsport="80"
       type="default,ia,mms,dun,supl"
       protocol="IPV4V6"
       roaming_protocol="IPV4V6"
@@ -18237,7 +18139,6 @@
       mnc="420"
       apn="CdmaNai"
       mmsc="http://mms.nwmcell.com/mms/"
-      mmsport=""
       type="mms"
       carrier_enabled="false"
       protocol="IPV4V6"
@@ -18295,7 +18196,6 @@
       mnc="420"
       apn="VZWINTERNET"
       mmsc="http://mms.nwmcell.com/mms/"
-      mmsport=""
       type="default,ia,mms,dun,supl"
       protocol="IPV4V6"
       roaming_protocol="IPV4V6"
@@ -18308,7 +18208,6 @@
       mnc="420"
       apn="VZWINTERNET"
       mmsc="http://mms.nwmcell.com/mms/"
-      mmsport=""
       type="default,ia,mms,dun,supl"
       protocol="IPV4V6"
       roaming_protocol="IPV4V6"
@@ -18322,7 +18221,6 @@
       mvno_type="spn"
       mvno_match_data="chatmobrsa1"
       mmsc="http://mmsc.hawkeyeswitch.net/mms/"
-      mmsport="80"
       type="mms"
       carrier_enabled="false"
       protocol="IPV4V6"
@@ -18383,7 +18281,6 @@
       mnc="430"
       apn="VZWINTERNET"
       mmsc="http://mmsc.hawkeyeswitch.net/mms/"
-      mmsport="80"
       mvno_type="spn"
       mvno_match_data="chatmobrsa1"
       type="default,ia,mms,dun,supl"
@@ -18397,7 +18294,6 @@
       mnc="430"
       apn="VZWINTERNET"
       mmsc="http://mmsc.hawkeyeswitch.net/mms/"
-      mmsport="80"
       mvno_type="spn"
       mvno_match_data="chatmobrsa1"
       type="default,ia,mms,dun,supl"
@@ -18412,7 +18308,6 @@
       mnc="440"
       apn="CdmaNai"
       mmsc="http://mms.iot1.com/bluegrass/mms.php"
-      mmsport=""
       type="mms"
       carrier_enabled="false"
       protocol="IPV4V6"
@@ -18470,7 +18365,6 @@
       mnc="440"
       apn="VZWINTERNET"
       mmsc="http://mms.iot1.com/bluegrass/mms.php"
-      mmsport=""
       type="default,ia,mms,dun,supl"
       protocol="IPV4V6"
       roaming_protocol="IPV4V6"
@@ -18483,7 +18377,6 @@
       mnc="440"
       apn="VZWINTERNET"
       mmsc="http://mms.iot1.com/bluegrass/mms.php"
-      mmsport=""
       type="default,ia,mms,dun,supl"
       protocol="IPV4V6"
       roaming_protocol="IPV4V6"
@@ -18496,7 +18389,6 @@
       mnc="450"
       apn="CdmaNai"
       mmsc="http://mmsc.ptci.net"
-      mmsport="6672"
       type="mms"
       carrier_enabled="false"
       protocol="IPV4V6"
@@ -18554,7 +18446,6 @@
       mnc="450"
       apn="VZWINTERNET"
       mmsc="http://mmsc.ptci.net"
-      mmsport="6672"
       type="default,ia,mms,dun,supl"
       protocol="IPV4V6"
       roaming_protocol="IPV4V6"
@@ -18567,7 +18458,6 @@
       mnc="450"
       apn="VZWINTERNET"
       mmsc="http://mmsc.ptci.net"
-      mmsport="6672"
       type="default,ia,mms,dun,supl"
       protocol="IPV4V6"
       roaming_protocol="IPV4V6"
@@ -19165,7 +19055,6 @@
       mvno_type="spn"
       mvno_match_data="gsc"
       mmsc="http://mmsc1.gscdata.com"
-      mmsport=""
       type="mms"
       carrier_enabled="false"
       protocol="IPV4V6"
@@ -19231,7 +19120,6 @@
       mnc="590"
       apn="VZWINTERNET"
       mmsc="http://mmsc1.gscdata.com"
-      mmsport=""
       mvno_type="spn"
       mvno_match_data="gsc"
       type="default,ia,mms,dun,supl"
@@ -19246,7 +19134,6 @@
       mnc="590"
       apn="VZWINTERNET"
       mmsc="http://mmsc1.gscdata.com"
-      mmsport=""
       mvno_type="spn"
       mvno_match_data="gsc"
       type="default,ia,mms,dun,supl"
@@ -19261,7 +19148,6 @@
       mnc="600"
       apn="CdmaNai"
       mmsc="http://mms.cox.net/cox/mms.php"
-      mmsport=""
       type="mms"
       carrier_enabled="false"
       protocol="IPV4V6"
@@ -19319,7 +19205,6 @@
       mnc="600"
       apn="VZWINTERNET"
       mmsc="http://mms.cox.net/cox/mms.php"
-      mmsport=""
       type="default,ia,mms,dun,supl"
       protocol="IPV4V6"
       roaming_protocol="IPV4V6"
@@ -19332,7 +19217,6 @@
       mnc="600"
       apn="VZWINTERNET"
       mmsc="http://mms.cox.net/cox/mms.php"
-      mmsport=""
       type="default,ia,mms,dun,supl"
       protocol="IPV4V6"
       roaming_protocol="IPV4V6"
@@ -19448,7 +19332,6 @@
       mvno_type="spn"
       mvno_match_data="unitedwireless"
       mmsc="http://mms.unitedwireless.com/united/mms.php"
-      mmsport=""
       type="mms"
       carrier_enabled="false"
       protocol="IPV4V6"
@@ -19514,7 +19397,6 @@
       mnc="650"
       apn="VZWINTERNET"
       mmsc="http://mms.unitedwireless.com/united/mms.php"
-      mmsport=""
       mvno_type="spn"
       mvno_match_data="unitedwireless"
       type="default,ia,mms,dun,supl"
@@ -19529,7 +19411,6 @@
       mnc="650"
       apn="VZWINTERNET"
       mmsc="http://mms.unitedwireless.com/united/mms.php"
-      mmsport=""
       mvno_type="spn"
       mvno_match_data="unitedwireless"
       type="default,ia,mms,dun,supl"
@@ -19564,7 +19445,6 @@
       mnc="670"
       apn="lte.internet.pinebelt.net"
       mmsc="http://mmsc.pinebelt.net:6672/"
-      mmsport=""
       type="default,ia,mms,supl"
       protocol="IPV4V6"
       roaming_protocol="IPV4V6"
@@ -19576,7 +19456,6 @@
       mnc="670"
       apn="lte.tether.pinebelt.net"
       mmsc="http://mmsc.pinebelt.net:6672/"
-      mmsport=""
       type="dun"
       protocol="IPV4V6"
       roaming_protocol="IPV4V6"
@@ -19646,7 +19525,6 @@
       mvno_type="spn"
       mvno_match_data="charitonvalley"
       mmsc="http://mms.cvalley.net"
-      mmsport="80"
       type="mms"
       carrier_enabled="false"
       protocol="IPV4V6"
@@ -19707,7 +19585,6 @@
       mnc="920"
       apn="VZWINTERNET"
       mmsc="http://mms.cvalley.net"
-      mmsport="80"
       mvno_type="spn"
       mvno_match_data="charitonvalley"
       type="default,ia,mms,dun,supl"
@@ -19721,7 +19598,6 @@
       mnc="920"
       apn="VZWINTERNET"
       mmsc="http://mms.cvalley.net"
-      mmsport="80"
       mvno_type="spn"
       mvno_match_data="charitonvalley"
       type="default,ia,mms,dun,supl"
@@ -19736,7 +19612,6 @@
       mnc="930"
       apn="internet.syringawireless.com"
       server="*"
-      mmsport="80"
       mmsc="http://mms.rinawireless.com"
       type="default,ia,fota,dun,mms"
       protocol="IPV4V6"
@@ -19762,7 +19637,6 @@
       mvno_type="spn"
       mvno_match_data="custer"
       mmsc="http://mms.rinawireless.com"
-      mmsport=""
       type="mms"
       carrier_enabled="false"
       protocol="IPV4V6"
@@ -19828,7 +19702,6 @@
       mnc="040"
       apn="VZWINTERNET"
       mmsc="http://mms.rinawireless.com"
-      mmsport=""
       mvno_type="spn"
       mvno_match_data="custer"
       type="default,ia,mms,dun,supl"
@@ -19843,7 +19716,6 @@
       mnc="040"
       apn="VZWINTERNET"
       mmsc="http://mms.rinawireless.com"
-      mmsport=""
       mvno_type="spn"
       mvno_match_data="custer"
       type="default,ia,mms,dun,supl"
@@ -19859,7 +19731,6 @@
       mvno_type="spn"
       mvno_match_data="chatmobility"
       mmsc="http://mms.chatmobility.com/mms/"
-      mmsport="80"
       type="mms"
       carrier_enabled="false"
       protocol="IPV4V6"
@@ -19920,7 +19791,6 @@
       mnc="160"
       apn="VZWINTERNET"
       mmsc="http://mms.chatmobility.com/mms/"
-      mmsport="80"
       mvno_type="spn"
       mvno_match_data="chatmobility"
       type="default,ia,mms,dun,supl"
@@ -19934,7 +19804,6 @@
       mnc="160"
       apn="VZWINTERNET"
       mmsc="http://mms.chatmobility.com/mms/"
-      mmsport="80"
       mvno_type="spn"
       mvno_match_data="chatmobility"
       type="default,ia,mms,dun,supl"
@@ -19949,7 +19818,6 @@
       mnc="420"
       apn="admin.lte.ntwls.com"
       server="*"
-      mmsport=""
       mmsc="http://mms.ntwls.net/nex-tech/mms.php"
       type="fota"
       network_type_bitmask="13"
@@ -19962,7 +19830,6 @@
       mnc="420"
       apn="admin.lte.ntwls.com"
       server="*"
-      mmsport=""
       mmsc="http://mms.ntwls.net/nex-tech/mms.php"
       type="fota"
       network_type_bitmask="14"
@@ -19975,7 +19842,6 @@
       mnc="420"
       apn="internet.lte.ntwls.com"
       server="*"
-      mmsport=""
       mmsc="http://mms.ntwls.net/nex-tech/mms.php"
       type="default,ia,supl,hipri,mms"
       protocol="IPV4V6"
@@ -19987,7 +19853,6 @@
       mnc="420"
       apn="modem.lte.ntwls.com"
       server="*"
-      mmsport=""
       mmsc="http://mms.ntwls.net/nex-tech/mms.php"
       type="dun"
       network_type_bitmask="13"
@@ -20000,7 +19865,6 @@
       mnc="420"
       apn="modem.lte.ntwls.com"
       server="*"
-      mmsport=""
       mmsc="http://mms.ntwls.net/nex-tech/mms.php"
       type="dun"
       network_type_bitmask="14"
@@ -20054,7 +19918,6 @@
       mvno_type="spn"
       mvno_match_data="openmobile"
       mmsc="http://mms.openmobilepr.com:1981/"
-      mmsport=""
       type="mms"
       carrier_enabled="false"
       protocol="IPV4V6"
@@ -20115,7 +19978,6 @@
       mnc="000"
       apn="VZWINTERNET"
       mmsc="http://mms.openmobilepr.com:1981/"
-      mmsport=""
       mvno_type="spn"
       mvno_match_data="openmobile"
       type="default,ia,mms,dun,supl"
@@ -20129,7 +19991,6 @@
       mnc="000"
       apn="VZWINTERNET"
       mmsc="http://mms.openmobilepr.com:1981/"
-      mmsport=""
       mvno_type="spn"
       mvno_match_data="openmobile"
       type="default,ia,mms,dun,supl"
@@ -31533,7 +31394,7 @@
       mnc="11"
       apn="ymdata"
       authtype="0"
-      type="default,ia,mms,supl,fota,cbs,dun"
+      type="default,ia,supl,fota,cbs,dun"
       protocol="IPV4V6"
   />