Add and change APNs in Hong Kong mcc454

Based on historical data from Sony.

- Change ims, dun, mms, default APNs and add ut
  APNs for 3 HK mcc454 mnc03, mnc04, mnc05 and mnc14.
  Mo APNs are changed for mnc03
  HKBN APNs are added for the mnc03.
  Change APN names from 3 to Hutchison HK

- Add UT APNs for CMHK/China Mobile HK mcc454 mnc12 mnc13

- Add new CMHK APN mcc454 mnc30
  New network added for Hong kong Airport.

- Add XCAP APNs for HK Smartone mcc454
  Smartone is enabling Supplementary services from Android 12.

- Change IMS APNs for HK mcc454
  Protocol and roaming protocol was updated to IPV6

- Update APNs for CSL HK mcc454
  Changed mnc00, mnc02, mnc10, mnc16, mnc18, mnc19, mnc20, mnc29
  new IMS APNs were added for mnc10, mnc20 and mnc29
  Adding XCAP, Supplementary services for csl Hong Kong.
  Change APN attribute to "HOS" and use standard IPv4 protocols.

- Add Global Call MVNO mcc454 mnc00, mnc02, mnc18

CSL are not distributing sim cards with SPN anymore but have
changed to using GID1. Updating the APN list to match this together
with fallback APNs without GID to catch any SPN sim cards left.

Active brands are now 1O1O, csl, Global Call, SUN Mobile and
HK Prepaid. The brands "Club" and "Club Sim" are not active anymore.

Test: adb shell content query --uri content://telephony/carriers --where mcc='454'
Bug: 228202500
Change-Id: I85a39620bc0c94e37b63dc2f7a743d846c046d75

1 files changed, 1055 insertions, 47 deletions

diff --git a/etc/apns-full-conf.xml b/etc/apns-full-conf.xml
index 044393d..f5ca427 100644
--- a/etc/apns-full-conf.xml
+++ b/etc/apns-full-conf.xml
@@ -32990,6 +32990,39 @@
       type="mms"
   />
 
+  <apn carrier="csl"
+      carrier_id = "1526"
+      mcc="454"
+      mnc="00"
+      apn="mobile"
+      mmsproxy="192.168.59.51"
+      mmsport="8080"
+      mmsc="http://192.168.58.171:8002"
+      authtype="3"
+      type="default,ia,mms,hipri"
+      protocol="IPV4V6"
+      roaming_protocol="IPV4V6"
+  />
+
+  <apn carrier="IMS"
+      carrier_id = "1526"
+      mcc="454"
+      mnc="00"
+      apn="ims"
+      type="ims"
+      protocol="IPV6"
+      roaming_protocol="IPV6"
+  />
+
+  <apn carrier="csl UT"
+      carrier_id = "1526"
+      mcc="454"
+      mnc="00"
+      apn="HOS"
+      type="xcap"
+      user_visible="false"
+  />
+
   <apn carrier="1O1O"
       carrier_id = "1526"
       mcc="454"
@@ -32999,10 +33032,26 @@
       mmsport="8080"
       mmsc="http://192.168.58.171:8002"
       authtype="3"
-      type="default,ia,supl,mms"
+      type="default,ia,mms,hipri"
+      protocol="IPV4V6"
+      roaming_protocol="IPV4V6"
+      mvno_type="gid"
+      mvno_match_data="01010000FFFFFFFF"
+  />
+
+  <apn carrier="1O1O IMS"
+      carrier_id = "1526"
+      mcc="454"
+      mnc="00"
+      apn="ims"
+      type="ims"
+      protocol="IPV6"
+      roaming_protocol="IPV6"
+      mvno_type="gid"
+      mvno_match_data="01010000FFFFFFFF"
   />
 
-  <apn carrier="one2free"
+  <apn carrier="csl"
       carrier_id = "1526"
       mcc="454"
       mnc="00"
@@ -33011,19 +33060,155 @@
       mmsport="8080"
       mmsc="http://192.168.58.171:8002"
       authtype="3"
-      type="default,ia,supl,mms"
+      type="default,ia,mms,hipri"
+      protocol="IPV4V6"
+      roaming_protocol="IPV4V6"
+      mvno_type="gid"
+      mvno_match_data="01020000FFFFFFFF"
   />
 
-  <apn carrier="NWMOBILE"
+  <apn carrier="csl IMS"
       carrier_id = "1526"
       mcc="454"
       mnc="00"
-      apn="NWMOBILE"
+      apn="ims"
+      type="ims"
+      protocol="IPV6"
+      roaming_protocol="IPV6"
+      mvno_type="gid"
+      mvno_match_data="01020000FFFFFFFF"
+  />
+
+  <apn carrier="SUN Mobile"
+      carrier_id = "2450"
+      mcc="454"
+      mnc="00"
+      apn="SUNMobile"
       mmsproxy="192.168.59.61"
       mmsport="8080"
       mmsc="http://192.168.58.171:8002"
       authtype="3"
