merge in jb-mr2-zeroday-release history after reset to jb-mr2-dev
diff --git a/overlay/frameworks/base/core/res/res/values/config.xml b/overlay/frameworks/base/core/res/res/values/config.xml
index c849fcd..07b10bd 100644
--- a/overlay/frameworks/base/core/res/res/values/config.xml
+++ b/overlay/frameworks/base/core/res/res/values/config.xml
@@ -145,9 +145,7 @@
<!-- Common options are [1, 4] for TYPE_WIFI and TYPE_MOBILE_DUN or
[0,1,5,7] for TYPE_MOBILE, TYPE_WIFI, TYPE_MOBILE_HIPRI and TYPE_BLUETOOTH -->
<integer-array translatable="false" name="config_tether_upstream_types">
- <item>0</item>
<item>1</item>
- <item>5</item>
<item>7</item>
</integer-array>
@@ -174,14 +172,6 @@
<!-- the 6th element indicates boot-time dependency-met value. -->
<string-array translatable="false" name="networkAttributes">
<item>"wifi,1,1,1,-1,true"</item>
- <item>"mobile,0,0,0,-1,true"</item>
- <item>"mobile_mms,2,0,2,60000,true"</item>
- <item>"mobile_supl,3,0,2,60000,true"</item>
- <item>"mobile_dun,4,0,2,60000,true"</item>
- <item>"mobile_hipri,5,0,3,60000,true"</item>
- <item>"mobile_fota,10,0,2,60000,true"</item>
- <item>"mobile_ims,11,0,2,60000,true"</item>
- <item>"mobile_cbs,12,0,2,60000,true"</item>
<item>"bluetooth,7,7,2,-1,true"</item>
</string-array>
@@ -198,7 +188,6 @@
[# simultaneous connection types]" -->
<string-array translatable="false" name="radioAttributes">
<item>"1,1"</item>
- <item>"0,1"</item>
<item>"7,1"</item>
</string-array>
@@ -224,7 +213,7 @@
<bool translatable="false" name="skip_restoring_network_selection">true</bool>
<!-- Set to true to add links to Cell Broadcast app from Settings and MMS app. -->
- <bool name="config_cellBroadcastAppLinks">true</bool>
+ <bool name="config_cellBroadcastAppLinks">false</bool>
<!-- Shutdown if the battery temperature exceeds (this value * 0.1) Celsius. -->
<integer name="config_shutdownBatteryTemperature">600</integer>
diff --git a/ueventd.flo.rc b/ueventd.flo.rc
index 84f6c3e..ccf03d5 100644
--- a/ueventd.flo.rc
+++ b/ueventd.flo.rc
@@ -36,7 +36,7 @@
/dev/msm_dsps 0600 system system
/dev/bcm2079x-i2c 0660 nfc nfc
/dev/qseecom 0660 system drmrpc
-/dev/diag 0660 system system
+/dev/diag 0660 radio radio
/dev/mdm 0660 system radio
/dev/gss 0660 system gps
/dev/ks_hsic_bridge 0660 system system