Merge changes I057f2b74,I43550a7b,I2b3a8246,Ia0c70879 am: 83535c5252 am: 404bdadc45 am: 921d1321aa

Original change: https://android-review.googlesource.com/c/device/sample/+/1999004

Change-Id: I7aa19c82af29fcdd82b0723b0056fb87f9888f8a

1 files changed, 258 insertions, 49 deletions

diff --git a/etc/apns-full-conf.xml b/etc/apns-full-conf.xml
index c562b59..3030543 100644
--- a/etc/apns-full-conf.xml
+++ b/etc/apns-full-conf.xml
@@ -3555,7 +3555,7 @@
       mcc="222"
       mnc="01"
       apn="xcap.tim.it"
-      type="ut"
+      type="xcap"
       protocol="IPV4V6"
       roaming_protocol="IPV4V6"
       user_visible="false"
@@ -4408,14 +4408,28 @@
   />
 
   <apn carrier="HOS"
+      carrier_id = "2394"
       mcc="230"
       mnc="01"
       apn="hos"
-      type="xcap"
+      mmsc="http://mms"
+      mmsproxy="10.0.0.10"
+      mmsport="80"
+      authtype="1"
+      type="mms"
+      network_type_bitmask="18"
       protocol="IPV4V6"
       user_visible="false"
   />
 
+  <apn carrier="HOS"
+      mcc="230"
+      mnc="01"
+      apn="hos"
+      type="xcap"
+      protocol="IPV4V6"
+      user_visible="false"
+  />
 
   <apn carrier="O2 internet"
       carrier_id = "1449"
@@ -4423,6 +4437,9 @@
       mnc="02"
       apn="internet"
       type="default,ia,supl"
+      authtype="0"
+      protocol="IPV4V6"
+      roaming_protocol="IPV4V6"
   />
 
   <apn carrier="O2 MMS"
@@ -4436,12 +4453,32 @@
       type="mms"
   />
 
+  <apn carrier="O2 VoLTE Hlas"
+      carrier_id = "1449"
+      mcc="230"
+      mnc="02"
+      apn="ims"
+      type="ims"
+      protocol="IPV6"
+      user_visible="false"
+  />
+
+  <apn carrier="O2 VoLTE"
+      carrier_id = "1449"
+      mcc="230"
+      mnc="02"
+      apn="xcap"
+      type="xcap"
+      protocol="IPV6"
+      user_visible="false"
+  />
+
   <apn carrier="Internet"
       carrier_id = "2398"
       mcc="230"
       mnc="03"
       apn="internet"
-      type="default,ia,supl"
+      type="default,ia,supl,xcap"
   />
 
   <apn carrier="MMS"
@@ -4456,17 +4493,35 @@
       mmsport="80"
       authtype="1"
       type="mms"
+      user_editable="false"
+  />
+
+  <apn carrier="IMS"
+      carrier_id = "2398"
+      mcc="230"
+      mnc="03"
+      apn="ims"
+      type="ims"
+      user_visible="false"
   />
 
-  <apn carrier="Orange SK"
+  <apn carrier="Orange Internet"
       carrier_id = "1713"
       mcc="231"
       mnc="01"
       apn="internet"
-      type="default,ia"
+      type="default,ia,supl"
+  />
+
+  <apn carrier="Orange LTE"
+      carrier_id = "1713"
+      mcc="231"
+      mnc="01"
+      apn=""
+      type="ia"
   />
 
-  <apn carrier="Orange SK MMS"
+  <apn carrier="Orange MMS"
       carrier_id = "1713"
       mcc="231"
       mnc="01"
@@ -4478,19 +4533,26 @@
       mmsproxy="213.151.208.145"
       mmsport="8799"
       type="mms"
+      user_editable="false"
   />
 
-  <apn carrier="Orange World"
+  <apn carrier="Orange IMS"
       carrier_id = "1713"
       mcc="231"
       mnc="01"
-      apn="orangewap"
-      user="wap"
-      password="wap"
-      authtype="1"
-      proxy="213.151.208.156"
-      port="8799"
-      type="default,ia,supl"
+      apn="ims"
+      type="ims"
+      protocol="IPV4V6"
+      user_visible="false"
+  />
+
+  <apn carrier="Orange UT"
+      carrier_id = "1713"
+      mcc="231"
+      mnc="01"
+      apn="xcap"
+      type="xcap"
+      user_visible="false"
   />
 
   <apn carrier="T-Mobile internet"
@@ -4500,20 +4562,39 @@
       apn="internet"
       authtype="1"
       type="default,ia,supl"
+      protocol="IPV4V6"
   />
 
-  <apn carrier="T-Mobile MMS"
+  <apn carrier="HOS"
       carrier_id = "2385"
       mcc="231"
       mnc="02"
-      apn="mms"
+      apn="hos"
       user="mms"
       password="mms"
       authtype="1"
