diff options
| author | Treehugger Robot <treehugger-gerrit@google.com> | 2023-02-17 19:57:52 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2023-02-17 19:57:52 +0000 |
| commit | 6bcb8713f32fef1f8d46d69bc75cdb6917eed884 (patch) | |
| tree | 97383668a6d49250918fbf1621105a7e959b30f2 | |
| parent | 07dafeabe5ef508abe81ca3ffdf890d15f3ad1ed (diff) | |
| parent | 6f1bc37a23f99c2f4ceb05b3612bdbe4642a64c7 (diff) | |
| download | pixel-sepolicy-6bcb8713f32fef1f8d46d69bc75cdb6917eed884.tar.gz | |
Merge "Revert^2 "sepolicy/vibrator: Update sepolicy to support adaptive haptics property"" am: ff2bbc7fa9 am: 039273bc9b am: 6f1bc37a23
Original change: https://android-review.googlesource.com/c/platform/hardware/google/pixel-sepolicy/+/2441607
Change-Id: Id725e519dc29963a3ccaed5354852797d6f15cab
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
| -rw-r--r-- | vibrator/common/property_contexts | 3 | ||||
| -rw-r--r-- | vibrator/cs40l26/hal_vibrator_default.te | 3 | ||||
| -rw-r--r-- | vibrator/cs40l26/vendor_init.te | 1 |
3 files changed, 6 insertions, 1 deletions
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 @@ 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 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) |