Merge "Revert^2 "sepolicy/vibrator: Update sepolicy to support adaptive haptics property""
diff --git a/vibrator/common/property_contexts b/vibrator/common/property_contexts
index 64a2600..089a357 100644
--- a/vibrator/common/property_contexts
+++ b/vibrator/common/property_contexts
@@ -1 +1,2 @@
-ro.vendor.vibrator.hal. u:object_r:vendor_vibrator_prop:s0
+ro.vendor.vibrator.hal. u:object_r:vendor_vibrator_prop:s0
+persist.vendor.vibrator.hal. u:object_r:vendor_vibrator_prop:s0
diff --git a/vibrator/cs40l26/hal_vibrator_default.te b/vibrator/cs40l26/hal_vibrator_default.te
index 4fafe8a..c61cefe 100644
--- a/vibrator/cs40l26/hal_vibrator_default.te
+++ b/vibrator/cs40l26/hal_vibrator_default.te
@@ -15,6 +15,9 @@
get_prop(hal_vibrator_default, vendor_vibrator_prop);
+# Allow Vibrator HAL to communicate with daemon via socket
+unix_socket_connect(hal_vibrator_default, chre, chre);
+
# Allow vibrator HAL's default implementation to use vendor-binder service
vndbinder_use(hal_vibrator_default);
diff --git a/vibrator/cs40l26/vendor_init.te b/vibrator/cs40l26/vendor_init.te
index 417a40c..da5a9d6 100644
--- a/vibrator/cs40l26/vendor_init.te
+++ b/vibrator/cs40l26/vendor_init.te
@@ -1 +1,2 @@
set_prop(vendor_init, vendor_vibrator_prop)
+get_prop(vendor_init, adaptive_haptics_prop)