Skip to content

Commit 23ecb2c

Browse files
John HuangAndroid Git Automerger
John Huang
authored and
Android Git Automerger
committed
am 4c259f3: am 3e6a9f0: Merge "Fix tethering APNs" into jb-dev
* commit '4c259f3d7bfc635de89386bb72df8529dcaeee6a': Fix tethering APNs
2 parents 94169a9 + 4c259f3 commit 23ecb2c

File tree

11 files changed

+384
-1
lines changed

11 files changed

+384
-1
lines changed

‎core/res/res/values-mcc208-mnc01/config.xml‎

Lines changed: 38 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,38 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<!--
3+
/*
4+
** Copyright 2009, The Android Open Source Project
5+
**
6+
** Licensed under the Apache License, Version 2.0 (the "License");
7+
** you may not use this file except in compliance with the License.
8+
** You may obtain a copy of the License at
9+
**
10+
** http://www.apache.org/licenses/LICENSE-2.0
11+
**
12+
** Unless required by applicable law or agreed to in writing, software
13+
** distributed under the License is distributed on an "AS IS" BASIS,
14+
** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
15+
** See the License for the specific language governing permissions and
16+
** limitations under the License.
17+
*/
18+
-->
19+
20+
<!-- These resources are around just to allow their values to be customized
21+
for different hardware and product builds. Do not translate. -->
22+
<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
23+
<!-- Array of ConnectivityManager.TYPE_xxxx values allowable for tethering -->
24+
<!-- Common options are [1, 4] for TYPE_WIFI and TYPE_MOBILE_DUN or
25+
<!== [0,1,5,7] for TYPE_MOBILE, TYPE_WIFI, TYPE_MOBILE_HIPRI and TYPE_BLUETOOTH -->
26+
<integer-array translatable="false" name="config_tether_upstream_types">
27+
<item>1</item>
28+
<item>4</item>
29+
<item>7</item>
30+
<item>9</item>
31+
</integer-array>
32+
33+
<!-- String containing the apn value for tethering. May be overriden by secure settings
34+
TETHER_DUN_APN. Value is a comma separated series of strings:
35+
"name,apn,proxy,port,username,password,server,mmsc,mmsproxy,mmsport,mcc,mnc,auth,type"
36+
note that empty fields can be ommitted: "name,apn,,,,,,,,,310,260,,DUN" -->
37+
<string translatable="false" name="config_tether_apndata">Orange Internet,orange.fr,,,,,,orange,orange,,208,01,,DUN</string>
38+
</resources>

‎core/res/res/values-mcc214-mnc03/config.xml‎

Lines changed: 38 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,38 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<!--
3+
/*
4+
** Copyright 2009, The Android Open Source Project
5+
**
6+
** Licensed under the Apache License, Version 2.0 (the "License");
7+
** you may not use this file except in compliance with the License.
8+
** You may obtain a copy of the License at
9+
**
10+
** http://www.apache.org/licenses/LICENSE-2.0
11+
**
12+
** Unless required by applicable law or agreed to in writing, software
13+
** distributed under the License is distributed on an "AS IS" BASIS,
14+
** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
15+
** See the License for the specific language governing permissions and
16+
** limitations under the License.
17+
*/
18+
-->
19+
20+
<!-- These resources are around just to allow their values to be customized
21+
for different hardware and product builds. Do not translate. -->
22+
<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
23+
<!-- Array of ConnectivityManager.TYPE_xxxx values allowable for tethering -->
24+
<!-- Common options are [1, 4] for TYPE_WIFI and TYPE_MOBILE_DUN or
25+
<!== [0,1,5,7] for TYPE_MOBILE, TYPE_WIFI, TYPE_MOBILE_HIPRI and TYPE_BLUETOOTH -->
26+
<integer-array translatable="false" name="config_tether_upstream_types">
27+
<item>1</item>
28+
<item>4</item>
29+
<item>7</item>
30+
<item>9</item>
31+
</integer-array>
32+
33+
<!-- String containing the apn value for tethering. May be overriden by secure settings
34+
TETHER_DUN_APN. Value is a comma separated series of strings:
35+
"name,apn,proxy,port,username,password,server,mmsc,mmsproxy,mmsport,mcc,mnc,auth,type"
36+
note that empty fields can be ommitted: "name,apn,,,,,,,,,310,260,,DUN" -->
37+
<string translatable="false" name="config_tether_apndata">Orange Internet PC,internet,,,,,,orange,orange,,214,03,,DUN</string>
38+
</resources>