-      type="default,ia,supl,mms"
+      type="default,ia,mms,hipri"
+      protocol="IPV4V6"
+      roaming_protocol="IPV4V6"
+      mvno_type="gid"
+      mvno_match_data="01030000FFFFFFFF"
+  />
+
+  <apn carrier="SUN Mobile IMS"
+      carrier_id = "2450"
+      mcc="454"
+      mnc="00"
+      apn="ims"
+      type="ims"
+      protocol="IPV6"
+      roaming_protocol="IPV6"
+      mvno_type="gid"
+      mvno_match_data="01030000FFFFFFFF"
+  />
+
+  <apn carrier="Global Call"
+      mcc="454"
+      mnc="00"
+      apn="globalcall"
+      mmsc="http://192.168.58.171:8002"
+      mmsproxy="192.168.59.51"
+      mmsport="8080"
+      authtype="3"
+      type="default,ia,mms,hipri"
+      protocol="IPV4V6"
+      roaming_protocol="IPV4V6"
+      mvno_type="gid"
+      mvno_match_data="01040000FFFFFFFF"
+  />
+
+  <apn carrier="IMS"
+      mcc="454"
+      mnc="00"
+      apn="ims"
+      type="ims"
+      protocol="IPV6"
+      roaming_protocol="IPV6"
+      mvno_type="gid"
+      mvno_match_data="01040000FFFFFFFF"
+  />
+
+  <apn carrier="HK Prepaid"
+      mcc="454"
+      mnc="00"
+      apn="mobile"
+      mmsproxy="192.168.59.51"
+      mmsport="8080"
+      mmsc="http://192.168.58.171:8002"
+      authtype="3"
+      type="default,ia,mms,hipri"
+      protocol="IPV4V6"
+      roaming_protocol="IPV4V6"
+      mvno_type="gid"
+      mvno_match_data="02020001FFFFFFFF"
+  />
+
+  <apn carrier="IMS"
+      mcc="454"
+      mnc="00"
+      apn="ims"
+      type="ims"
+      protocol="IPV6"
+      roaming_protocol="IPV6"
+      mvno_type="gid"
+      mvno_match_data="02020001FFFFFFFF"
+  />
+
+  <apn carrier="HK Prepaid"
+      mcc="454"
+      mnc="00"
+      apn="mobile"
+      mmsproxy="192.168.59.51"
+      mmsport="8080"
+      mmsc="http://192.168.58.171:8002"
+      authtype="3"
+      type="default,ia,mms,hipri"
+      protocol="IPV4V6"
+      roaming_protocol="IPV4V6"
+      mvno_type="gid"
+      mvno_match_data="02030001FFFFFFFF"
+  />
+
+  <apn carrier="IMS"
+      mcc="454"
+      mnc="00"
+      apn="ims"
+      type="ims"
+      protocol="IPV6"
+      roaming_protocol="IPV6"
+      mvno_type="gid"
+      mvno_match_data="02030001FFFFFFFF"
+  />
+
+  <apn carrier="HK Prepaid"
+      mcc="454"
+      mnc="00"
+      apn="mobile"
+      mmsproxy="192.168.59.51"
+      mmsport="8080"
+      mmsc="http://192.168.58.171:8002"
+      authtype="3"
+      type="default,ia,mms,hipri"
+      protocol="IPV4V6"
+      roaming_protocol="IPV4V6"
+      mvno_type="gid"
+      mvno_match_data="02020002FFFFFFFF"
+  />
+
+  <apn carrier="IMS"
+      mcc="454"
+      mnc="00"
+      apn="ims"
+      type="ims"
+      protocol="IPV6"
+      roaming_protocol="IPV6"
+      mvno_type="gid"
+      mvno_match_data="02020002FFFFFFFF"
   />
 
   <apn carrier="Truphone"
@@ -33059,6 +33244,39 @@
       mvno_match_data="536E617065"
   />
 
+  <apn carrier="csl"
+      carrier_id = "759"
+      mcc="454"
+      mnc="02"
+      apn="mobile"
+      mmsproxy="192.168.59.51"
+      mmsport="8080"
+      mmsc="http://192.168.58.171:8002"
+      authtype="3"
+      type="default,ia,mms,hipri"
+      protocol="IPV4V6"
+      roaming_protocol="IPV4V6"
+  />
+
+  <apn carrier="IMS"
+      carrier_id = "759"
+      mcc="454"
+      mnc="02"
+      apn="ims"
+      type="ims"
+      protocol="IPV6"
+      roaming_protocol="IPV6"
+  />
+
+  <apn carrier="csl UT"
+      carrier_id = "759"
+      mcc="454"
+      mnc="02"
+      apn="HOS"
+      type="xcap"
+      user_visible="false"
+  />
+
   <apn carrier="1O1O"
       carrier_id = "759"
       mcc="454"
@@ -33068,10 +33286,26 @@
       mmsport="8080"
       mmsc="http://192.168.58.171:8002"
       authtype="3"