-      mmsc="http://mms"
-      mmsproxy="192.168.1.1"
-      mmsport="8080"
-      type="mms"
+      mmsc="http://mmsc.telekom.sk"
+      type="mms,xcap"
+      user_visible="false"
+  />
+
+  <apn carrier="T-Mobile IMS"
+      carrier_id = "2385"
+      mcc="231"
+      mnc="02"
+      apn="ims"
+      type="ims"
+      protocol="IPV4V6"
+      user_visible="false"
+  />
+
+  <apn carrier="4ka Internet"
+      mcc="231"
+      mnc="03"
+      apn="internet"
+      type="default,ia,supl"
+      mvno_type="spn"
+      mvno_match_data="4KA SK"
   />
 
   <apn carrier="O2 internet"
@@ -4536,19 +4617,22 @@
   />
 
   <apn carrier="live!"
+      carrier_id = "14"
       mcc="232"
       mnc="01"
-      apn="a1.net"
+      apn="A1.net"
       user="ppp@a1plus.at"
       password="ppp"
       authtype="1"
       type="default,ia,supl"
+      protocol="IPV4V6"
   />
 
   <apn carrier="A1 MMS"
+      carrier_id = "14"
       mcc="232"
       mnc="01"
-      apn="free.a1.net"
+      apn="free.A1.net"
       user="ppp@a1plus.at"
       password="ppp"
       mmsc="http://mmsc.a1.net"
@@ -4565,38 +4649,49 @@
       apn="ims"
       type="ims"
       protocol="IPV4V6"
-      roaming_protocol="IPV4V6"
       user_visible="false"
   />
 
-  <apn carrier="T-Mobile Internet"
+  <apn carrier="T-Mobile LTE"
       mcc="232"
       mnc="03"
       apn=""
       type="ia"
   />
 
-  <apn carrier="T-Mobile LTE"
+  <apn carrier="T-Mobile A Internet"
       mcc="232"
       mnc="03"
       apn="internet.t-mobile.at"
-      user="t-mobile"
+      user="T"
       password="tm"
       authtype="1"
       type="default,ia,supl"
+      protocol="IPV4V6"
   />
 
-  <apn carrier="T-Mobile MMS"
+  <apn carrier="T-Mobile IMS"
+      mcc="232"
+      mnc="03"
+      apn="ims"
+      type="ims"
+      protocol="IPV4V6"
+      user_visible="false"
+  />
+
+  <apn carrier="HOS"
       mcc="232"
       mnc="03"
-      apn="gprsmms"
+      apn="hos"
       user="t-mobile"
       password="tm"
       mmsc="http://mmsc.t-mobile.at/servlets/mms"
       mmsproxy="10.12.0.20"
       mmsport="80"
       authtype="1"
-      type="mms"
+      type="mms,xcap"
+      protocol="IPV4V6"
+      user_visible="false"
   />
 
   <apn carrier="Goodspeed"
@@ -4609,6 +4704,41 @@
       mvno_match_data="C5"
   />
 
+  <apn carrier="T-Mobile A Internet"
+      mcc="232"
+      mnc="04"
+      apn="internet.t-mobile.at"
+      user="t-mobile"
+      password="tm"
+      authtype="1"
+      type="default,ia,supl"
+      protocol="IPV4V6"
+  />
+
+  <apn carrier="T-Mobile IMS"
+      mcc="232"
+      mnc="04"
+      apn="ims"
+      type="ims"
+      protocol="IPV4V6"
+      user_visible="false"
+  />
+
+  <apn carrier="HOS"
+      mcc="232"
+      mnc="04"
+      apn="hos"
+      user="t-mobile"
+      password="tm"
+      mmsc="http://mmsc.t-mobile.at/servlets/mms"
+      mmsproxy="10.12.0.20"
+      mmsport="80"
+      authtype="1"
+      type="xcap,mms"
+      protocol="IPV4V6"
+      user_visible="false"
+  />
+
   <apn carrier="Planet 3"
       carrier_id = "1344"
       mcc="232"
@@ -4617,78 +4747,108 @@
       mmsc="http://mmsc"
       mmsproxy="213.94.78.133"
       mmsport="8799"
-      type="default,ia,supl,mms"
+      type="default,ia,supl,mms,xcap"
+  />
+
+  <apn carrier="IMS"
+      carrier_id = "1344"
+      mcc="232"
+      mnc="05"
+      apn="ims"
+      type="ims"
+      protocol="IPV6"
+      user_visible="false"
   />
 
-  <apn carrier="tele.ring mms"
+  <apn carrier="HOS"
+      carrier_id = "2094"
       mcc="232"
       mnc="07"
-      apn="mms"
-      user="wap@telering.at"
-      password="wap"
-      mmsc="http://relay.mms.telering.at"
-      mmsproxy="212.95.31.50"
+      apn="hos"
+      user="t-mobile"
+      password="tm"
+      mmsc="http://mmsc.t-mobile.at/servlets/mms"
+      mmsproxy="10.12.0.20"
       mmsport="80"
       authtype="1"
