am d2a7204b: am b87949fd: am 0f6953ee: Merge "DO NOT MERGE Adding Softbank APN for SIM unlocked device for jb-mr1.1-dev" into jb-mr1.1-dev

* commit 'd2a7204b010d92038fd1d0ca91348acc1875b9ab':
  DO NOT MERGE Adding Softbank APN for SIM unlocked device for jb-mr1.1-dev
diff --git a/etc/apns-conf_verizon.xml b/etc/apns-conf_verizon.xml
index 3d35816..77d6aa7 100644
--- a/etc/apns-conf_verizon.xml
+++ b/etc/apns-conf_verizon.xml
@@ -46,6 +46,44 @@
         roaming_protocol="IPV4V6"
     />
 
+    <!-- VZW CDMA -->
+    <apn carrier="LTE - Verizon Internet"
+        mcc="311"
+        mnc="480"
+        apn="VZWINTERNET"
+        type="default,dun"
+        protocol="IPV4V6"
+        roaming_protocol="IPV4V6"
+        bearer="6"
+    />
+    <apn carrier="LTE - Verizon Internet"
+        mcc="311"
+        mnc="480"
+        apn="VZWINTERNET"
+        type="default,dun"
+        protocol="IPV4V6"
+        roaming_protocol="IPV4V6"
+        bearer="7"
+    />
+    <apn carrier="LTE - Verizon Internet"
+        mcc="311"
+        mnc="480"
+        apn="VZWINTERNET"
+        type="default,dun"
+        protocol="IPV4V6"
+        roaming_protocol="IPV4V6"
+        bearer="8"
+    />
+    <apn carrier="LTE - Verizon Internet"
+        mcc="311"
+        mnc="480"
+        apn="VZWINTERNET"
+        type="default,dun"
+        protocol="IPV4V6"
+        roaming_protocol="IPV4V6"
+        bearer="12"
+    />
+
     <!-- Modify Apn database for VZW LTE support -->
     <apn carrier="LTE - Verizon Internet"
         mcc="311"
diff --git a/etc/apns-full-conf.xml b/etc/apns-full-conf.xml
index 2cf3734..080e735 100755
--- a/etc/apns-full-conf.xml
+++ b/etc/apns-full-conf.xml
@@ -1952,6 +1952,29 @@
       type="default,supl,mms"
   />
 
+  <apn carrier="Internet"
+      mcc="234"
+      mnc="30"
+      apn="everywhere"
+      user="eesecure"
+      password="secure"
+      authtype="1"
+      type="default,supl"
+  />
+
+  <apn carrier="MMS"
+      mcc="234"
+      mnc="30"
+      apn="eezone"
+      user="eesecure"
+      password="secure"
+      mmsc="http://mms/"
+      mmsproxy="149.254.201.135"
+      mmsport="8080"
+      authtype="1"
+      type="mms"
+  />
+
   <apn carrier="T-Mobile UK"
       mcc="234"
       mnc="30"
@@ -2017,6 +2040,29 @@
       type="mms"
   />
 
+  <apn carrier="Internet"
+      mcc="234"
+      mnc="33"
+      apn="everywhere"
+      user="eesecure"
+      password="secure"
+      authtype="1"
+      type="default,supl"
+  />
+
+  <apn carrier="MMS"
+      mcc="234"
+      mnc="33"
+      apn="eezone"
+      user="eesecure"
+      password="secure"
+      mmsc="http://mms/"
+      mmsproxy="149.254.201.135"
+      mmsport="8080"
+      authtype="1"
+      type="mms"
+  />
+
   <apn carrier="Orange Internet"
       mcc="234"
       mnc="33"
@@ -3463,14 +3509,12 @@
       type="mms"
   />
 
-    <apn carrier="Vivacom WAP"
+  <apn carrier="VIVACOM Internet"
       mcc="284"
       mnc="03"
-      apn="wap.vivacom.bg"
-      user="wap"
-      password="wap"
-      proxy="192.168.123.123"
-      port="8080"
+      apn="internet.vivacom.bg"
+      user="vivacom"
+      password="vivacom"
       type="default,supl"
   />
 
@@ -3742,14 +3786,22 @@
       mcc="302"
       mnc="220"
       apn="sp.koodo.com"