-      type="default,ia,supl,mms"
+      type="default,ia,mms,hipri"
+      protocol="IPV4V6"
+      roaming_protocol="IPV4V6"
+      mvno_type="gid"
+      mvno_match_data="01010000FFFFFFFF"
+  />
+
+  <apn carrier="1O1O IMS"
+      carrier_id = "759"
+      mcc="454"
+      mnc="02"
+      apn="ims"
+      type="ims"
+      protocol="IPV6"
+      roaming_protocol="IPV6"
+      mvno_type="gid"
+      mvno_match_data="01010000FFFFFFFF"
   />
 
-  <apn carrier="one2free"
+  <apn carrier="csl"
       carrier_id = "759"
       mcc="454"
       mnc="02"
@@ -33080,34 +33314,202 @@
       mmsport="8080"
       mmsc="http://192.168.58.171:8002"
       authtype="3"
-      type="default,ia,supl,mms"
+      type="default,ia,mms,hipri"
+      protocol="IPV4V6"
+      roaming_protocol="IPV4V6"
+      mvno_type="gid"
+      mvno_match_data="01020000FFFFFFFF"
   />
 
-  <apn carrier="NWMOBILE"
+  <apn carrier="csl IMS"
       carrier_id = "759"
       mcc="454"
       mnc="02"
-      apn="NWMOBILE"
+      apn="ims"
+      type="ims"
+      protocol="IPV6"
+      roaming_protocol="IPV6"
+      mvno_type="gid"
+      mvno_match_data="01020000FFFFFFFF"
+  />
+
+  <apn carrier="SUN Mobile"
+      mcc="454"
+      mnc="02"
+      apn="SUNMobile"
       mmsproxy="192.168.59.61"
       mmsport="8080"
       mmsc="http://192.168.58.171:8002"
       authtype="3"
-      type="default,ia,supl,mms"
+      type="default,ia,mms,hipri"
+      protocol="IPV4V6"
+      roaming_protocol="IPV4V6"
+      mvno_type="gid"
+      mvno_match_data="01030000FFFFFFFF"
   />
 
-  <apn carrier="3 LTE"
+  <apn carrier="SUN Mobile IMS"
+      mcc="454"
+      mnc="02"
+      apn="ims"
+      type="ims"
+      protocol="IPV6"
+      roaming_protocol="IPV6"
+      mvno_type="gid"
+      mvno_match_data="01030000FFFFFFFF"
+  />
+
+  <apn carrier="Global Call"
+      mcc="454"
+      mnc="02"
+      apn="globalcall"
+      mmsc="http://192.168.58.171:8002"
+      mmsproxy="192.168.59.51"
+      mmsport="8080"
+      authtype="3"
+      type="default,ia,mms,hipri"
+      protocol="IPV4V6"
+      roaming_protocol="IPV4V6"
+      mvno_type="gid"
+      mvno_match_data="01040000FFFFFFFF"
+  />
+
+  <apn carrier="IMS"
+      mcc="454"
+      mnc="02"
+      apn="ims"
+      type="ims"
+      protocol="IPV6"
+      roaming_protocol="IPV6"
+      mvno_type="gid"
+      mvno_match_data="01040000FFFFFFFF"
+  />
+
+  <apn carrier="HK Prepaid"
+      mcc="454"
+      mnc="02"
+      apn="mobile"
+      mmsproxy="192.168.59.51"
+      mmsport="8080"
+      mmsc="http://192.168.58.171:8002"
+      authtype="3"
+      type="default,ia,mms,hipri"
+      protocol="IPV4V6"
+      roaming_protocol="IPV4V6"
+      mvno_type="gid"
+      mvno_match_data="02020001FFFFFFFF"
+  />
+
+  <apn carrier="IMS"
+      mcc="454"
+      mnc="02"
+      apn="ims"
+      type="ims"
+      protocol="IPV6"
+      roaming_protocol="IPV6"
+      mvno_type="gid"
+      mvno_match_data="02020001FFFFFFFF"
+  />
+
+  <apn carrier="HK Prepaid"
+      mcc="454"
+      mnc="02"
+      apn="mobile"
+      mmsproxy="192.168.59.51"
+      mmsport="8080"
+      mmsc="http://192.168.58.171:8002"
+      authtype="3"
+      type="default,ia,mms,hipri"
+      protocol="IPV4V6"
+      roaming_protocol="IPV4V6"
+      mvno_type="gid"
+      mvno_match_data="02030001FFFFFFFF"
+  />
+
+  <apn carrier="IMS"
+      mcc="454"
+      mnc="02"
+      apn="ims"
+      type="ims"
+      protocol="IPV6"
+      roaming_protocol="IPV6"
+      mvno_type="gid"
+      mvno_match_data="02030001FFFFFFFF"
+  />
+
+  <apn carrier="HK Prepaid"
+      mcc="454"
+      mnc="02"
+      apn="mobile"
+      mmsproxy="192.168.59.51"
+      mmsport="8080"
+      mmsc="http://192.168.58.171:8002"
+      authtype="3"
+      type="default,ia,mms,hipri"
+      protocol="IPV4V6"
+      roaming_protocol="IPV4V6"
+      mvno_type="gid"
+      mvno_match_data="02020002FFFFFFFF"
+  />
+
+  <apn carrier="IMS"
+      mcc="454"
+      mnc="02"
+      apn="ims"
+      type="ims"
+      protocol="IPV6"
+      roaming_protocol="IPV6"
+      mvno_type="gid"
+      mvno_match_data="02020002FFFFFFFF"
+  />
+
+  <apn carrier="Hutchison HK"
       carrier_id = "760"
       mcc="454"
       mnc="03"
