Merge "Shamu: NFC: Remove UICC support." into mnc-dev
diff --git a/bluetooth/BCM4356A2_001.003.015.0064.0173_ORC.hcd b/bluetooth/BCM4356A2_001.003.015.0064.0173_ORC.hcd
new file mode 100644
index 0000000..89d19da
--- /dev/null
+++ b/bluetooth/BCM4356A2_001.003.015.0064.0173_ORC.hcd
Binary files differ
diff --git a/bluetooth/BCM4356A2_001.003.015.0068.0182_ORC.hcd b/bluetooth/BCM4356A2_001.003.015.0068.0182_ORC.hcd
new file mode 100644
index 0000000..930fa4a
--- /dev/null
+++ b/bluetooth/BCM4356A2_001.003.015.0068.0182_ORC.hcd
Binary files differ
diff --git a/device.mk b/device.mk
index a3b940b..b7f3c02 100644
--- a/device.mk
+++ b/device.mk
@@ -103,7 +103,7 @@
# BT FW
PRODUCT_COPY_FILES += \
- device/moto/shamu/bluetooth/BCM4356A2_001.003.015.0054.0155_ORC.hcd:$(TARGET_COPY_OUT_VENDOR)/firmware/bcm4354A2.hcd
+ device/moto/shamu/bluetooth/BCM4356A2_001.003.015.0068.0182_ORC.hcd:$(TARGET_COPY_OUT_VENDOR)/firmware/bcm4354A2.hcd
# For SPN display
PRODUCT_COPY_FILES += \
diff --git a/sepolicy/perfprofd.te b/sepolicy/perfprofd.te
new file mode 100644
index 0000000..4296d4d
--- /dev/null
+++ b/sepolicy/perfprofd.te
@@ -0,0 +1,6 @@
+userdebug_or_eng(`
+ # perfprofd disables mpdecision temporarily via setprop ctl.stop,
+ # then re-enables afterwards with setprop ctl.start
+ allow perfprofd ctl_mpdecision:property_service set;
+ unix_socket_connect(perfprofd, property, init)
+')
diff --git a/sepolicy/property.te b/sepolicy/property.te
index 07b30c7..96db1b6 100644
--- a/sepolicy/property.te
+++ b/sepolicy/property.te
@@ -1,2 +1,3 @@
type qcom_ims_prop, property_type;
type qcom_netmgrd_prop, property_type;
+ type ctl_mpdecision, property_type;
diff --git a/sepolicy/property_contexts b/sepolicy/property_contexts
index d7d0d0f..d5cb855 100644
--- a/sepolicy/property_contexts
+++ b/sepolicy/property_contexts
@@ -1,2 +1,3 @@
sys.ims. u:object_r:qcom_ims_prop:s0
net.r_rmnet u:object_r:qcom_netmgrd_prop:s0
+ctl.mpdecision u:object_r:ctl_mpdecision:s0
