hammerhead: Update apn for some operators

- delete apns of Tele2 (208-01)
- add ia type with null apn for Coriolis (208 10+12)
- update protocol type of default apn (244-12 and -03)
- update mvno value of Tele2 Estonia (248-03)
- update username and password of TELEMACH (293-70+29370029xxxxxxx)
- modify apn profile name of HOT mobile (425-07)
- delete apns of SUN Streaming. Because "SUN Internet" and SUN Streaming has same apn value , only SUN Streaming is listed. But  SUN Internet should be high priority.
- delete dun profile of 722-34 and  added in config.xml

bug:22616704

Change-Id: I2f018c5892eec0ef3846b12f13c5f05e5e21cd19

2 files changed, 64 insertions, 50 deletions

diff --git a/apns-full-conf.xml b/apns-full-conf.xml
index 53dee3f..908ca73 100644
--- a/apns-full-conf.xml
+++ b/apns-full-conf.xml
@@ -1467,27 +1467,6 @@
       mvno_type="gid"
   />
 
-  <apn carrier="Tele2 WAP"
-      mcc="208"
-      mnc="01"
-      apn="ofnew.fr"
-      user="orange"
-      password="orange"
-      type="default,supl"
-  />
-
-  <apn carrier="Tele2 MMS"
-      mcc="208"
-      mnc="01"
-      apn="orange.acte"
-      user="orange"
-      password="orange"
-      mmsc="http://mms.orange.fr"
-      mmsproxy="192.168.10.200"
-      mmsport="8080"
-      type="mms"
-  />
-
   <apn carrier="SFR webphone"
       mcc="208"
       mnc="09"
@@ -1610,6 +1589,15 @@
   <apn carrier="Coriolis WAP"
       mcc="208"
       mnc="10"
+      apn=""
+      type="ia"
+      mvno_match_data="12"
+      mvno_type="gid"
+  />
+
+  <apn carrier="Coriolis WAP"
+      mcc="208"
+      mnc="10"
       apn="fnetcoriolis"
       type="default,supl"
       mvno_match_data="12"
@@ -5063,6 +5051,8 @@
       mnc="03"
       apn="internet"
       type="default,supl"
+      protocol="IPV4V6"
+      roaming_protocol="IPV4"
   />
 
   <apn carrier="DNA MMS"
@@ -5156,6 +5146,8 @@
       mnc="12"
       apn="internet"
       type="default,supl"
+      protocol="IPV4V6"
+      roaming_protocol="IPV4"
   />
 
   <apn carrier="DNA MMS"
@@ -5727,8 +5719,6 @@
       mnc="03"
       apn="internet.tele2.ee"
       type="default,supl"
-      mvno_match_data="24803005x"
-      mvno_type="imsi"
   />
 
   <apn carrier="Tele2 MMS"
@@ -5739,8 +5729,6 @@
       mmsproxy="193.12.40.6"
       mmsport="8080"
       type="mms"
-      mvno_match_data="24803005x"
-      mvno_type="imsi"
   />
 
   <apn carrier="Smart/Ultra MMS"
@@ -5751,8 +5739,6 @@
       mmsproxy="193.12.40.6"
       mmsport="8080"
       type="mms"
-      mvno_match_data="24803005x"
-      mvno_type="imsi"
   />
 
   <apn carrier="Tele2 Internet"
@@ -5760,8 +5746,8 @@
       mnc="03"
       apn="internet.tele2.ee"
       type="default,supl"
-      mvno_match_data="24803000x"
-      mvno_type="imsi"
+      mvno_match_data="Tele2"
+      mvno_type="spn"
   />
 
   <apn carrier="Smart/Ultra MMS"
@@ -5772,8 +5758,8 @@
       mmsproxy="193.12.40.6"
       mmsport="8080"
       type="mms"
-      mvno_match_data="24803000x"
-      mvno_type="imsi"
+      mvno_match_data="Tele2"
+      mvno_type="spn"
   />
 
   <apn carrier="MTS Internet"
@@ -6940,6 +6926,8 @@
       mcc="293"
       mnc="70"
       apn="telemach.net"
+      user="telemach"
+      password="internet"
       mmsc="http://mms.telemach.net:8002"
       mmsproxy="91.185.221.85"
       mmsport="8080"
@@ -26385,14 +26373,14 @@
       type="mms"
   />
 
-  <apn carrier="Internet HOT mobile"
+  <apn carrier="HOT mobile Internet"
       mcc="425"
       mnc="07"
       apn="net.hotm"
       type="default,supl"
   />
 
-  <apn carrier="MMS HOT mobile"
+  <apn carrier="HOT mobile MMS"
       mcc="425"
       mnc="07"
       apn="mms.hotm"
@@ -28779,13 +28767,6 @@
       type="default,supl"
   />
 
-  <apn carrier="Sun Streaming"
-      mcc="515"
-      mnc="05"
-      apn="minternet"
-      type="default,supl"
-  />
-
   <apn carrier="SUN MMS"
       mcc="515"
       mnc="05"
@@ -32326,16 +32307,6 @@
       type="default,supl"
   />
 
-  <apn carrier="Argentina:Personal:DUN"
-      mcc="722"
-      mnc="34"
-      apn="internet.personal.com"
-      type="dun"
-      user="internet"
-      password="internet"
-      authtype="0"
-  />
-
   <apn carrier="Personal MMS"
       mcc="722"
       mnc="34"
diff --git a/overlay/frameworks/base/core/res/res/values-mcc722-mnc34/config.xml b/overlay/frameworks/base/core/res/res/values-mcc722-mnc34/config.xml
new file mode 100644
index 0000000..bb1e49f
--- /dev/null
+++ b/overlay/frameworks/base/core/res/res/values-mcc722-mnc34/config.xml
@@ -0,0 +1,43 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+/*
+** Copyright 2015, The Android Open Source Project
+**
+** Licensed under the Apache License, Version 2.0 (the "License");
+** you may not use this file except in compliance with the License.
+** You my obtain a copy of the License at
+**
+**     http://www.apache.org/licenses/LICENSE-2.0
+**
+** Unless required by applicable law or agreed to in writing, software
+** distributed under the License is distributed on an "AS IS" BASIS,
+** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+** See the License for the specific language governing permissions and
+** limitations under the License.
+*/
+-->
+
+<!-- These resources are around just to allow their values to be customized
+     for different hardware and product builds. -->
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+
+    <!-- Array of ConnectivityManager.TYPE_xxxx values allowable for tethering -->
+    <!-- Common options are [1, 4] for TYPE_WIFI and TYPE_MOBILE_DUN or
+    <!== [0,1,5,7] for TYPE_MOBILE, TYPE_WIFI, TYPE_MOBILE_HIPRI and TYPE_BLUETOOTH -->
+    <integer-array translatable="false" name="config_tether_upstream_types">
+      <item>1</item>
+      <item>4</item>
+      <item>7</item>
+      <item>9</item>
+    </integer-array>
+
+    <!-- String containing the apn value for tethering.  May be overriden by secure settings
+         TETHER_DUN_APN.  Value is a comma separated series of strings:
+         "name,apn,proxy,port,username,password,server,mmsc,mmsproxy,mmsport,mcc,mnc,auth,type",
+         Or string format of ApnSettingV3.
+         note that empty fields can be ommitted: "name,apn,,,,,,,,,310,270,,DUN" -->
+    <string-array translatable="false" name="config_tether_apndata">
+        <item>Personal Internet Movil,internet.personal.com,,,internet,internet,,,,,722,34,1,DUN</item>
+    </string-array>
+</resources>
+