‎core/res/res/values-mcc214-mnc07/config.xml‎

Lines changed: 38 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,38 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<!--
3+
/*
4+
** Copyright 2009, The Android Open Source Project
5+
**
6+
** Licensed under the Apache License, Version 2.0 (the "License");
7+
** you may not use this file except in compliance with the License.
8+
** You may obtain a copy of the License at
9+
**
10+
** http://www.apache.org/licenses/LICENSE-2.0
11+
**
12+
** Unless required by applicable law or agreed to in writing, software
13+
** distributed under the License is distributed on an "AS IS" BASIS,
14+
** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
15+
** See the License for the specific language governing permissions and
16+
** limitations under the License.
17+
*/
18+
-->
19+
20+
<!-- These resources are around just to allow their values to be customized
21+
for different hardware and product builds. Do not translate. -->
22+
<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
23+
<!-- Array of ConnectivityManager.TYPE_xxxx values allowable for tethering -->
24+
<!-- Common options are [1, 4] for TYPE_WIFI and TYPE_MOBILE_DUN or
25+
<!== [0,1,5,7] for TYPE_MOBILE, TYPE_WIFI, TYPE_MOBILE_HIPRI and TYPE_BLUETOOTH -->
26+
<integer-array translatable="false" name="config_tether_upstream_types">
27+
<item>1</item>
28+
<item>4</item>
29+
<item>7</item>
30+
<item>9</item>
31+
</integer-array>
32+
33+
<!-- String containing the apn value for tethering. May be overriden by secure settings
34+
TETHER_DUN_APN. Value is a comma separated series of strings:
35+
"name,apn,proxy,port,username,password,server,mmsc,mmsproxy,mmsport,mcc,mnc,auth,type"
36+
note that empty fields can be ommitted: "name,apn,,,,,,,,,310,260,,DUN" -->
37+
<string translatable="false" name="config_tether_apndata">Conexión compartida,movistar.es,,,,,,MOVISTAR,MOVISTAR,,214,07,,DUN</string>
38+
</resources>

‎core/res/res/values-mcc222-mnc01/config.xml‎

Lines changed: 38 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,38 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<!--
3+
/*
4+
** Copyright 2009, The Android Open Source Project
5+
**
6+
** Licensed under the Apache License, Version 2.0 (the "License");
7+
** you may not use this file except in compliance with the License.
8+
** You may obtain a copy of the License at
9+
**
10+
** http://www.apache.org/licenses/LICENSE-2.0
11+
**
12+
** Unless required by applicable law or agreed to in writing, software
13+
** distributed under the License is distributed on an "AS IS" BASIS,
14+
** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
15+
** See the License for the specific language governing permissions and
16+
** limitations under the License.
17+
*/
18+
-->
19+
20+
<!-- These resources are around just to allow their values to be customized
21+
for different hardware and product builds. Do not translate. -->
22+
<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
23+
<!-- Array of ConnectivityManager.TYPE_xxxx values allowable for tethering -->
24+
<!-- Common options are [1, 4] for TYPE_WIFI and TYPE_MOBILE_DUN or
25+
<!== [0,1,5,7] for TYPE_MOBILE, TYPE_WIFI, TYPE_MOBILE_HIPRI and TYPE_BLUETOOTH -->
26+
<integer-array translatable="false" name="config_tether_upstream_types">
27+
<item>1</item>
28+
<item>4</item>
29+
<item>7</item>
30+
<item>9</item>
31+
</integer-array>
32+
33+
<!-- String containing the apn value for tethering. May be overriden by secure settings
34+
TETHER_DUN_APN. Value is a comma separated series of strings:
35+
"name,apn,proxy,port,username,password,server,mmsc,mmsproxy,mmsport,mcc,mnc,auth,type"
36+
note that empty fields can be ommitted: "name,apn,,,,,,,,,310,260,,DUN" -->
37+
<string translatable="false" name="config_tether_apndata">TIM WEB,ibox.tim.it,,,,,,,,,222,01,,DUN</string>
38+
</resources>

