Merge tag android-5.1.0_r1 into AOSP_5.1_MERGE
Change-Id: Ica49bad80ca239d82933b7f0843d824724e514b1
diff --git a/init.deb.rc b/init.deb.rc
index 2f308e7..304dbe9 100644
--- a/init.deb.rc
+++ b/init.deb.rc
@@ -443,7 +443,7 @@
group camera system inet input
service wcnss_init /system/bin/sh /system/etc/init.flo.wifi.sh
- class main
+ class late_start
user system
group system wifi
seclabel u:r:conn_init:s0
diff --git a/overlay/frameworks/base/core/res/res/values-mcc208-mnc01/config.xml b/overlay/frameworks/base/core/res/res/values-mcc208-mnc01/config.xml
index 760fdf9..b77196b 100644
--- a/overlay/frameworks/base/core/res/res/values-mcc208-mnc01/config.xml
+++ b/overlay/frameworks/base/core/res/res/values-mcc208-mnc01/config.xml
@@ -33,6 +33,8 @@
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"
note that empty fields can be ommitted: "name,apn,,,,,,,,,310,260,,DUN" -->
- <string translatable="false" name="config_tether_apndata">Orange Internet,orange.fr,,,orange,orange,,,,,208,01,,DUN"</string>
+ <string-array translatable="false" name="config_tether_apndata">
+ <item>Orange Internet,orange.fr,,,orange,orange,,,,,208,01,,DUN"</item>
+ </string-array>
</resources>
diff --git a/overlay/frameworks/base/core/res/res/values-mcc214-mnc01/config.xml b/overlay/frameworks/base/core/res/res/values-mcc214-mnc01/config.xml
index a38a544..e5d677a 100644
--- a/overlay/frameworks/base/core/res/res/values-mcc214-mnc01/config.xml
+++ b/overlay/frameworks/base/core/res/res/values-mcc214-mnc01/config.xml
@@ -33,6 +33,8 @@
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"
note that empty fields can be ommitted: "name,apn,,,,,,,,,310,260,,DUN" -->
- <string translatable="false" name="config_tether_apndata">INTERNET,airtelnet.es,,,vodafone,vodafone,,,,,214,01,,DUN"</string>
+ <string-array translatable="false" name="config_tether_apndata">
+ <item>INTERNET,airtelnet.es,,,vodafone,vodafone,,,,,214,01,,DUN"</item>
+ </string-array>
</resources>
diff --git a/overlay/frameworks/base/core/res/res/values-mcc214-mnc03/config.xml b/overlay/frameworks/base/core/res/res/values-mcc214-mnc03/config.xml
index 68acd06..d07f257 100644
--- a/overlay/frameworks/base/core/res/res/values-mcc214-mnc03/config.xml
+++ b/overlay/frameworks/base/core/res/res/values-mcc214-mnc03/config.xml
@@ -33,6 +33,8 @@
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"
note that empty fields can be ommitted: "name,apn,,,,,,,,,310,260,,DUN" -->
- <string translatable="false" name="config_tether_apndata">Orange Internet PC,internet,,,orange,orange,,,,,214,03,,DUN"</string>
+ <string-array translatable="false" name="config_tether_apndata">
+ <item>Orange Internet PC,internet,,,orange,orange,,,,,214,03,,DUN"</item>
+ </string-array>
</resources>