merge in jb-mr1-factory-release history after reset to jb-mr1-dev
diff --git a/conn_init/Android.mk b/conn_init/Android.mk
index 77886cf..6108f5d 100644
--- a/conn_init/Android.mk
+++ b/conn_init/Android.mk
@@ -45,6 +45,9 @@
LOCAL_MODULE_PATH := $(TARGET_OUT)/bin
LOCAL_MODULE := conn_init
LOCAL_MODULE_OWNER := lge
+
+# Make sure the symlinks get created as well.
+LOCAL_REQUIRED_MODULES := WCNSS_qcom_cfg.ini WCNSS_qcom_wlan_nv.bin
include $(BUILD_EXECUTABLE)
include $(CLEAR_VARS)
diff --git a/overlay/packages/apps/Mms/res/xml-mcc310-mnc026/mms_config.xml b/overlay/packages/apps/Mms/res/xml-mcc310-mnc026/mms_config.xml
index 9e3a502..52560b6 100644
--- a/overlay/packages/apps/Mms/res/xml-mcc310-mnc026/mms_config.xml
+++ b/overlay/packages/apps/Mms/res/xml-mcc310-mnc026/mms_config.xml
@@ -25,4 +25,10 @@
<!-- Maximum width for an attached image -->
<int name="maxImageWidth">2592</int>
+
+ <!-- User-Agent parameter used in MMS http request -->
+ <string name="userAgent">Nexus</string>
+
+ <!-- UAProf URL -->
+ <string name="uaProfUrl">http://www.google.com/oha/rdf/ua-profile-kila.xml</string>
</mms_config>
diff --git a/overlay/packages/apps/Mms/res/xml-mcc310-mnc090/mms_config.xml b/overlay/packages/apps/Mms/res/xml-mcc310-mnc090/mms_config.xml
index cd06a5c..61ee738 100755
--- a/overlay/packages/apps/Mms/res/xml-mcc310-mnc090/mms_config.xml
+++ b/overlay/packages/apps/Mms/res/xml-mcc310-mnc090/mms_config.xml
@@ -25,4 +25,10 @@
<!-- Maximum width for an attached image -->
<int name="maxImageWidth">1296</int>
+
+ <!-- User-Agent parameter used in MMS http request -->
+ <string name="userAgent">Nexus</string>
+
+ <!-- UAProf URL -->
+ <string name="uaProfUrl">http://www.google.com/oha/rdf/ua-profile-kila.xml</string>
</mms_config>
diff --git a/overlay/packages/apps/Mms/res/xml-mcc310-mnc170/mms_config.xml b/overlay/packages/apps/Mms/res/xml-mcc310-mnc170/mms_config.xml
index 3804d52..d45d7fb 100644
--- a/overlay/packages/apps/Mms/res/xml-mcc310-mnc170/mms_config.xml
+++ b/overlay/packages/apps/Mms/res/xml-mcc310-mnc170/mms_config.xml
@@ -25,4 +25,10 @@
<!-- Maximum width for an attached image -->
<int name="maxImageWidth">2592</int>
+
+ <!-- User-Agent parameter used in MMS http request -->
+ <string name="userAgent">Nexus</string>
+
+ <!-- UAProf URL -->
+ <string name="uaProfUrl">http://www.google.com/oha/rdf/ua-profile-kila.xml</string>
</mms_config>
diff --git a/overlay/packages/apps/Mms/res/xml-mcc310-mnc260/mms_config.xml b/overlay/packages/apps/Mms/res/xml-mcc310-mnc260/mms_config.xml
index 74fa032..75e378e 100644
--- a/overlay/packages/apps/Mms/res/xml-mcc310-mnc260/mms_config.xml
+++ b/overlay/packages/apps/Mms/res/xml-mcc310-mnc260/mms_config.xml
@@ -25,4 +25,10 @@
<!-- Maximum width for an attached image -->
<int name="maxImageWidth">2592</int>
+
+ <!-- User-Agent parameter used in MMS http request -->
+ <string name="userAgent">Nexus</string>
+
+ <!-- UAProf URL -->
+ <string name="uaProfUrl">http://www.google.com/oha/rdf/ua-profile-kila.xml</string>
</mms_config>
diff --git a/overlay/packages/apps/Mms/res/xml-mcc310-mnc380/mms_config.xml b/overlay/packages/apps/Mms/res/xml-mcc310-mnc380/mms_config.xml
index 0464de5..a884d3f 100755
--- a/overlay/packages/apps/Mms/res/xml-mcc310-mnc380/mms_config.xml
+++ b/overlay/packages/apps/Mms/res/xml-mcc310-mnc380/mms_config.xml
@@ -30,4 +30,10 @@
<!-- Maximum width for an attached image -->
<int name="maxImageWidth">1296</int>
+
+ <!-- User-Agent parameter used in MMS http request -->
+ <string name="userAgent">Nexus</string>
+
+ <!-- UAProf URL -->
+ <string name="uaProfUrl">http://www.google.com/oha/rdf/ua-profile-kila.xml</string>
</mms_config>
diff --git a/overlay/packages/apps/Mms/res/xml-mcc310-mnc410/mms_config.xml b/overlay/packages/apps/Mms/res/xml-mcc310-mnc410/mms_config.xml
index c49fa48..5d96915 100755
--- a/overlay/packages/apps/Mms/res/xml-mcc310-mnc410/mms_config.xml
+++ b/overlay/packages/apps/Mms/res/xml-mcc310-mnc410/mms_config.xml
@@ -25,4 +25,10 @@
<!-- Maximum width for an attached image -->
<int name="maxImageWidth">1296</int>
+
+ <!-- User-Agent parameter used in MMS http request -->
+ <string name="userAgent">Nexus</string>
+
+ <!-- UAProf URL -->
+ <string name="uaProfUrl">http://www.google.com/oha/rdf/ua-profile-kila.xml</string>
</mms_config>
diff --git a/overlay/packages/apps/Mms/res/xml-mcc310-mnc490/mms_config.xml b/overlay/packages/apps/Mms/res/xml-mcc310-mnc490/mms_config.xml
index 879be0a..9a6fe92 100644
--- a/overlay/packages/apps/Mms/res/xml-mcc310-mnc490/mms_config.xml
+++ b/overlay/packages/apps/Mms/res/xml-mcc310-mnc490/mms_config.xml
@@ -25,4 +25,10 @@
<!-- Maximum width for an attached image -->
<int name="maxImageWidth">2592</int>
+
+ <!-- User-Agent parameter used in MMS http request -->
+ <string name="userAgent">Nexus</string>
+
+ <!-- UAProf URL -->
+ <string name="uaProfUrl">http://www.google.com/oha/rdf/ua-profile-kila.xml</string>
</mms_config>
diff --git a/overlay/packages/apps/Mms/res/xml-mcc310-mnc560/mms_config.xml b/overlay/packages/apps/Mms/res/xml-mcc310-mnc560/mms_config.xml
index f6ffbdf..3cb5424 100755
--- a/overlay/packages/apps/Mms/res/xml-mcc310-mnc560/mms_config.xml
+++ b/overlay/packages/apps/Mms/res/xml-mcc310-mnc560/mms_config.xml
@@ -25,4 +25,10 @@
<!-- Maximum width for an attached image -->
<int name="maxImageWidth">1296</int>
+
+ <!-- User-Agent parameter used in MMS http request -->
+ <string name="userAgent">Nexus</string>
+
+ <!-- UAProf URL -->
+ <string name="uaProfUrl">http://www.google.com/oha/rdf/ua-profile-kila.xml</string>
</mms_config>
diff --git a/overlay/packages/apps/Mms/res/xml-mcc310-mnc680/mms_config.xml b/overlay/packages/apps/Mms/res/xml-mcc310-mnc680/mms_config.xml
index f433da7..55e9bb7 100755
--- a/overlay/packages/apps/Mms/res/xml-mcc310-mnc680/mms_config.xml
+++ b/overlay/packages/apps/Mms/res/xml-mcc310-mnc680/mms_config.xml
@@ -25,4 +25,10 @@
<!-- Maximum width for an attached image -->
<int name="maxImageWidth">1296</int>
+
+ <!-- User-Agent parameter used in MMS http request -->
+ <string name="userAgent">Nexus</string>
+
+ <!-- UAProf URL -->
+ <string name="uaProfUrl">http://www.google.com/oha/rdf/ua-profile-kila.xml</string>
</mms_config>
diff --git a/overlay/packages/apps/Mms/res/xml/mms_config.xml b/overlay/packages/apps/Mms/res/xml/mms_config.xml
index e0b3391..0335c1a 100644
--- a/overlay/packages/apps/Mms/res/xml/mms_config.xml
+++ b/overlay/packages/apps/Mms/res/xml/mms_config.xml
@@ -50,6 +50,9 @@
set the limit above this value. -->
<int name="maxMessageCountPerThread">5000</int>
+ <!-- UAProf URL -->
+ <string name="uaProfUrl">http://www.google.com/oha/rdf/ua-profile-kila.xml</string>
+
<!-- Maximum number of recipients allowed per message. Use a value of -1
to indicate no limit. -->
<int name="recipientLimit">-1</int>
@@ -62,4 +65,8 @@
<!-- Maximum length for message text. Use a value of -1
to indicate default value -->
<int name="maxMessageTextSize">-1</int>
+
+ <!-- User-Agent parameter used in MMS http request -->
+ <string name="userAgent">Nexus</string>
+
</mms_config>
diff --git a/thermald-mako.conf b/thermald-mako.conf
index c9eb78f..68e240a 100644
--- a/thermald-mako.conf
+++ b/thermald-mako.conf
@@ -54,32 +54,33 @@
thresholds 60 120
thresholds_clr 57 115
actions none shutdown
-action_info 0 5000
+action_info 0 5000
[tsens_tz_sensor8]
sampling 5000
thresholds 60 120
thresholds_clr 57 115
actions none shutdown
-action_info 0 5000
+action_info 0 5000
[tsens_tz_sensor9]
sampling 5000
thresholds 60 120
thresholds_clr 57 115
actions none shutdown
-action_info 0 5000
+action_info 0 5000
[tsens_tz_sensor10]
sampling 5000
thresholds 60 120
thresholds_clr 57 115
actions none shutdown
-action_info 0 5000
+action_info 0 5000
[batt_therm]
sampling 5000
-thresholds 360 370 390 410
-thresholds_clr 350 365 380 400
-actions cpu+gpu cpu+gpu cpu+gpu cpu+gpu
-action_info 1512000+400000000 1296000+325000000 1188000+200000000 1188000+200000000
+thresholds 360 370 380 390 410 420 450
+thresholds_clr 350 360 370 380 400 410 440
+actions cpu+gpu+lcd+battery cpu+gpu+lcd+battery cpu+gpu+lcd+battery cpu+gpu+lcd+battery cpu+gpu+lcd+battery cpu+gpu+lcd+battery cpu+gpu+lcd+battery
+action_info 1512000+400000000+248+0 1296000+325000000+228+0 1296000+325000000+208+0 1188000+200000000+195+1 1188000+200000000+195+1 1188000+200000000+195+2 1188000+200000000+195+3
+