Merge "Signed-off-by: Evgenii Sitnikov <dev.sberbank.telecom@gmail.com> Test: Change type of APN for Sberbank-Telecom Russia MVNO Bug: 153680182 Change-Id: I7902ef90dcc4437ba66f71556712a96ceb5726dc"
diff --git a/METADATA b/METADATA
new file mode 100644
index 0000000..d97975c
--- /dev/null
+++ b/METADATA
@@ -0,0 +1,3 @@
+third_party {
+ license_type: NOTICE
+}
diff --git a/MODULE_LICENSE_APACHE2 b/MODULE_LICENSE_APACHE2
deleted file mode 100644
index e69de29..0000000
--- a/MODULE_LICENSE_APACHE2
+++ /dev/null
diff --git a/etc/README b/etc/README
index 08233dc..9fcab8d 100644
--- a/etc/README
+++ b/etc/README
@@ -16,4 +16,4 @@
For APNs with a matching carrier ID please assign a carrier ID
AOSP carrier ID assignments can be found at
-https://android.googlesource.com/platform/packages/providers/TelephonyProvider/+/master/assets/carrier_list.textpb
\ No newline at end of file
+https://android.googlesource.com/platform/packages/providers/TelephonyProvider/+/master/assets/latest_carrier_id/carrier_list.textpb
diff --git a/etc/apns-full-conf.xml b/etc/apns-full-conf.xml
index 03a4522..abedbb9 100644
--- a/etc/apns-full-conf.xml
+++ b/etc/apns-full-conf.xml
@@ -376,6 +376,7 @@
/>
<apn carrier="MVNO NL"
+ carrier_id = "2149"
mcc="204"
mnc="03"
apn="internet.mvno.mobi"
@@ -404,8 +405,19 @@
apn="truphone.com"
mmsc="http://mmsc.truphone.com:1981/mm1"
type="default,supl,mms,dun"
- mvno_match_data="204043914"
- mvno_type="imsi"
+ mvno_type="gid"
+ mvno_match_data="547275554B3030656E"
+ />
+
+ <apn carrier="Truphone"
+ carrier_id = "2143"
+ mcc="204"
+ mnc="04"
+ apn="truphone.com"
+ mmsc="http://mmsc.truphone.com:1981/mm1"
+ type="default,supl,mms,dun"
+ mvno_type="gid"
+ mvno_match_data="54727555533030656E"
/>
<apn carrier="Vodafone NL"
@@ -626,6 +638,7 @@
/>
<apn carrier="MVNO NL"
+ carrier_id = "2149"
mcc="204"
mnc="08"
apn="internet.mvno.mobi"
@@ -659,6 +672,28 @@
mvno_match_data="Rabo Mobiel"
mvno_type="spn"
/>
+
+ <apn carrier="Truphone"
+ carrier_id = "2143"
+ mcc="204"
+ mnc="08"
+ apn="truphone.com"
+ mmsc="http://mmsc.truphone.com:1981/mm1"
+ type="default,supl,mms,dun"
+ mvno_type="gid"
+ mvno_match_data="547275554B3030656E"
+ />
+
+ <apn carrier="Truphone"
+ carrier_id = "2143"
+ mcc="204"
+ mnc="08"
+ apn="truphone.com"
+ mmsc="http://mmsc.truphone.com:1981/mm1"
+ type="default,supl,mms,dun"
+ mvno_type="gid"
+ mvno_match_data="54727555533030656E"
+ />
<apn carrier="HOT mobile Internet"
carrier_id = "1991"
@@ -682,6 +717,7 @@
mvno_match_data="HOT mobile"
mvno_type="spn"
/>
+
<apn carrier="Telfort Internet"
carrier_id = "1644"
@@ -1157,8 +1193,19 @@
apn="truphone.com"
mmsc="http://mmsc.truphone.com:1981/mm1"
type="default,supl,mms,dun"
- mvno_match_data="208090022"
- mvno_type="imsi"
+ mvno_type="gid"
+ mvno_match_data="547275554B3030656E"
+ />
+
+ <apn carrier="Truphone"
+ carrier_id = "2143"
+ mcc="208"
+ mnc="09"
+ apn="truphone.com"
+ mmsc="http://mmsc.truphone.com:1981/mm1"
+ type="default,supl,mms,dun"
+ mvno_type="gid"
+ mvno_match_data="54727555533030656E"
/>
<apn carrier="Coriolis"
@@ -1977,12 +2024,32 @@
password=""
port=""
proxy=""
- type="default,supl,foat,hipri"
+ type="default,supl,fota,hipri"
roaming_protocol="IPV4V6"
mvno_type="imsi"
mvno_match_data="214050104xxxxxx"
/>
+ <apn carrier="DIGI Spain"
+ carrier_id="2442"
+ mcc="214"
+ mnc="05"
+ apn="internet.digimobil.es"
+ type="default,supl"
+ mvno_type="gid"
+ mvno_match_data="44474553"
+ />
+
+ <apn carrier="DIGI Italy"
+ carrier_id="2443"
+ mcc="214"
+ mnc="05"
+ apn="digi.mobile"
+ type="default,supl"
+ mvno_type="gid"
+ mvno_match_data="44474954"
+ />
+
<apn carrier="INTERNET GPRS"
carrier_id = "1909"
mcc="214"
@@ -2349,6 +2416,14 @@
type="mms"
/>
+ <apn carrier="DIGI Spain"
+ carrier_id="2442"
+ mcc="214"
+ mnc="22"
+ apn="internet.digimobil.es"
+ type="default,supl"
+ />
+
<apn carrier="Truphone"
carrier_id = "2143"
mcc="214"
@@ -2382,7 +2457,7 @@
password=""
port=""
proxy=""
- type="default,supl,foat,hipri"
+ type="default,supl,fota,hipri"
protocol="IPV4V6"
/>
@@ -3124,6 +3199,24 @@
mvno_match_data="ERG"
/>
+ <apn carrier="DailyTelecomWAP"
+ carrier_id = "2438"
+ mcc="222"
+ mnc="10"
+ apn="wap.dtm.it"
+ type="default,supl,dun"
+ mvno_type="spn"
+ mvno_match_data="Daily Telecom"
+ />
+
+ <apn carrier="DIGI Italy"
+ carrier_id="2443"
+ mcc="222"
+ mnc="36"
+ apn="digi.mobile"
+ type="default,supl"
+ />
+
<apn carrier="Iliad"
carrier_id = "2124"
mcc="222"
@@ -3331,6 +3424,26 @@
type="default,supl"
/>
+ <apn carrier="DIGI Spain"
+ carrier_id="2442"
+ mcc="226"
+ mnc="05"
+ apn="internet.digimobil.es"
+ type="default,supl"
+ mvno_type="gid"
+ mvno_match_data="44474553"
+ />
+
+ <apn carrier="DIGI Italy"
+ carrier_id="2443"
+ mcc="226"
+ mnc="05"
+ apn="digi.mobile"
+ type="default,supl"
+ mvno_type="gid"
+ mvno_match_data="44474954"
+ />
+
<apn carrier="Cosmote Connect Mobile"
mcc="226"
mnc="06"
@@ -4012,6 +4125,7 @@
mmsport="8799"
authtype="1"
type="default,supl,mms"
+ user_editable="false"
/>
<apn carrier="Vodafone UK Prepay"
@@ -4025,6 +4139,7 @@
mmsport="8799"
authtype="1"
type="default,supl,mms"
+ user_editable="false"
/>
<apn carrier="ASDA WAP"
@@ -4349,7 +4464,7 @@
protocol="IPV6"
roaming_protocol="IPV6"
/>
-
+
<apn carrier="Internet"
carrier_id = "2283"
mcc="234"
@@ -4665,6 +4780,16 @@
mvno_match_data="TELMORE"
/>
+ <apn carrier="GigSky"
+ carrier_id="2459"
+ mcc="238"
+ mnc="01"
+ apn="gigsky"
+ type="default"
+ mvno_type="spn"
+ mvno_match_data="GigSky"
+ />
+
<apn carrier="Telenor Internet"
carrier_id = "1464"
mcc="238"
@@ -5050,7 +5175,17 @@
protocol="IP"
roaming_protocol="IP"
mvno_type="imsi"
- mvno_match_data="24007561"
+ mvno_match_data="240075610"
+ />
+
+ <apn carrier="GigSky"
+ carrier_id="2459"
+ mcc="240"
+ mnc="07"
+ apn="gigsky"
+ type="default"
+ mvno_type="spn"
+ mvno_match_data="GigSky"
/>
<apn carrier="Telenor Mobilsurf"
@@ -6090,6 +6225,16 @@
type="mms"
/>
+ <apn carrier="VTB Mobile"
+ carrier_id = "2448"
+ mcc="250"
+ mnc="26"
+ apn="vtb"
+ user=""
+ password=""
+ type="default,supl"
+ />
+
<apn carrier="VODA internet"
carrier_id = "1029"
mcc="250"
@@ -6098,6 +6243,16 @@
type="default,supl"
/>
+ <apn carrier="Next Mobile"
+ carrier_id="2444"
+ mcc="250"
+ mnc="47"
+ apn="Next"
+ user=""
+ password=""
+ type="default,supl"
+ />
+
<apn carrier="Tinkoff Mobile"
carrier_id = "2142"
mcc="250"
@@ -6660,6 +6815,19 @@
type="mms"
/>
+ <apn carrier="MVNO DE"
+ carrier_id = "2461"
+ mcc="262"
+ mnc="03"
+ apn="internet.mvno.mobi"
+ user="mvno"
+ password="mvno"
+ authtype="1"
+ type="default,supl"
+ mvno_match_data="26203483"
+ mvno_type="imsi"
+ />
+
<apn carrier="o2 Internet"
mcc="262"
mnc="07"
@@ -6743,6 +6911,19 @@
roaming_protocol="IPV4V6"
/>
+ <apn carrier="MVNO DE"
+ carrier_id = "2461"
+ mcc="262"
+ mnc="20"
+ apn="internet.mvno.mobi"
+ user="mvno"
+ password="mvno"
+ authtype="1"
+ type="default,supl"
+ mvno_match_data="26220"
+ mvno_type="imsi"
+ />
+
<apn carrier="Truphone"
carrier_id = "2143"
mcc="262"
@@ -6959,12 +7140,12 @@
type="dun"
/>
- <apn carrier="O2 Ireland"
+ <apn carrier="3"
carrier_id = "792"
mcc="272"
mnc="02"
apn="internet"
- mmsc="http://mmsc.mms.o2.ie:8002/"
+ mmsc="http://mms.three.ie"
mmsproxy="62.40.32.40"
mmsport="8080"
type="default,supl,mms"
@@ -9518,102 +9699,25 @@
bearer_bitmask="1|2|3|9|10|11|15|16"
/>
- <apn carrier="My Multi Media"
+ <apn carrier="Carolina West Internet"
carrier_id = "1789"
mcc="310"
mnc="130"
- apn="mms.c1.ama"
- user="cell1mms"
- password="cell1"
- mmsc="http://mms.iot1.com/amarillo/mms.php"
- type="mms"
- />
-
- <apn carrier="carolinawest"
- carrier_id = "1789"
- mcc="310"
- mnc="130"
- apn="CdmaNai"
+ apn="home.cww.com"
+ type="default,supl,mms,ims,cbs"
mmsc="http://mms.cwwmms.com/cww/mms.php"
- mmsproxy="204.117.091.161"
mmsport="80"
- type="mms"
- carrier_enabled="false"
- protocol="IPV4V6"
- roaming_protocol="IPV4V6"
- bearer_bitmask="6"
+ bearer_bitmask="4|5|6|7|8|12"
/>
- <apn carrier="Carolina IMS"
+ <apn carrier="Carolina West Tethering"
carrier_id = "1789"
mcc="310"
mnc="130"
- apn="VZWIMS"
- type="ims,ia"
- protocol="IPV4V6"
- roaming_protocol="IPV4V6"
- bearer_bitmask="13"
- />
-
- <apn carrier="Carolina IMS"
- carrier_id = "1789"
- mcc="310"
- mnc="130"
- apn="VZWIMS"
- type="ims,ia"
- protocol="IPV4V6"
- roaming_protocol="IPV4V6"
- bearer_bitmask="14"
- />
-
- <apn carrier="Carolina FOTA"
- carrier_id = "1789"
- mcc="310"
- mnc="130"
- apn="VZWADMIN"
- type="fota"
- protocol="IPV4V6"
- roaming_protocol="IPV4V6"
- bearer_bitmask="13"
- />
-
- <apn carrier="Carolina FOTA"
- carrier_id = "1789"
- mcc="310"
- mnc="130"
- apn="VZWADMIN"
- type="fota"
- protocol="IPV4V6"
- roaming_protocol="IPV4V6"
- bearer_bitmask="14"
- />
-
- <apn carrier="Carolina west"
- carrier_id = "1789"
- mcc="310"
- mnc="130"
- apn="VZWINTERNET"
- mmsc="http://mms.cwwmms.com/cww/mms.php"
- mmsproxy="204.117.091.161"
- mmsport="80"
- type="default,mms,dun,supl"
- protocol="IPV4V6"
- roaming_protocol="IPV4V6"
- bearer_bitmask="13"
- />
-
- <apn carrier="Carolina west"
- carrier_id = "1789"
- mcc="310"
- mnc="130"
- apn="VZWINTERNET"
- mmsc="http://mms.cwwmms.com/cww/mms.php"
- mmsproxy="204.117.091.161"
- mmsport="80"
- type="default,mms,dun,supl"
- protocol="IPV4V6"
- roaming_protocol="IPV4V6"
- bearer_bitmask="14"
+ apn="tethering.cww.com"
+ type="dun"
+ bearer_bitmask="4|5|6|7|8|12"
+ user_editable="false"
/>
<apn carrier="internet"
@@ -10102,7 +10206,7 @@
bearer="18"
/>
- <apn carrier="Project Fi - T"
+ <apn carrier="Google Fi - T"
carrier_id = "1989"
mcc="310"
mnc="260"
@@ -10610,6 +10714,16 @@
mvno_match_data="50FF"
/>
+ <apn carrier="GigSky"
+ carrier_id="2459"
+ mcc="310"
+ mnc="380"
+ apn="gigsky"
+ type="default"
+ mvno_type="spn"
+ mvno_match_data="GigSky"
+ />
+
<apn carrier="Celloneet MMS"
carrier_id = "1188"
mcc="310"
@@ -11497,8 +11611,29 @@
apn="truphone.com"
mmsc="http://mmsc.truphone.com:1981/mm1"
type="default,supl,mms,dun"
- mvno_match_data="310690601"
- mvno_type="imsi"
+ mvno_type="gid"
+ mvno_match_data="547275554B3030656E"
+ />
+
+ <apn carrier="Truphone"
+ carrier_id = "2143"
+ mcc="310"
+ mnc="69"
+ apn="truphone.com"
+ mmsc="http://mmsc.truphone.com:1981/mm1"
+ type="default,supl,mms,dun"
+ mvno_type="gid"
+ mvno_match_data="54727555533030656E"
+ />
+
+ <apn carrier="Limitless"
+ carrier_id = "1808"
+ mcc="310"
+ mnc="690"
+ apn="limitless.us4g.com"
+ mmsc="http://mms.limitless.csky.us:6672/"
+ mmsproxy="209.4.229.79"
+ mmsport="9401"
/>
<apn carrier="Rogers Internet"
@@ -13848,29 +13983,10 @@
mcc="311"
mnc="370"
apn="mms.gci"
- proxy="209.4.229.92"
+ proxy="24.237.158.34"
port="9201"
- mmsc="http://mmsc.gci.csky.us:6672"
- mmsproxy="209.4.229.92"
- mmsport="9201"
- type="mms"
- />
-
- <apn carrier="ACS WEB"
- carrier_id = "1843"
- mcc="311"
- mnc="370"
- apn="web.acs"
- type="default,supl"
- />
-
- <apn carrier="ACS MMS"
- carrier_id = "1843"
- mcc="311"
- mnc="370"
- apn="mms.acs"
- mmsc="http://mmsc.acsalaska.net"
- mmsproxy="209.4.229.92"
+ mmsc="http://mmsc.gci.net"
+ mmsproxy="24.237.158.34"
mmsport="9201"
type="mms"
/>
@@ -15573,6 +15689,25 @@
mtu="1428"
/>
+ <apn carrier="Sprint"
+ carrier_id = "1788"
+ mcc="311"
+ mnc="882"
+ apn="internet.curiosity.sprint.com"
+ type="default"
+ protocol="IPV4V6"
+ network_type_bitmask="13"
+ />
+ <apn carrier="Sprint"
+ carrier_id = "1788"
+ mcc="311"
+ mnc="882"
+ apn="arm.ericsson.iot"
+ type="admin"
+ protocol="IPV4V6"
+ network_type_bitmask="13"
+ />
+
<apn carrier="MobileNation"
carrier_id = "2258"
mcc="311"
@@ -17282,6 +17417,15 @@
type="mms"
/>
+ <apn carrier="Wind Telecom"
+ carrier_id = "2437"
+ mcc="370"
+ mnc="05"
+ apn="smart.wind4g.com.do"
+ type="default"
+ protocol="IPV4V6"
+ />
+
<apn carrier='Haiti:Digicel:Internet'
carrier_id = "1532"
mcc='372'
@@ -17765,6 +17909,16 @@
type="default,supl"
/>
+ <apn carrier="izi"
+ carrier_id = "2436"
+ mcc="401"
+ mnc="01"
+ apn="izi.me"
+ type="default,supl"
+ mvno_type="imsi"
+ mvno_match_data="40101568"
+ />
+
<apn carrier="Kcell Internet"
carrier_id = "1589"
mcc="401"
@@ -26642,6 +26796,26 @@
type="default,supl"
/>
+ <apn carrier="楽天(rakuten.jp)"
+ carrier_id="2429"
+ mcc="440"
+ mnc="11"
+ apn="rakuten.jp"
+ type="default,supl,dun"
+ protocol="IPV4V6"
+ roaming_protocol="IPV4V6"
+ />
+
+ <apn carrier="IMS"
+ carrier_id="2429"
+ mcc="440"
+ mnc="11"
+ apn="ims"
+ type="ims"
+ protocol="IPV4V6"
+ roaming_protocol="IPV4V6"
+ />
+
<apn carrier="SBM"
carrier_id = "1894"
mcc="440"
@@ -28225,6 +28399,8 @@
mnc="01"
apn="telstra.wap"
type="default,supl"
+ protocol="IPV4"
+ roaming_protocol="IPV4"
/>
<apn carrier="Telstra MMS"
@@ -28236,16 +28412,29 @@
mmsc="http://mmsc.telstra.com:8002/"
mmsproxy="10.1.1.180"
mmsport="80"
+ protocol="IPV4"
+ roaming_protocol="IPV4"
/>
- <apn carrier="Telstra Tethering"
+ <apn carrier="Telstra Tethering"
carrier_id = "1345"
mcc="505"
mnc="01"
apn="telstra.internet"
type="dun"
- />
+ protocol="IPV4V6"
+ roaming_protocol="IPV4"
+ />
+ <apn carrier="Telstra HOS"
+ carrier_id = "1345"
+ mcc="505"
+ mnc="01"
+ apn="hos"
+ protocol="IPV4"
+ roaming_protocol="IPV4"
+ />
+
<apn carrier="Optus Yes Internet"
carrier_id = "30"
mcc="505"
@@ -28265,17 +28454,6 @@
type="mms"
/>
- <apn carrier="Truphone"
- carrier_id = "2143"
- mcc="505"
- mnc="02"
- apn="truphone.com"
- mmsc="http://mmsc.truphone.com:1981/mm1"
- type="default,supl,mms,dun"
- mvno_match_data="50502100"
- mvno_type="imsi"
- />
-
<apn carrier="Virgin Internet"
carrier_id = "2145"
mcc="505"
@@ -28339,25 +28517,6 @@
type="default,supl"
/>
- <apn carrier="Telstra MMS"
- carrier_id = "1345"
- mcc="505"
- mnc="11"
- apn="Telstra.mms"
- mmsc="http://mmsc.telstra.com:8002"
- mmsproxy="10.1.1.180"
- mmsport="80"
- type="mms"
- />
-
- <apn carrier="Telstra Internet"
- carrier_id = "1345"
- mcc="505"
- mnc="11"
- apn="Telstra.wap"
- type="default,supl"
- />
-
<apn carrier="3Internet"
carrier_id = "1351"
mcc="505"
@@ -28386,42 +28545,108 @@
type="default,supl,mms,dun"
/>
- <apn carrier="Telstra MMS"
+ <apn carrier="Telstra IMS"
carrier_id = "1345"
mcc="505"
mnc="71"
- apn="Telstra.mms"
- mmsc="http://mmsc.telstra.com:8002"
- mmsproxy="10.1.1.180"
- mmsport="80"
- type="mms"
+ apn="ims"
+ type="ims"
+ protocol="IPV4V6"
+ roaming_protocol="IPV4V6"
/>
<apn carrier="Telstra Internet"
carrier_id = "1345"
mcc="505"
mnc="71"
- apn="Telstra.wap"
+ apn="telstra.wap"
type="default,supl"
+ protocol="IPV4"
+ roaming_protocol="IPV4"
/>
<apn carrier="Telstra MMS"
carrier_id = "1345"
mcc="505"
- mnc="72"
- apn="Telstra.mms"
- mmsc="http://mmsc.telstra.com:8002"
+ mnc="71"
+ apn="telstra.mms"
+ type="mms"
+ mmsc="http://mmsc.telstra.com:8002/"
mmsproxy="10.1.1.180"
mmsport="80"
- type="mms"
+ protocol="IPV4"
+ roaming_protocol="IPV4"
+ />
+
+ <apn carrier="Telstra Tethering"
+ carrier_id = "1345"
+ mcc="505"
+ mnc="71"
+ apn="telstra.internet"
+ type="dun"
+ protocol="IPV4V6"
+ roaming_protocol="IPV4"
+ />
+
+ <apn carrier="Telstra HOS"
+ carrier_id = "1345"
+ mcc="505"
+ mnc="71"
+ apn="hos"
+ protocol="IPV4"
+ roaming_protocol="IPV4"
+ />
+
+ <apn carrier="Telstra IMS"
+ carrier_id = "1345"
+ mcc="505"
+ mnc="72"
+ apn="ims"
+ type="ims"
+ protocol="IPV4V6"
+ roaming_protocol="IPV4V6"
/>
<apn carrier="Telstra Internet"
carrier_id = "1345"
mcc="505"
mnc="72"
- apn="Telstra.wap"
+ apn="telstra.wap"
type="default,supl"
+ protocol="IPV4"
+ roaming_protocol="IPV4"
+ />
+
+ <apn carrier="Telstra MMS"
+ carrier_id = "1345"
+ mcc="505"
+ mnc="72"
+ apn="telstra.mms"
+ type="mms"
+ mmsc="http://mmsc.telstra.com:8002/"
+ mmsproxy="10.1.1.180"
+ mmsport="80"
+ protocol="IPV4"
+ roaming_protocol="IPV4"
+ />
+
+ <apn carrier="Telstra Tethering"
+ carrier_id = "1345"
+ mcc="505"
+ mnc="72"
+ apn="telstra.internet"
+ type="dun"
+ protocol="IPV4V6"
+ roaming_protocol="IPV4"
+ />
+
+ <apn carrier="Telstra HOS"
+ carrier_id = "1345"
+ mcc="505"
+ mnc="72"
+ apn="hos"
+ protocol="IPV4"
+ roaming_protocol="IPV4"
/>
<apn carrier="VF AU PXT"
@@ -31058,7 +31283,7 @@
/>
<apn carrier="safaricom GPRS"
- carrier_id = "2376"
+ carrier_id = "865"
mcc="639"
mnc="02"
apn="safaricom"
@@ -31071,7 +31296,7 @@
/>
<apn carrier="safaricom mms"
- carrier_id = "2376"
+ carrier_id = "865"
mcc="639"
mnc="02"
apn="safaricom"
@@ -32813,7 +33038,7 @@
user="tim"
password="tim"
mmsc="http://mms.tim.br"
- mmsproxy="200.179.66.242"
+ mmsproxy="189.40.191.96"
mmsport="8080"
authtype="1"
protocol="IPV4V6"
@@ -32828,7 +33053,7 @@
user="tim"
password="tim"
mmsc="http://mms.tim.br"
- mmsproxy="200.179.66.242"
+ mmsproxy="189.40.191.96"
mmsport="8080"
authtype="1"
protocol="IPV4V6"
@@ -32843,7 +33068,7 @@
user="tim"
password="tim"
mmsc="http://mms.tim.br"
- mmsproxy="200.179.66.242"
+ mmsproxy="189.40.191.96"
mmsport="8080"
authtype="1"
protocol="IPV4V6"
@@ -34786,5 +35011,70 @@
type="mms"
/>
+ <apn carrier="Altan"
+ carrier_id = "2469"
+ mcc="334"
+ mnc="140"
+ apn="internet.altan"
+ type="default"
+ user=""
+ password=""
+ mvno_type="spn"
+ mvno_match_data="ALTAN"
+ />
+
+ <apn carrier="Altan"
+ carrier_id = "2469"
+ mcc="334"
+ mnc="140"
+ apn="ims"
+ type="ims"
+ user=""
+ password=""
+ mvno_type="spn"
+ mvno_match_data="ALTAN"
+ />
+
+ <apn carrier="IENTC"
+ carrier_id = "2470"
+ mcc="334"
+ mnc="140"
+ apn="internet.ientc.com"
+ type="default"
+ user=""
+ password=""
+ mvno_type="spn"
+ mvno_match_data="IENTC"
+ />
+
+ <apn carrier="NeWWW"
+ carrier_id = "2471"
+ mcc="334"
+ mnc="140"
+ apn="internet.newww.com"
+ type="default"
+ user=""
+ password=""
+ mvno_type="spn"
+ mvno_match_data="NeWWW"
+ />
+
+ <apn carrier="NeWWW"
+ carrier_id = "2471"
+ mcc="334"
+ mnc="140"
+ apn="ims"
+ type="ims"
+ user=""
+ password=""
+ mvno_type="spn"
+ mvno_match_data="NeWWW"
+ />
+
+ <apn carrier="travelfy"
+ carrier_id="2472"
+ apn="travelfy"
+ type="default,supl"
+ />
</apns>
diff --git a/frameworks/PlatformLibrary/jni/Android.mk b/frameworks/PlatformLibrary/jni/Android.mk
index 2b91f05..bd7ede0 100644
--- a/frameworks/PlatformLibrary/jni/Android.mk
+++ b/frameworks/PlatformLibrary/jni/Android.mk
@@ -40,8 +40,8 @@
LOCAL_STATIC_LIBRARIES :=
# Also need the JNI headers.
-LOCAL_C_INCLUDES += \
- $(JNI_H_INCLUDE)
+LOCAL_HEADER_LIBRARIES := \
+ jni_headers
LOCAL_CFLAGS += -Wall -Werror
