summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSafayat Ullah <safayat@google.com>2023-02-14 07:25:41 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2023-02-14 07:25:41 +0000
commit973cf5fc6b8c9836712ab77b97fd27c7daede4b7 (patch)
treef305caff256ce70939c6486c93bc2bc8d594f7da
parent741a492eb09af1a4040cbd871344f386a2564fbf (diff)
parent3a0f5dc7a0c74d3e24344e8b6ee9b7268489339f (diff)
Revert "sepolicy/vibrator: Update sepolicy to support adaptive haptics property" am: 92818aad00 am: d253769f66 am: 3a0f5dc7a0
Original change: https://android-review.googlesource.com/c/platform/hardware/google/pixel-sepolicy/+/2434912 Change-Id: I4d76bf4542346a7283550d24dfba13be4b1046aa Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
-rw-r--r--vibrator/common/property_contexts3
-rw-r--r--vibrator/cs40l26/hal_vibrator_default.te3
-rw-r--r--vibrator/cs40l26/vendor_init.te1
3 files changed, 1 insertions, 6 deletions
diff --git a/vibrator/common/property_contexts b/vibrator/common/property_contexts
index 089a357..64a2600 100644
--- a/vibrator/common/property_contexts
+++ b/vibrator/common/property_contexts
@@ -1,2 +1 @@
-ro.vendor.vibrator.hal. u:object_r:vendor_vibrator_prop:s0
-persist.vendor.vibrator.hal. u:object_r:vendor_vibrator_prop:s0
+ro.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 060c484..478bee9 100644
--- a/vibrator/cs40l26/hal_vibrator_default.te
+++ b/vibrator/cs40l26/hal_vibrator_default.te
@@ -15,8 +15,5 @@ r_dir_file(hal_vibrator_default, persist_haptics_file)
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 da5a9d6..417a40c 100644
--- a/vibrator/cs40l26/vendor_init.te
+++ b/vibrator/cs40l26/vendor_init.te
@@ -1,2 +1 @@
set_prop(vendor_init, vendor_vibrator_prop)
-get_prop(vendor_init, adaptive_haptics_prop)