-      apn="mobile.lte.three.com.hk"
+      apn="mobile.three.com.hk"
       mmsc="http://mms.um.three.com.hk:10021/mmsc"
       mmsproxy="mms.three.com.hk"
       mmsport="8799"
       authtype="1"
-      type="default,ia,supl,mms"
+      type="default,ia,mms"
+      protocol="IPV4V6"
+      roaming_protocol="IPV4V6"
   />
 
-  <apn carrier="3"
+  <apn carrier="Hutchison HK Share"
+      carrier_id = "760"
+      mcc="454"
+      mnc="03"
+      apn="share.three.com.hk"
+      authtype="1"
+      type="dun"
+      protocol="IPV4V6"
+      roaming_protocol="IPV4V6"
+  />
+
+  <apn carrier="3 IMS"
+      carrier_id = "760"
+      mcc="454"
+      mnc="03"
+      apn="ims"
+      authtype="1"
+      type="ims"
+      protocol="IPV4V6"
+      roaming_protocol="IPV4V6"
+      user_visible="false"
+  />
+
+  <apn carrier="3 HOS"
+      carrier_id = "760"
+      mcc="454"
+      mnc="03"
+      apn="hos"
+      type="xcap"
+      user_visible="false"
+  />
+
+  <apn carrier="Hutchison HK"
       carrier_id = "760"
       mcc="454"
       mnc="03"
@@ -33116,28 +33518,210 @@
       mmsproxy="mms.three.com.hk"
       mmsport="8799"
       authtype="1"
-      type="default,ia,supl,mms"
+      type="default,ia,mms"
+      mvno_type="gid"
+      mvno_match_data="0404"
+      protocol="IPV4V6"
+      roaming_protocol="IPV4V6"
+  />
+
+  <apn carrier="3 IMS"
+      carrier_id = "760"
+      mcc="454"
+      mnc="03"
+      apn="ims"
+      authtype="1"
+      type="ims"
+      mvno_type="gid"
+      mvno_match_data="0404"
+      protocol="IPV4V6"
+      roaming_protocol="IPV4V6"
+      user_visible="false"
+  />
+
+  <apn carrier="Hutchison HK Share"
+      carrier_id = "760"
+      mcc="454"
+      mnc="03"
+      apn="share.three.com.hk"
+      authtype="1"
+      type="dun"
+      mvno_type="gid"
+      mvno_match_data="0404"
+      protocol="IPV4V6"
+      roaming_protocol="IPV4V6"
+  />
+
+  <apn carrier="Mo"
+      mcc="454"
+      mnc="03"
+      apn="mobile.three.com.hk"
+      mmsc="http://mms.um.three.com.hk:10021/mmsc"
+      mmsproxy="mms.three.com.hk"
+      mmsport="8799"
+      authtype="1"
+      type="default,ia,mms"
+      mvno_type="gid"
+      mvno_match_data="0405"
+      protocol="IPV4V6"
+      roaming_protocol="IPV4V6"
+  />
+
+  <apn carrier="Mo IMS"
+      mcc="454"
+      mnc="03"
+      apn="ims"
+      authtype="1"
+      type="ims"
+      mvno_type="gid"
+      mvno_match_data="0405"
+      protocol="IPV4V6"
+      roaming_protocol="IPV4V6"
+      user_visible="false"
+  />
+
+  <apn carrier="Mo Share"
+      mcc="454"
+      mnc="03"
+      apn="share.three.com.hk"
+      authtype="1"
+      type="dun"
+      mvno_type="gid"
+      mvno_match_data="0405"
+      protocol="IPV4V6"
+      roaming_protocol="IPV4V6"
+  />
+
+  <apn carrier="HKBN"
+      mcc="454"
+      mnc="03"
+      apn="mobile.three.com.hk"
+      mmsc="http://mms.um.three.com.hk:10021/mmsc"
+      mmsproxy="mms.three.com.hk"
+      mmsport="8799"
+      authtype="1"
+      type="default,ia,mms"
+      protocol="IPV4V6"
+      roaming_protocol="IPV4V6"
+      mvno_type="gid"
+      mvno_match_data="0009"
   />
 