-      proxy="74.49.0.18"
-      port="80"
       mmsc="http://aliasredirect.net/proxy/koodo/mmsc"
       mmsproxy="74.49.0.18"
       mmsport="80"
       type="default,supl,mms"
   />
 
+  <apn carrier="PC Mobile"
+      mcc="302"
+      mnc="220"
+      apn="sp.mb.com"
+      mmsc="http://aliasredirect.net/proxy/mb/mmsc"
+      mmsproxy="74.49.0.18"
+      mmsport="80"
+      type="default,supl,mms"
+  />
+
   <apn carrier="MOWAP"
       mcc="302"
       mnc="320"
@@ -4095,6 +4147,15 @@
       type="mms"
   />
 
+  <apn carrier="ATT Phone"
+      mcc="310"
+      mnc="410"
+      apn="phone"
+      mmsc="http://mmsc.mobile.att.net"
+      mmsproxy="proxy.mobile.att.net"
+      type="default,supl,mms"
+  />
+
   <apn carrier="ATT WAP"
       mcc="310"
       mnc="410"
@@ -4107,6 +4168,31 @@
       type="default,supl,mms"
   />
 
+  <apn carrier="TracFone"
+      mcc="310"
+      mnc="410"
+      apn="tfdata"
+      mmsc="http://mms-tf.net"
+      mmsproxy="mms3.tracfone.com"
+      type="default,supl,mms"
+  />
+
+  <apn carrier="TracFone"
+      mcc="310"
+      mnc="260"
+      apn="wap.tracfone"
+      mmsc="http://mms.tracfone.com"
+      type="default,supl,mms"
+  />
+
+  <apn carrier="TracFone"
+      mcc="310"
+      mnc="260"
+      apn="simple"
+      mmsc="http://smpl.mms.msg.eng.t-mobile.com/mms/wapenc"
+      type="default,supl,mms"
+  />
+
   <apn carrier="CBW Data"
       mcc="310"
       mnc="420"
@@ -12260,33 +12346,79 @@
   />
 
   <!-- APNs for Japanese phone carriers -->
-  <apn carrier="spモード"
+
+  <apn carrier="mopera U"
       mcc="440"
       mnc="10"
-      apn="spmode.ne.jp"
+      apn="mopera.net"
       user=""
       server=""
       password=""
       mmsc=""
   />
 
-  <apn carrier="mopera U(スマートフォン定額)"
+  <apn carrier="b-mobile 3G・4G 1GB/Fair"
       mcc="440"
       mnc="10"
-      apn="mpr2.bizho.net"
-      user=""
+      apn="bmobile.ne.jp"
+      user="bmobile@fr"
       server=""
-      password=""
+      password="bmobile"
+      authtype="3"
+      mmsc=""
+   />
+
+  <apn carrier="b-mobile 3G・4G U300"
+      mcc="440"
+      mnc="10"
+      apn="bmobile.ne.jp"
+      user="bmobile@u300"
+      server=""
+      password="bmobile"
+      authtype="3"
       mmsc=""
   />
 
-  <apn carrier="mopera U設定"
+  <apn carrier="b-mobile スマホ電話"
       mcc="440"
       mnc="10"
-      apn="0120.mopera.net"
-      user=""
+      apn="bmobile.ne.jp"
+      user="bmobile@spd"
       server=""
-      password=""
+      password="bmobile"
+      authtype="3"
+      mmsc=""
+  />
+
+  <apn carrier="b-mobile 4G カメレオンSIM"
+      mcc="440"
+      mnc="10"
+      apn="bmobile.ne.jp"
+      user="bmobile@cm"
+      server=""
+      password="bmobile"
+      authtype="3"
+      mmsc=""
+  />
+
+  <apn carrier="IIJmio"
+      mcc="440"
+      mnc="10"
+      apn="iijmio.jp"
+      user="mio@iij"
+      server=""
+      password="iij"
+      authtype="3"
+      mmsc=""
+  />
+
+  <apn carrier="plus.softbank"
+      mcc="440"
+      mnc="20"
+      apn="plus.softbank"
+      user="plus"
+      server=""
+      password="softbank"
       mmsc=""
   />