‎core/res/res/values-mcc222-mnc10/config.xml‎

Lines changed: 38 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,38 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<!--
3+
/*
4+
** Copyright 2009, The Android Open Source Project
5+
**
6+
** Licensed under the Apache License, Version 2.0 (the "License");
7+
** you may not use this file except in compliance with the License.
8+
** You may obtain a copy of the License at
9+
**
10+
** http://www.apache.org/licenses/LICENSE-2.0
11+
**
12+
** Unless required by applicable law or agreed to in writing, software
13+
** distributed under the License is distributed on an "AS IS" BASIS,
14+
** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
15+
** See the License for the specific language governing permissions and
16+
** limitations under the License.
17+
*/
18+
-->
19+
20+
<!-- These resources are around just to allow their values to be customized
21+
for different hardware and product builds. Do not translate. -->
22+
<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
23+
<!-- Array of ConnectivityManager.TYPE_xxxx values allowable for tethering -->
24+
<!-- Common options are [1, 4] for TYPE_WIFI and TYPE_MOBILE_DUN or
25+
<!== [0,1,5,7] for TYPE_MOBILE, TYPE_WIFI, TYPE_MOBILE_HIPRI and TYPE_BLUETOOTH -->
26+
<integer-array translatable="false" name="config_tether_upstream_types">
27+
<item>1</item>
28+
<item>4</item>
29+
<item>7</item>
30+
<item>9</item>
31+
</integer-array>
32+
33+
<!-- String containing the apn value for tethering. May be overriden by secure settings
34+
TETHER_DUN_APN. Value is a comma separated series of strings:
35+
"name,apn,proxy,port,username,password,server,mmsc,mmsproxy,mmsport,mcc,mnc,auth,type"
36+
note that empty fields can be ommitted: "name,apn,,,,,,,,,310,260,,DUN" -->
37+
<string translatable="false" name="config_tether_apndata">Tethering Internet,web.omnitel.it,,,,,,,,,222,10,,DUN</string>
38+
</resources>

‎core/res/res/values-mcc234-mnc33/config.xml‎

Lines changed: 38 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,38 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<!--
3+
/*
4+
** Copyright 2009, The Android Open Source Project
5+
**
6+
** Licensed under the Apache License, Version 2.0 (the "License");
7+
** you may not use this file except in compliance with the License.
8+
** You may obtain a copy of the License at
9+
**
10+
** http://www.apache.org/licenses/LICENSE-2.0
11+
**
12+
** Unless required by applicable law or agreed to in writing, software
13+
** distributed under the License is distributed on an "AS IS" BASIS,
14+
** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
15+
** See the License for the specific language governing permissions and
16+
** limitations under the License.
17+
*/
18+
-->
19+
20+
<!-- These resources are around just to allow their values to be customized
21+
for different hardware and product builds. Do not translate. -->
22+
<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
23+
<!-- Array of ConnectivityManager.TYPE_xxxx values allowable for tethering -->
24+
<!-- Common options are [1, 4] for TYPE_WIFI and TYPE_MOBILE_DUN or
25+
<!== [0,1,5,7] for TYPE_MOBILE, TYPE_WIFI, TYPE_MOBILE_HIPRI and TYPE_BLUETOOTH -->
26+
<integer-array translatable="false" name="config_tether_upstream_types">
27+
<item>1</item>
28+
<item>4</item>
29+
<item>7</item>
30+
<item>9</item>
31+
</integer-array>
32+
33+
<!-- String containing the apn value for tethering. May be overriden by secure settings
34+
TETHER_DUN_APN. Value is a comma separated series of strings:
35+
"name,apn,proxy,port,username,password,server,mmsc,mmsproxy,mmsport,mcc,mnc,auth,type"
36+
note that empty fields can be ommitted: "name,apn,,,,,,,,,310,260,,DUN" -->
37+
<string translatable="false" name="config_tether_apndata">Consumer Broadband,consumerbroadband,,,,,,,,,234,33,,DUN</string>
38+
</resources>