-  <apn carrier="3(2G) MMS"
+  <apn carrier="HKBN IMS"
+      mcc="454"
+      mnc="03"
+      apn="ims"
+      authtype="1"
+      type="ims"
+      protocol="IPV4V6"
+      roaming_protocol="IPV4V6"
+      mvno_type="gid"
+      mvno_match_data="0009"
+      user_visible="false"
+  />
+
+  <apn carrier="HKBN Share"
+      mcc="454"
+      mnc="03"
+      apn="share.three.com.hk"
+      authtype="1"
+      type="dun"
+      protocol="IPV4V6"
+      roaming_protocol="IPV4V6"
+      mvno_type="gid"
+      mvno_match_data="0009"
+  />
+
+  <apn carrier="Hutchison HK"
       carrier_id = "1960"
       mcc="454"
       mnc="04"
-      apn="mms-g.three.com.hk"
-      mmsc="http://10.30.15.51:10021/mmsc"
-      mmsproxy="10.30.15.53"
-      mmsport="8080"
-      type="mms"
+      apn="mobile.three.com.hk"
+      mmsc="http://mms.um.three.com.hk:10021/mmsc"
+      mmsproxy="mms.three.com.hk"
+      mmsport="8799"
+      authtype="1"
+      type="default,ia,mms"
+      protocol="IPV4V6"
+      roaming_protocol="IPV4V6"
   />
 
-  <apn carrier="3(2G) GPRS"
+  <apn carrier="Hutchison HK Share"
       carrier_id = "1960"
       mcc="454"
       mnc="04"
-      apn="web-g.three.com.hk"
-      proxy="10.30.3.151"
-      port="8080"
-      type="default,ia,supl"
+      apn="share.three.com.hk"
+      authtype="1"
+      type="dun"
+      protocol="IPV4V6"
+      roaming_protocol="IPV4V6"
+  />
+
+  <apn carrier="3 IMS"
+      carrier_id = "1960"
+      mcc="454"
+      mnc="04"
+      apn="ims"
+      authtype="1"
+      type="ims"
+      protocol="IPV4V6"
+      roaming_protocol="IPV4V6"
+      user_visible="false"
+  />
+
+  <apn carrier="3 HOS"
+      carrier_id = "1960"
+      mcc="454"
+      mnc="04"
+      apn="hos"
+      type="xcap"
+      user_visible="false"
+  />
+
+  <apn carrier="Hutchison HK"
+      carrier_id = "1960"
+      mcc="454"
+      mnc="05"
+      apn="mobile.three.com.hk"
+      mmsc="http://mms.um.three.com.hk:10021/mmsc"
+      mmsproxy="mms.three.com.hk"
+      mmsport="8799"
+      authtype="1"
+      type="default,ia,mms"
+      protocol="IPV4V6"
+      roaming_protocol="IPV4V6"
+  />
+
+  <apn carrier="Hutchison HK Share"
+      carrier_id = "1960"
+      mcc="454"
+      mnc="05"
+      apn="share.three.com.hk"
+      authtype="1"
+      type="dun"
+      protocol="IPV4V6"
+      roaming_protocol="IPV4V6"
+  />
+
+  <apn carrier="3 IMS"
+      carrier_id = "1960"
+      mcc="454"
+      mnc="05"
+      apn="ims"
+      authtype="1"
+      type="ims"
+      protocol="IPV4V6"
+      roaming_protocol="IPV4V6"
+      user_visible="false"
+  />
+
+  <apn carrier="3 HOS"
+      carrier_id = "1960"
+      mcc="454"
+      mnc="05"
+      apn="hos"
+      type="xcap"
+      user_visible="false"
   />
 
   <apn carrier="SmarTone"
@@ -33150,10 +33734,33 @@
       mmsport="8080"
       authtype="3"
       type="default,ia,supl,mms"
+      protocol="IPV4V6"
+      roaming_protocol="IPV4V6"
+  />
+
+  <apn carrier="SmarTone IMS"
+      carrier_id = "761"
+      mcc="454"
+      mnc="06"
+      apn="ims"
+      type="ims"
+      protocol="IPV4V6"
+      roaming_protocol="IPV4V6"
+  />
+
+  <apn carrier="SmarTone UT"
+      carrier_id = "761"
+      mcc="454"
+      mnc="06"
+      apn="smt"
+      type="xcap"
+      protocol="IPV4V6"
+      roaming_protocol="IPV4V6"
+      user_visible="false"
   />
 
   <apn carrier="Truphone"
-      carrier_id = "2143"
+      carrier_id = "763"
       mcc="454"
       mnc="08"
       apn="truphone.com"
@@ -33175,7 +33782,7 @@
       mvno_match_data="547275554B3030656E"
   />
 
-  <apn carrier="one2free"
+  <apn carrier="csl"
       carrier_id = "765"
       mcc="454"
       mnc="10"
@@ -33184,7 +33791,29 @@
       mmsproxy="192.168.59.51"
       mmsport="8080"
       authtype="3"
