commit 37a2e29fdcaad9d7e15818708146f3b4fb8efe29
author Robert Greenwalt <rgreenwalt@google.com> Thu Dec 21 23:08:08 2017 +0000
committer android-build-merger <android-build-merger@google.com> Thu Dec 21 23:08:08 2017 +0000
tree 9385df62a6bc914af5bc327a2cfdaee945b42025
parent 4f7f6a314d3cfda82ec67cea1b173a6fca318d6f
parent 9bd6c558ab0b18b5e5ff26d9e44b414c5bec5396

Merge "Corrected APNs for Telenor SE." am: 84a3313ecf am: 43c76c3d47
am: 9bd6c558ab

Change-Id: Ic22e55f23105aa9b7ecd6428fe6fc11f3eb49910

etc/apns-full-conf.xml

diff --git a/etc/apns-full-conf.xml b/etc/apns-full-conf.xml
index 1d0306c..47b14bf 100644
--- a/etc/apns-full-conf.xml
+++ b/etc/apns-full-conf.xml
@@ -2549,14 +2549,12 @@
       type="mms"
   />
 
-  <apn carrier="Telenor WAP"
+  <apn carrier="Telenor internet"
       mcc="220"
       mnc="01"
       apn="internet"
       user="telenor"
       password="gprs"
-      proxy="217.65.192.33"
-      port="8080"
       authtype="1"
       type="default,supl"
   />
@@ -4531,18 +4529,6 @@
       type="default,supl,mms"
   />
 
-  <apn carrier="Telenor SE"
-      mcc="240"
-      mnc="04"
-      apn="services.telenor.se"
-      mmsc="http://mms"
-      mmsproxy="172.30.253.241"
-      mmsport="8799"
-      type="default,supl,mms"
-      mvno_match_data="Telenor SE"
-      mvno_type="spn"
-  />
-
   <apn carrier="Tele2 Internet"
       mcc="240"
       mnc="05"
@@ -4627,23 +4613,19 @@
       mvno_type="spn"
   />
 
-  <apn carrier="Telenor Mobilsurf"
-      mcc="240"
-      mnc="06"
-      apn="services.telenor.se"
-      proxy="173.30.253.241"
-      port="8799"
-      type="default,supl"
+  <apn carrier="Internet"
+       mcc="240"
+       mnc="06"
+       apn="internet"
+       type="default,supl"
   />
 
-  <apn carrier="Telenor MMS"
-      mcc="240"
-      mnc="06"
-      apn="services.telenor.se"
-      mmsc="http://mms"
-      mmsproxy="173.30.253.241"
-      mmsport="8799"
-      type="mms"
+  <apn carrier="MMS"
+       mcc="240"
+       mnc="06"
+       apn="mms"
+       mmsc="http://mms.media"
+       type="mms"
   />
 
   <apn carrier="Tele2 Internet"
@@ -4704,14 +4686,21 @@
       mvno_type="imsi"
   />
 
-  <apn carrier="Telenor SE"
+  <apn carrier="Telenor Mobilsurf"
       mcc="240"
       mnc="08"
       apn="services.telenor.se"
+      type="default,supl"
+  />
+
+  <apn carrier="Telenor MMS"
+      mcc="240"
+      mnc="08"
+      apn="mms"
       mmsc="http://mms"
       mmsproxy="172.30.253.241"
       mmsport="8799"
-      type="default,supl,mms"
+      type="mms"
   />
 
   <apn carrier="Com4"
@@ -4799,18 +4788,6 @@
       mvno_type="spn"
   />
 
-  <apn carrier="Telenor SE"
-      mcc="240"
-      mnc="24"
-      apn="services.telenor.se"
-      mmsc="http://mms"
-      mmsproxy="172.30.253.241"
-      mmsport="8799"
-      type="default,supl,mms"
-      mvno_match_data="Telenor SE"
-      mvno_type="spn"
-  />
-
   <apn carrier="Ventelo Internett"
       mcc="242"
       mnc="01"
@@ -6730,9 +6707,7 @@
       mcc="284"
       mnc="05"
       apn="telenorbg"
-      authtype="1"
-      proxy="192.168.88.11"
-      port="8004"
+      authtype="0"
       type="default,supl"
   />