From 7254de258a89495975a6fe3c9180496e9ee287c5 Mon Sep 17 00:00:00 2001 From: Jonglin Lee Date: Fri, 10 Sep 2021 21:23:57 +0000 Subject: [PATCH] Revert "Move twoshay definitions to hardware/google/pixel-sepoli..." Revert "Move twoshay definitions to hardware/google/pixel-sepoli..." Revert "Move twoshay definitions to hardware/google/pixel-sepoli..." Revert "Move twoshay definitions to hardware/google/pixel-sepoli..." Revert "Move sepolicy for _touchflow targets." Revert submission 15676823-reflector-sepolicy Reason for revert: breaking several builds in git_master-without-vendor Reverted Changes: Ifecfc81f0:Move twoshay definitions to hardware/google/pixel-... Idfd81131c:Move twoshay definitions to hardware/google/pixel-... Id2b0e1db3:Move twoshay definitions to hardware/google/pixel-... I43ac6337f:Move twoshay definitions to hardware/google/pixel-... If95e6e788:Move twoshay definitions to hardware/google/pixel-... I07ab95780:Move sepolicy for _touchflow targets. I01f378b51:Move sepolicy for _touchflow targets. Bug: 199548147 Change-Id: I84f106c24bd47fd171788301415c0eabafe9254f --- whitechapel/vendor/google/device.te | 3 +++ whitechapel/vendor/google/file_contexts | 4 ++++ whitechapel/vendor/google/twoshay.te | 8 ++++++++ 3 files changed, 15 insertions(+) diff --git a/whitechapel/vendor/google/device.te b/whitechapel/vendor/google/device.te index 27b04ec5..bc3c9477 100644 --- a/whitechapel/vendor/google/device.te +++ b/whitechapel/vendor/google/device.te @@ -26,6 +26,9 @@ type cpuctl_device, dev_type; # Bt Wifi Coexistence device type wb_coexistence_dev, dev_type; +# Touch +type touch_offload_device, dev_type; + # LWIS (Lightweight Imaging Subsystem) devices, used by Lyric camera HAL type lwis_device, dev_type; diff --git a/whitechapel/vendor/google/file_contexts b/whitechapel/vendor/google/file_contexts index f7bec37b..13179922 100644 --- a/whitechapel/vendor/google/file_contexts +++ b/whitechapel/vendor/google/file_contexts @@ -387,6 +387,10 @@ /vendor/lib(64)?/hw/vulkan\.gs101\.so u:object_r:same_process_hal_file:s0 /vendor/lib(64)?/arm\.graphics-V1-ndk\.so u:object_r:same_process_hal_file:s0 +# Touch +/dev/touch_offload u:object_r:touch_offload_device:s0 +/vendor/bin/twoshay u:object_r:twoshay_exec:s0 + # Fingerprint /vendor/bin/hw/android\.hardware\.biometrics\.fingerprint@2\.1-service\.goodix u:object_r:hal_fingerprint_default_exec:s0 /vendor/bin/hw/android\.hardware\.biometrics\.fingerprint-service\.goodix u:object_r:hal_fingerprint_default_exec:s0 diff --git a/whitechapel/vendor/google/twoshay.te b/whitechapel/vendor/google/twoshay.te index e3e71d30..eba1ccee 100644 --- a/whitechapel/vendor/google/twoshay.te +++ b/whitechapel/vendor/google/twoshay.te @@ -1,3 +1,11 @@ +type twoshay, domain; +type twoshay_exec, exec_type, vendor_file_type, file_type; + +init_daemon_domain(twoshay) + +allow twoshay touch_offload_device:chr_file rw_file_perms; +allow twoshay twoshay:capability sys_nice; + binder_use(twoshay) add_service(twoshay, touch_context_service)