-      type="default,ia,supl,mms"
+      type="default,ia,mms,hipri"
+      protocol="IPV4V6"
+      roaming_protocol="IPV4V6"
+  />
+
+  <apn carrier="csl UT"
+      carrier_id = "765"
+      mcc="454"
+      mnc="10"
+      apn="HOS"
+      type="xcap"
+      user_visible="false"
+  />
+
+  <apn carrier="CMHK UT"
+      carrier_id = "767"
+      mcc="454"
+      mnc="12"
+      apn="xcap"
+      type="xcap"
+      protocol="IPV4V6"
+      roaming_protocol="IPV4V6"
+      user_visible="false"
   />
 
   <apn carrier="CMHK MMS"
@@ -33193,7 +33822,10 @@
       mnc="12"
       apn="cmhk"
       mmsc="http://mms.hk.chinamobile.com/mms"
+      authtype="1"
       type="mms"
+      protocol="IPV4V6"
+      roaming_protocol="IPV4V6"
   />
 
   <apn carrier="CMHK Data"
@@ -33202,6 +33834,29 @@
       mnc="12"
       apn="cmhk"
       type="default,ia,supl"
+      authtype="1"
+      protocol="IPV4V6"
+      roaming_protocol="IPV4V6"
+  />
+
+  <apn carrier="CMHK IMS"
+      carrier_id = "767"
+      mcc="454"
+      mnc="12"
+      apn="ims"
+      type="ims"
+      protocol="IPV4V6"
+      roaming_protocol="IPV4V6"
+  />
+
+  <apn carrier="csl IMS"
+      carrier_id = "765"
+      mcc="454"
+      mnc="10"
+      apn="ims"
+      type="ims"
+      protocol="IPV6"
+      roaming_protocol="IPV6"
   />
 
   <apn carrier="CMHK MMS"
@@ -33211,6 +33866,8 @@
       apn="cmhk"
       mmsc="http://mms.hk.chinamobile.com/mms"
       type="mms"
+      protocol="IPV4V6"
+      roaming_protocol="IPV4V6"
   />
 
   <apn carrier="CMHK Data"
@@ -33219,10 +33876,65 @@
       mnc="13"
       apn="cmhk"
       type="default,ia,supl"
+      protocol="IPV4V6"
+      roaming_protocol="IPV4V6"
+  />
+
+  <apn carrier="CMHK UT"
+      carrier_id = "767"
+      mcc="454"
+      mnc="13"
+      apn="xcap"
+      type="xcap"
+      protocol="IPV4V6"
+      roaming_protocol="IPV4V6"
+      user_visible="false"
+  />
+
+  <apn carrier="Hutchison HK"
+      mcc="454"
+      mnc="14"
+      apn="mobile.three.com.hk"
+      mmsc="http://mms.um.three.com.hk:10021/mmsc"
+      mmsproxy="mms.three.com.hk"
+      mmsport="8799"
+      authtype="1"
+      type="default,ia,mms"
+      protocol="IPV4V6"
+      roaming_protocol="IPV4V6"
+  />
+
+  <apn carrier="Hutchison HK Share"
+      mcc="454"
+      mnc="14"
+      apn="share.three.com.hk"
+      authtype="1"
+      type="dun"
+      protocol="IPV4V6"
+      roaming_protocol="IPV4V6"
+  />
+
+  <apn carrier="3 IMS"
+      mcc="454"
+      mnc="14"
+      apn="ims"
+      authtype="1"
+      type="ims"
+      protocol="IPV4V6"
+      roaming_protocol="IPV4V6"
+      user_visible="false"
+  />
+
+  <apn carrier="3 HOS"
+      mcc="454"
+      mnc="14"
+      apn="hos"
+      type="xcap"
+      user_visible="false"
   />
 
   <apn carrier="SmarTone"
-      carrier_id = "768"
+      carrier_id = "761"
       mcc="454"
       mnc="15"
       apn="SmarTone"
@@ -33231,18 +33943,52 @@
       mmsc="http://mms.smartone.com/server"
       authtype="3"
       type="default,ia,supl,mms"
+      protocol="IPV4V6"
+      roaming_protocol="IPV4V6"
+  />
+
+  <apn carrier="SmarTone UT"
+      carrier_id = "761"
+      mcc="454"
+      mnc="15"
+      apn="smt"
+      type="xcap"
+      protocol="IPV4V6"
+      roaming_protocol="IPV4V6"
+      user_visible="false"
+  />
+
+  <apn carrier="csl IMS"
+      carrier_id = "769"
+      mcc="454"
+      mnc="16"
+      apn="ims"
+      type="ims"
+      protocol="IPV6"
+      roaming_protocol="IPV6"
+  />
+
+  <apn carrier="csl UT"
+      carrier_id = "769"
+      mcc="454"
+      mnc="16"
+      apn="HOS"
+      type="xcap"
+      user_visible="false"
   />
 
