merge in jb-mr1-release history after reset to jb-mr1-dev
diff --git a/bluetooth/bdroid_buildcfg.h b/bluetooth/bdroid_buildcfg.h
index cba2fd7..ed417ed 100644
--- a/bluetooth/bdroid_buildcfg.h
+++ b/bluetooth/bdroid_buildcfg.h
@@ -17,7 +17,7 @@
#ifndef _BDROID_BUILDCFG_H
#define _BDROID_BUILDCFG_H
-#define BTM_DEF_LOCAL_NAME "Nexus"
+#define BTM_DEF_LOCAL_NAME "Nexus 4"
#define BTA_DISABLE_DELAY 1000 /* in milliseconds */
#endif
diff --git a/overlay/frameworks/base/core/res/res/values/config.xml b/overlay/frameworks/base/core/res/res/values/config.xml
index 88f593b..f7b8c3b 100644
--- a/overlay/frameworks/base/core/res/res/values/config.xml
+++ b/overlay/frameworks/base/core/res/res/values/config.xml
@@ -228,7 +228,7 @@
</string-array>
<!-- reference volume index for music stream to limit headphone volume and display warning -->
- <integer name="config_safe_media_volume_index">8</integer>
+ <integer name="config_safe_media_volume_index">7</integer>
<bool name="config_enableWifiDisplay">true</bool>
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 52560b6..9e3a502 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,10 +25,4 @@
<!-- 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 61ee738..cd06a5c 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,10 +25,4 @@
<!-- 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 d45d7fb..3804d52 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,10 +25,4 @@
<!-- 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 75e378e..74fa032 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,10 +25,4 @@
<!-- 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 a884d3f..0464de5 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,10 +30,4 @@
<!-- 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 5d96915..c49fa48 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,10 +25,4 @@
<!-- 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 9a6fe92..879be0a 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,10 +25,4 @@
<!-- 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 3cb5424..f6ffbdf 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,10 +25,4 @@
<!-- 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 55e9bb7..f433da7 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,10 +25,4 @@
<!-- 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 0335c1a..e0b3391 100644
--- a/overlay/packages/apps/Mms/res/xml/mms_config.xml
+++ b/overlay/packages/apps/Mms/res/xml/mms_config.xml
@@ -50,9 +50,6 @@
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>
@@ -65,8 +62,4 @@
<!-- 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>
