From d70cb0ae4ce753d5e1d4a5180d58443ccfcfc783 Mon Sep 17 00:00:00 2001
From: Mattias Nilsson <Mattias.Nilsson@sony.com>
Date: Wed, 1 Dec 2021 15:45:58 +0100
Subject: Use network_type_bitmask for mms APNs

Some operators use a different mms APN for iWLAN (NETWORK_TYPE_IWLAN).
Use network_type_bitmask="18" to sort the usage for Euro operators:
- mcc202 mnc01 Cosmote Greece
- mcc208 mnc01 Orange France
- mcc216 mnc30 Telekom Hungary
- mcc230 mnc01 T-Mobile Czech Republic
- mcc234 mnc57 Sky UK
- mcc238 mnc06 Hutchison Denmark
- mcc240 mnc02 Hutchison Sweden
- mcc240 mnc07 Sky Sweden

Bug: 228202500
Test: adb shell content query --uri content://telephony/carriers --where numeric='20801'
Change-Id: Icff68e096b4e72abb74d5187f6d16e29107a88bc
---
 etc/apns-full-conf.xml | 39 +++++++++++++++++++++++++++++++++------
 1 file changed, 33 insertions(+), 6 deletions(-)

(limited to 'etc')

diff --git a/etc/apns-full-conf.xml b/etc/apns-full-conf.xml
index 7dc6b6d..047bfbf 100644
--- a/etc/apns-full-conf.xml
+++ b/etc/apns-full-conf.xml
@@ -228,6 +228,7 @@
       mmsproxy="10.10.10.20"
       mmsport="8080"
       type="mms"
+      network_type_bitmask="1|2|3|4|5|6|7|8|9|10|11|12|13|14|15|17|20"
   />
 
   <apn carrier="IMS"
@@ -3439,6 +3440,7 @@
       mmsport="8080"
       authtype="1"
       protocol="IPV4V6"
+      network_type_bitmask="1|2|3|4|5|6|7|8|9|10|11|12|13|14|15|17|20"
   />
 
   <apn carrier="Telekom IMS"
@@ -4709,6 +4711,7 @@
       mmsport="80"
       authtype="1"
       type="mms"
+      network_type_bitmask="1|2|3|4|5|6|7|8|9|10|11|12|13|14|15|17|20"
   />
 
   <apn carrier="HOS"
@@ -6376,6 +6379,7 @@
       mmsproxy="185.110.178.97"
       mmsport="9028"
       type="mms"
+      network_type_bitmask="1|2|3|4|5|6|7|8|9|10|11|12|13|14|15|16|17|19|20"
   />
 
   <apn carrier="Sky IMS"
@@ -6623,6 +6627,16 @@
   />
 
   <apn carrier="3"
+      carrier_id = "1466"
+      mcc="238"
+      mnc="06"
+      apn="data.tre.dk"
+      type="default,ia,supl"
+      protocol="IPV4V6"
+      roaming_protocol="IPV4V6"
+  />
+
+  <apn carrier="3 MMS"
       carrier_id = "1466"
       mcc="238"
       mnc="06"
@@ -6630,12 +6644,12 @@
       mmsc="http://mms.3.dk/"
       mmsproxy="mmsproxy.3.dk"
       mmsport="8799"
-      type="default,ia,supl,mms"
+      type="mms"
       protocol="IPV4V6"
-      roaming_protocol="IPV4V6"
+      network_type_bitmask="1|2|3|4|5|6|7|8|9|10|11|12|13|14|15|17|20"
   />
 
-  <apn carrier="3 MMS"
+  <apn carrier="3 MMS iWLAN"
       carrier_id = "1466"
       mcc="238"
       mnc="06"
@@ -6646,6 +6660,7 @@
       type="mms"
       protocol="IPV4V6"
       network_type_bitmask="18"
+      user_visible="false"
   />
 
   <apn carrier="3 DK Ut"
@@ -6880,6 +6895,16 @@
   />
 
   <apn carrier="3"
+      carrier_id = "1691"
+      mcc="240"
+      mnc="02"
+      apn="data.tre.se"
+      type="default,ia,supl"
+      protocol="IPV4V6"
+      roaming_protocol="IPV4V6"
+  />
+
+  <apn carrier="3 MMS"
       carrier_id = "1691"
       mcc="240"
       mnc="02"
@@ -6887,12 +6912,12 @@
       mmsc="http://mms.tre.se"
       mmsproxy="mmsproxy.tre.se"
       mmsport="8799"
-      type="default,ia,supl,mms"
+      type="mms"
       protocol="IPV4V6"
-      roaming_protocol="IPV4V6"
+      network_type_bitmask="1|2|3|4|5|6|7|8|9|10|11|12|13|14|15|16|17|19|20"
   />
 
-  <apn carrier="3 MMS"
+  <apn carrier="3 MMS iWLAN"
       carrier_id = "1691"
       mcc="240"
       mnc="02"
@@ -6903,6 +6928,7 @@
       type="mms"
       protocol="IPV4V6"
       network_type_bitmask="18"
+      user_visible="false"
   />
 
   <apn carrier="3 Ut"
@@ -7127,6 +7153,7 @@
       mmsport="9028"
       mmsc="http://185.110.178.96:38090/was"
       type="mms"
+      network_type_bitmask="1|2|3|4|5|6|7|8|9|10|11|12|13|14|15|16|17|19|20"
       mvno_match_data="0C"
       mvno_type="gid"
   />
-- 
cgit v1.2.3