-  <apn carrier="PCCW-HKT"
+  <apn carrier="csl"
       carrier_id = "769"
       mcc="454"
       mnc="16"
-      apn="pccw"
-      mmsc="http://3gmms.pccwmobile.com:8080/was"
+      apn="mobile"
+      mmsc="http://mms.hkcsl.com:8080"
       mmsproxy="10.140.14.10"
       mmsport="8080"
-      authtype="1"
-      type="default,ia,supl,mms"
+      authtype="3"
+      type="default,ia,mms,hipri"
+      protocol="IPV4V6"
+      roaming_protocol="IPV4V6"
   />
 
   <apn carrier="SmarTone"
@@ -33255,6 +34001,52 @@
       mmsc="http://mms.smartone.com/server"
       authtype="3"
       type="default,ia,supl,mms"
+      protocol="IPV4V6"
+      roaming_protocol="IPV4V6"
+  />
+
+  <apn carrier="SmarTone UT"
+      carrier_id = "761"
+      mcc="454"
+      mnc="17"
+      apn="smt"
+      type="xcap"
+      protocol="IPV4V6"
+      roaming_protocol="IPV4V6"
+      user_visible="false"
+  />
+
+  <apn carrier="csl"
+      carrier_id = "770"
+      mcc="454"
+      mnc="18"
+      apn="mobile"
+      mmsproxy="192.168.59.51"
+      mmsport="8080"
+      mmsc="http://192.168.58.171:8002"
+      authtype="3"
+      type="default,ia,mms,hipri"
+      protocol="IPV4V6"
+      roaming_protocol="IPV4V6"
+  />
+
+  <apn carrier="IMS"
+      carrier_id = "770"
+      mcc="454"
+      mnc="18"
+      apn="ims"
+      type="ims"
+      protocol="IPV6"
+      roaming_protocol="IPV6"
+  />
+
+  <apn carrier="csl UT"
+      carrier_id = "770"
+      mcc="454"
+      mnc="18"
+      apn="HOS"
+      type="xcap"
+      user_visible="false"
   />
 
   <apn carrier="1O1O"
@@ -33266,10 +34058,26 @@
       mmsport="8080"
       mmsc="http://192.168.58.171:8002"
       authtype="3"
-      type="default,ia,supl,mms"
+      type="default,ia,mms,hipri"
+      protocol="IPV4V6"
+      roaming_protocol="IPV4V6"
+      mvno_type="gid"
+      mvno_match_data="01010000FFFFFFFF"
   />
 
-  <apn carrier="one2free"
+  <apn carrier="1O1O IMS"
+      carrier_id = "770"
+      mcc="454"
+      mnc="18"
+      apn="ims"
+      type="ims"
+      protocol="IPV6"
+      roaming_protocol="IPV6"
+      mvno_type="gid"
+      mvno_match_data="01010000FFFFFFFF"
+  />
+
+  <apn carrier="csl"
       carrier_id = "770"
       mcc="454"
       mnc="18"
@@ -33278,31 +34086,231 @@
       mmsport="8080"
       mmsc="http://192.168.58.171:8002"
       authtype="3"
-      type="default,ia,supl,mms"
+      type="default,ia,mms,hipri"
+      protocol="IPV4V6"
+      roaming_protocol="IPV4V6"
+      mvno_type="gid"
+      mvno_match_data="01020000FFFFFFFF"
   />
 
-  <apn carrier="NWMOBILE"
+  <apn carrier="csl IMS"
       carrier_id = "770"
       mcc="454"
       mnc="18"
-      apn="NWMOBILE"
+      apn="ims"
+      type="ims"
+      protocol="IPV6"
+      roaming_protocol="IPV6"
+      mvno_type="gid"
+      mvno_match_data="01020000FFFFFFFF"
+  />
+
+  <apn carrier="SUN Mobile"
+      mcc="454"
+      mnc="18"
+      apn="SUNMobile"
       mmsproxy="192.168.59.61"
       mmsport="8080"
       mmsc="http://192.168.58.171:8002"
       authtype="3"
-      type="default,ia,supl,mms"
+      type="default,ia,mms,hipri"
+      protocol="IPV4V6"
+      roaming_protocol="IPV4V6"
+      mvno_type="gid"
+      mvno_match_data="01030000FFFFFFFF"
+  />
+
+  <apn carrier="SUN Mobile IMS"
+      mcc="454"
+      mnc="18"
+      apn="ims"
+      type="ims"
+      protocol="IPV6"
+      roaming_protocol="IPV6"
+      mvno_type="gid"
+      mvno_match_data="01030000FFFFFFFF"
+  />
+
+  <apn carrier="Global Call"
+      mcc="454"
+      mnc="18"
+      apn="globalcall"
+      mmsc="http://192.168.58.171:8002"
+      mmsproxy="192.168.59.51"
+      mmsport="8080"
+      authtype="3"
+      type="default,ia,mms,hipri"
+      protocol="IPV4V6"
+      roaming_protocol="IPV4V6"
+      mvno_type="gid"
+      mvno_match_data="01040000FFFFFFFF"
+  />
+
+  <apn carrier="IMS"
+      mcc="454"
+      mnc="18"
+      apn="ims"
+      type="ims"
+      protocol="IPV6"
+      roaming_protocol="IPV6"
+      mvno_type="gid"
+      mvno_match_data="01040000FFFFFFFF"
+  />
+
+  <apn carrier="HK Prepaid"
+      mcc="454"
+      mnc="18"
+      apn="mobile"
+      mmsproxy="192.168.59.51"
+      mmsport="8080"
+      mmsc="http://192.168.58.171:8002"
+      authtype="3"
+      type="default,ia,mms,hipri"
+      protocol="IPV4V6"
+      roaming_protocol="IPV4V6"
+      mvno_type="gid"
+      mvno_match_data="02020001FFFFFFFF"
   />
 