-      type="mms"
+      type="mms,xcap"
+      protocol="IPV4V6"
+      user_visible="false"
   />
 
-  <apn carrier="tele.ring web"
+  <apn carrier="T-Mobile IMS"
+      carrier_id = "2094"
       mcc="232"
       mnc="07"
-      apn="web"
-      user="web@telering.at"
-      password="web"
+      apn="ims"
+      type="ims"
+      protocol="IPV4V6"
+      user_visible="false"
+  />
+
+  <apn carrier="T-Mobile A Internet"
+      carrier_id = "2094"
+      mcc="232"
+      mnc="07"
+      apn="internet.t-mobile.at"
+      user="T"
+      password="tm"
       authtype="1"
       type="default,ia,supl"
+      protocol="IPV4V6"
   />
 
-  <apn carrier="0677 web"
+  <apn carrier="HoT Internet"
       mcc="232"
       mnc="07"
       apn="webaut"
+      authtype="1"
       type="default,ia,supl"
       mvno_type="imsi"
-      mvno_match_data="23207718"
+      mvno_match_data="23207761"
   />
 
-  <apn carrier="0677 mms"
+  <apn carrier="HoT MMS"
       mcc="232"
       mnc="07"
       apn="mmsaut"
+      authtype="1"
       mmsc="http://mmsaut.at/send"
       mmsproxy="212.095.031.050"
       mmsport="80"
       type="mms"
       mvno_type="imsi"
-      mvno_match_data="23207718"
+      mvno_match_data="23207761"
   />
 
   <apn carrier="0677 web"
       mcc="232"
       mnc="07"
       apn="webaut"
+      authtype="1"
       type="default,ia,supl"
       mvno_type="imsi"
-      mvno_match_data="2320776"
+      mvno_match_data="23207718"
   />
 
   <apn carrier="0677 mms"
       mcc="232"
       mnc="07"
       apn="mmsaut"
+      authtype="1"
       mmsc="http://mmsaut.at/send"
       mmsproxy="212.095.031.050"
       mmsport="80"
       type="mms"
       mvno_type="imsi"
-      mvno_match_data="2320776"
+      mvno_match_data="23207718"
   />
 
   <apn carrier="0677 web"
       mcc="232"
       mnc="07"
       apn="webaut"
+      authtype="1"
       type="default,ia,supl"
       mvno_type="imsi"
       mvno_match_data="23207799"
@@ -4698,6 +4858,7 @@
       mcc="232"
       mnc="07"
       apn="mmsaut"
+      authtype="1"
       mmsc="http://mmsaut.at/send"
       mmsproxy="212.095.031.050"
       mmsport="80"
@@ -4719,7 +4880,7 @@
       type="default,ia,supl"
   />
 
-  <apn carrier="Planet3"
+  <apn carrier="Planet 3"
       carrier_id = "1344"
       mcc="232"
       mnc="10"
@@ -4727,10 +4888,21 @@
       mmsc="http://mmsc"
       mmsproxy="213.94.78.133"
       mmsport="8799"
-      type="default,ia,supl,mms"
+      type="default,ia,supl,mms,xcap"
+  />
+
+  <apn carrier="IMS"
+      carrier_id = "1344"
+      mcc="232"
+      mnc="10"
+      apn="ims"
+      type="ims"
+      protocol="IPV6"
+      user_visible="false"
   />
 
   <apn carrier="data.bob"
+      carrier_id = "14"
       mcc="232"
       mnc="11"
       apn="bob.at"
@@ -4738,9 +4910,11 @@
       password="ppp"
       authtype="1"
       type="default,ia,supl"
+      protocol="IPV4V6"
   />
 
   <apn carrier="data.bob MMS"
+      carrier_id = "14"
       mcc="232"
       mnc="11"
       apn="mms.bob.at"
@@ -4761,7 +4935,42 @@
       protocol="IPV4V6"
   />
 
+  <apn carrier="UPC mobiles Internet"
+      mcc="232"
+      mnc="13"
+      apn="Internet.at.upcmobile.com"
+      type="default,ia,supl"
+      mvno_type="gid"
+      mvno_match_data="75617431"
+  />
+
+  <apn carrier="Planet 3"
+      mcc="232"
+      mnc="14"
+      apn="drei.at"
+      mmsc="http://mmsc"
+      mmsproxy="213.94.78.133"
+      mmsport="8799"
+      type="default,ia,supl,mms,xcap"
+  />
+
+  <apn carrier="IMS"
+      mcc="232"
+      mnc="14"
+      apn="ims"
+      type="ims"
+      protocol="IPV6"
+  />
+
+  <apn carrier="Tele2 Web"
+      mcc="232"
+      mnc="19"
+      apn="internet.tele2.at"
+      type="default,ia,supl"
+  />
+
   <apn carrier="Plintron"
+      carrier_id = "2424"
       mcc="232"
       mnc="22"
       apn="data.plintron.at"