Merge remote-tracking branch 'cros/upstream' into 'cros/master'
BUG=none
TEST=xmllint --valid --noout serviceproviders.xml
TEST=Run unit tests
diff --git a/serviceproviders.xml b/serviceproviders.xml
index beddee1..a2808ab 100644
--- a/serviceproviders.xml
+++ b/serviceproviders.xml
@@ -217,6 +217,18 @@
</gsm>
</provider>
<provider>
+ <name>Personal</name>
+ <gsm>
+ <network-id mcc="722" mnc="34"/>
+ <apn value="datos.personal.com">
+ <plan type="postpaid"/>
+ <usage type="internet"/>
+ <username>datos</username>
+ <password>datos</password>
+ </apn>
+ </gsm>
+ </provider>
+ <provider>
<name>Arnet</name>
<gsm>
<network-id mcc="722" mnc="340"/>
@@ -1761,6 +1773,11 @@
<gsm>
<network-id mcc="302" mnc="500"/>
<network-id mcc="302" mnc="510"/>
+ <apn value="media.videotron">
+ <plan type="postpaid"/>
+ <usage type="internet"/>
+ <name>Telephony data</name>
+ </apn>
<apn value="ihvm.videotron">
<plan type="postpaid"/>
<usage type="internet"/>
@@ -3239,9 +3256,15 @@
<name>Pepephone</name>
<gsm>
<network-id mcc="214" mnc="06"/>
- <apn value="gprs.pepephone.com" >
+ <apn value="gprs.pepephone.com">
<plan type="postpaid"/>
<usage type="internet"/>
+ <name>Pepephone</name>
+ </apn>
+ <apn value="gprsmov.pepephone.com">
+ <plan type="postpaid"/>
+ <usage type="internet"/>
+ <name>Pepephone (Mobile)</name>
</apn>
</gsm>
</provider>
@@ -3472,6 +3495,36 @@
</gsm>
</provider>
<provider>
+ <name>Dna</name>
+ <gsm>
+ <network-id mcc="244" mnc="04"/>
+ <apn value="internet">
+ <usage type="internet"/>
+ <name>dna internet</name>
+ </apn>
+ </gsm>
+ </provider>
+ <provider>
+ <name>Dna</name>
+ <gsm>
+ <network-id mcc="244" mnc="12"/>
+ <apn value="internet">
+ <usage type="internet"/>
+ <name>dna internet</name>
+ </apn>
+ </gsm>
+ </provider>
+ <provider>
+ <name>Dna</name>
+ <gsm>
+ <network-id mcc="244" mnc="13"/>
+ <apn value="internet">
+ <usage type="internet"/>
+ <name>dna internet</name>
+ </apn>
+ </gsm>
+ </provider>
+ <provider>
<name>Elisa</name>
<gsm>
<network-id mcc="244" mnc="05"/>
@@ -6237,7 +6290,14 @@
</cdma>
</provider>
<provider>
- <name>LGTelecom</name>
+ <name>LGUPlus</name>
+ <gsm>
+ <network-id mcc="450" mnc="06"/>
+ <apn value="internet.lguplus.co.kr">
+ <plan type="postpaid"/>
+ <usage type="internet"/>
+ </apn>
+ </gsm>
<cdma>
<!-- cid: "109" -->
<!--
@@ -11148,6 +11208,17 @@
<sid value="3102"/>
</cdma>
</provider>
+ <provider>
+ <!-- MVNO operating on AT&T's network -->
+ <name>Straight Talk</name>
+ <gsm>
+ <network-id mcc="310" mnc="410"/>
+ <apn value="att.mvno">
+ <plan type="prepaid"/>
+ <usage type="internet"/>
+ </apn>
+ </gsm>
+ </provider>
</country>
<!-- Uruguay -->