-  <apn carrier="PCCW-HKT"
+  <apn carrier="IMS"
+      mcc="454"
+      mnc="18"
+      apn="ims"
+      type="ims"
+      protocol="IPV6"
+      roaming_protocol="IPV6"
+      mvno_type="gid"
+      mvno_match_data="02020001FFFFFFFF"
+  />
+
+  <apn carrier="HK Prepaid"
+      mcc="454"
+      mnc="18"
+      apn="mobile"
+      mmsproxy="192.168.59.51"
+      mmsport="8080"
+      mmsc="http://192.168.58.171:8002"
+      authtype="3"
+      type="default,ia,mms,hipri"
+      protocol="IPV4V6"
+      roaming_protocol="IPV4V6"
+      mvno_type="gid"
+      mvno_match_data="02030001FFFFFFFF"
+  />
+
+  <apn carrier="IMS"
+      mcc="454"
+      mnc="18"
+      apn="ims"
+      type="ims"
+      protocol="IPV6"
+      roaming_protocol="IPV6"
+      mvno_type="gid"
+      mvno_match_data="02030001FFFFFFFF"
+  />
+
+  <apn carrier="HK Prepaid"
+      mcc="454"
+      mnc="18"
+      apn="mobile"
+      mmsproxy="192.168.59.51"
+      mmsport="8080"
+      mmsc="http://192.168.58.171:8002"
+      authtype="3"
+      type="default,ia,mms,hipri"
+      protocol="IPV4V6"
+      roaming_protocol="IPV4V6"
+      mvno_type="gid"
+      mvno_match_data="02020002FFFFFFFF"
+  />
+
+  <apn carrier="IMS"
+      mcc="454"
+      mnc="18"
+      apn="ims"
+      type="ims"
+      protocol="IPV6"
+      roaming_protocol="IPV6"
+      mvno_type="gid"
+      mvno_match_data="02020002FFFFFFFF"
+  />
+
+  <apn carrier="csl"
       carrier_id = "1526"
       mcc="454"
       mnc="19"
-      apn="pccw"
-      mmsc="http://3gmms.pccwmobile.com:8080/was"
+      apn="mobile"
+      mmsc="http://mms.hkcsl.com:8080"
       mmsproxy="10.140.14.10"
       mmsport="8080"
-      authtype="1"
+      authtype="3"
+      type="default,ia,mms,hipri"
+      protocol="IPV4V6"
+      roaming_protocol="IPV4V6"
+  />
+
+  <apn carrier="csl IMS"
+      carrier_id = "1526"
+      mcc="454"
+      mnc="19"
+      apn="ims"
+      type="ims"
+      protocol="IPV6"
+      roaming_protocol="IPV6"
+  />
+
+  <apn carrier="csl UT"
+      carrier_id = "1526"
+      mcc="454"
+      mnc="19"
+      apn="HOS"
+      type="xcap"
+      user_visible="false"
+  />
+
+  <apn carrier="csl IMS"
+      mcc="454"
+      mnc="20"
+      apn="ims"
+      type="ims"
+      protocol="IPV6"
+      roaming_protocol="IPV6"
+  />
+
+  <apn carrier="csl UT"
+      mcc="454"
+      mnc="20"
+      apn="HOS"
+      type="xcap"
+      user_visible="false"
+  />
+
+  <apn carrier="csl IMS"
+      mcc="454"
+      mnc="29"
+      apn="ims"
+      type="ims"
+      protocol="IPV6"
+      roaming_protocol="IPV6"
+  />
+
+  <apn carrier="csl UT"
+      mcc="454"
+      mnc="29"
+      apn="HOS"
+      type="xcap"
+      user_visible="false"
+  />
+
+  <apn carrier="HKIA-5G Data"
+      carrier_id = "772"
+      mcc="454"
+      mnc="30"
+      apn="hkia-5g"
+      mmsc="http://mms.hk.chinamobile.com/mms"
       type="default,ia,supl,mms"
+      protocol="IPV4V6"
+      roaming_protocol="IPV4V6"
   />
 
   <apn carrier="Webbing"