‎core/res/res/values-mcc302-mnc370/config.xml‎

Lines changed: 38 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,38 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<!--
3+
/*
4+
** Copyright 2009, The Android Open Source Project
5+
**
6+
** Licensed under the Apache License, Version 2.0 (the "License");
7+
** you may not use this file except in compliance with the License.
8+
** You may obtain a copy of the License at
9+
**
10+
** http://www.apache.org/licenses/LICENSE-2.0
11+
**
12+
** Unless required by applicable law or agreed to in writing, software
13+
** distributed under the License is distributed on an "AS IS" BASIS,
14+
** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
15+
** See the License for the specific language governing permissions and
16+
** limitations under the License.
17+
*/
18+
-->
19+
20+
<!-- These resources are around just to allow their values to be customized
21+
for different hardware and product builds. Do not translate. -->
22+
<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
23+
<!-- Array of ConnectivityManager.TYPE_xxxx values allowable for tethering -->
24+
<!-- Common options are [1, 4] for TYPE_WIFI and TYPE_MOBILE_DUN or
25+
<!== [0,1,5,7] for TYPE_MOBILE, TYPE_WIFI, TYPE_MOBILE_HIPRI and TYPE_BLUETOOTH -->
26+
<integer-array translatable="false" name="config_tether_upstream_types">
27+
<item>1</item>
28+
<item>4</item>
29+
<item>7</item>
30+
<item>9</item>
31+
</integer-array>
32+
33+
<!-- String containing the apn value for tethering. May be overriden by secure settings
34+
TETHER_DUN_APN. Value is a comma separated series of strings:
35+
"name,apn,proxy,port,username,password,server,mmsc,mmsproxy,mmsport,mcc,mnc,auth,type"
36+
note that empty fields can be ommitted: "name,apn,,,,,,,,,310,260,,DUN" -->
37+
<string translatable="false" name="config_tether_apndata">Fido Tethering,isp.fido.apn,,,,,,,,,302,370,,DUN</string>
38+
</resources>

‎core/res/res/values-mcc302-mnc660/config.xml‎

Lines changed: 38 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,38 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<!--
3+
/*
4+
** Copyright 2009, The Android Open Source Project
5+
**
6+
** Licensed under the Apache License, Version 2.0 (the "License");
7+
** you may not use this file except in compliance with the License.
8+
** You may obtain a copy of the License at
9+
**
10+
** http://www.apache.org/licenses/LICENSE-2.0
11+
**
12+
** Unless required by applicable law or agreed to in writing, software
13+
** distributed under the License is distributed on an "AS IS" BASIS,
14+
** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
15+
** See the License for the specific language governing permissions and
16+
** limitations under the License.
17+
*/
18+
-->
19+
20+
<!-- These resources are around just to allow their values to be customized
21+
for different hardware and product builds. Do not translate. -->
22+
<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
23+
<!-- Array of ConnectivityManager.TYPE_xxxx values allowable for tethering -->
24+
<!-- Common options are [1, 4] for TYPE_WIFI and TYPE_MOBILE_DUN or
25+
<!== [0,1,5,7] for TYPE_MOBILE, TYPE_WIFI, TYPE_MOBILE_HIPRI and TYPE_BLUETOOTH -->
26+
<integer-array translatable="false" name="config_tether_upstream_types">
27+
<item>1</item>
28+
<item>4</item>
29+
<item>7</item>
30+
<item>9</item>
31+
</integer-array>
32+
33+
<!-- String containing the apn value for tethering. May be overriden by secure settings
34+
TETHER_DUN_APN. Value is a comma separated series of strings:
35+
"name,apn,proxy,port,username,password,server,mmsc,mmsproxy,mmsport,mcc,mnc,auth,type"
36+
note that empty fields can be ommitted: "name,apn,,,,,,,,,310,260,,DUN" -->
37+
<string translatable="false" name="config_tether_apndata">MTS -Tethering,internet.mts,,,,,,,,,302,660,,DUN</string>
38+
</resources>

