Merge cherrypicks of [2947060, 2947061, 2947062, 2947063, 2946091, 2946092, 2946093, 2946094, 2947008, 2947209, 2947064, 2947065, 2947066, 2947067, 2947068, 2947229, 2947230, 2947231, 2947232, 2947233, 2947234, 2947249, 2945563, 2945564, 2945565, 2945566, 2946975, 2946526, 2945567, 2946527, 2947100, 2947101, 2947102, 2946528, 2947210, 2945568, 2947105, 2947250] into oc-dr3-release
Change-Id: If84ac59ce65a918c8cb5edb38b65c60591327f9b
diff --git a/device.mk b/device.mk
index 1b3ee7d..4466c6d 100755
--- a/device.mk
+++ b/device.mk
@@ -605,3 +605,7 @@
# Preopt SystemUI
PRODUCT_DEXPREOPT_SPEED_APPS += \
SystemUIGoogle
+
+# audio effects config
+PRODUCT_PROPERTY_OVERRIDES += \
+ fmas.hdph_sgain=0
diff --git a/sepolicy/vendor/hal_camera_default.te b/sepolicy/vendor/hal_camera_default.te
index 27ae92b..92d7527 100644
--- a/sepolicy/vendor/hal_camera_default.te
+++ b/sepolicy/vendor/hal_camera_default.te
@@ -11,8 +11,9 @@
binder_call(hal_camera_default, system_server)
binder_call(hal_camera_default, hal_graphics_allocator)
-# For interfacing with PowerHAL
+# For interfacing with PowerHAL and ThermalHAL
hal_client_domain(hal_camera_default, hal_power)
+hal_client_domain(hal_camera_default, hal_thermal)
# For camera team debugging
userdebug_or_eng(`
