Merge sc-v2-dev-plus-aosp-without-vendor@8084891
Bug: 214455710
Merged-In: I1fc134913db3c9248811a42ee1f37928f440c156
Change-Id: If072e8ebafbf3e87d4f47b02b18753f2d5e38443
diff --git a/vendor/google/device.te b/vendor/google/device.te
index 3a88966..11d2fc3 100644
--- a/vendor/google/device.te
+++ b/vendor/google/device.te
@@ -4,5 +4,4 @@
type qg_device, dev_type;
type logbuffer_device, dev_type;
type smcinvoke_device, dev_type;
-type touch_offload_device, dev_type;
type battery_history_device, dev_type;
diff --git a/vendor/google/file_contexts b/vendor/google/file_contexts
index fbbf556..1516e57 100644
--- a/vendor/google/file_contexts
+++ b/vendor/google/file_contexts
@@ -4,7 +4,6 @@
/dev/block/zram0 u:object_r:swap_block_device:s0
/dev/vd6281 u:object_r:rls_device:s0
/dev/sensor_tunnel u:object_r:rls_device:s0
-/dev/touch_offload u:object_r:touch_offload_device:s0
/dev/qg u:object_r:qg_device:s0
/dev/qg_battery u:object_r:qg_device:s0
/dev/battery_history u:object_r:battery_history_device:s0
@@ -45,7 +44,6 @@
/vendor/bin/init\.gadgethal\.sh u:object_r:init_gadgethal_exec:s0
/vendor/bin/init\.twoshay\.sh u:object_r:init_twoshay_exec:s0
/vendor/bin/init\.insmod\.sh u:object_r:init-insmod-sh_exec:s0
-/vendor/bin/twoshay u:object_r:twoshay_exec:s0
/vendor/bin/hw/android\.hardware\.contexthub-service\.generic u:object_r:hal_contexthub_default_exec:s0
/vendor/bin/hw/android\.hardware\.contexthub@1\.[0-9]-service\.generic u:object_r:hal_contexthub_default_exec:s0
/vendor/bin/hw/vendor\.google\.wireless_charger@1\.[0-9]-service-vendor u:object_r:hal_wlc_exec:s0
diff --git a/vendor/google/service.te b/vendor/google/service.te
index fad2581..9c935e9 100644
--- a/vendor/google/service.te
+++ b/vendor/google/service.te
@@ -1,2 +1 @@
type hal_pixel_display_service, service_manager_type, vendor_service;
-type touch_context_service, service_manager_type, vendor_service;
diff --git a/vendor/google/service_contexts b/vendor/google/service_contexts
index 54c965d..d7a1e46 100644
--- a/vendor/google/service_contexts
+++ b/vendor/google/service_contexts
@@ -1,2 +1 @@
com.google.hardware.pixel.display.IDisplay/default u:object_r:hal_pixel_display_service:s0
-com.google.input.ITouchContextService/default u:object_r:touch_context_service:s0
diff --git a/vendor/google/twoshay.te b/vendor/google/twoshay.te
deleted file mode 100644
index f940d3a..0000000
--- a/vendor/google/twoshay.te
+++ /dev/null
@@ -1,13 +0,0 @@
-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)
-
-allow twoshay fwk_stats_service:service_manager find;
-binder_call(twoshay, stats_service_server)