‎core/res/res/values-mcc302-mnc720/config.xml‎

Lines changed: 38 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,38 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<!--
3+
/*
4+
** Copyright 2009, The Android Open Source Project
5+
**
6+
** Licensed under the Apache License, Version 2.0 (the "License");
7+
** you may not use this file except in compliance with the License.
8+
** You may obtain a copy of the License at
9+
**
10+
** http://www.apache.org/licenses/LICENSE-2.0
11+
**
12+
** Unless required by applicable law or agreed to in writing, software
13+
** distributed under the License is distributed on an "AS IS" BASIS,
14+
** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
15+
** See the License for the specific language governing permissions and
16+
** limitations under the License.
17+
*/
18+
-->
19+
20+
<!-- These resources are around just to allow their values to be customized
21+
for different hardware and product builds. Do not translate. -->
22+
<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
23+
<!-- Array of ConnectivityManager.TYPE_xxxx values allowable for tethering -->
24+
<!-- Common options are [1, 4] for TYPE_WIFI and TYPE_MOBILE_DUN or
25+
<!== [0,1,5,7] for TYPE_MOBILE, TYPE_WIFI, TYPE_MOBILE_HIPRI and TYPE_BLUETOOTH -->
26+
<integer-array translatable="false" name="config_tether_upstream_types">
27+
<item>1</item>
28+
<item>4</item>
29+
<item>7</item>
30+
<item>9</item>
31+
</integer-array>
32+
33+
<!-- String containing the apn value for tethering. May be overriden by secure settings
34+
TETHER_DUN_APN. Value is a comma separated series of strings:
35+
"name,apn,proxy,port,username,password,server,mmsc,mmsproxy,mmsport,mcc,mnc,auth,type"
36+
note that empty fields can be ommitted: "name,apn,,,,,,,,,310,260,,DUN" -->
37+
<string translatable="false" name="config_tether_apndata">Rogers Tethering,isp.apn,,,,,,,,,302,720,,DUN</string>
38+
</resources>

‎core/res/res/values-mcc340-mnc01/config.xml‎

Lines changed: 38 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,38 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<!--
3+
/*
4+
** Copyright 2009, The Android Open Source Project
5+
**
6+
** Licensed under the Apache License, Version 2.0 (the "License");
7+
** you may not use this file except in compliance with the License.
8+
** You may obtain a copy of the License at
9+
**
10+
** http://www.apache.org/licenses/LICENSE-2.0
11+
**
12+
** Unless required by applicable law or agreed to in writing, software
13+
** distributed under the License is distributed on an "AS IS" BASIS,
14+
** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
15+
** See the License for the specific language governing permissions and
16+
** limitations under the License.
17+
*/
18+
-->
19+
20+
<!-- These resources are around just to allow their values to be customized
21+
for different hardware and product builds. Do not translate. -->
22+
<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
23+
<!-- Array of ConnectivityManager.TYPE_xxxx values allowable for tethering -->
24+
<!-- Common options are [1, 4] for TYPE_WIFI and TYPE_MOBILE_DUN or
25+
<!== [0,1,5,7] for TYPE_MOBILE, TYPE_WIFI, TYPE_MOBILE_HIPRI and TYPE_BLUETOOTH -->
26+
<integer-array translatable="false" name="config_tether_upstream_types">
27+
<item>1</item>
28+
<item>4</item>
29+
<item>7</item>
30+
<item>9</item>
31+
</integer-array>
32+
33+
<!-- String containing the apn value for tethering. May be overriden by secure settings
34+
TETHER_DUN_APN. Value is a comma separated series of strings:
35+
"name,apn,proxy,port,username,password,server,mmsc,mmsproxy,mmsport,mcc,mnc,auth,type"
36+
note that empty fields can be ommitted: "name,apn,,,,,,,,,310,260,,DUN" -->
37+
<string translatable="false" name="config_tether_apndata">Orangeweb,orangeweb,,,,,,orange,orange,,340,01,1,DUN</string>
38+
</resources>

0 commit comments

Comments
 (0)