[automerger skipped] Merge Android 14 QPR2 to AOSP main am: c6f6a48eea -s ours am: 868cbdb80e -s ours
am skip reason: Merged-In Iaad9312dfbe6d772dc9346ef9c0a0e7ccf099530 with SHA-1 03f3dd6f25 is already in history
Original change: https://android-review.googlesource.com/c/platform/hardware/google/pixel-sepolicy/+/2989918
Change-Id: I7c42d5b36c389bdd9db17d9696e3413f4a67dac4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
diff --git a/input/device.te b/input/device.te
deleted file mode 100644
index d3ce622..0000000
--- a/input/device.te
+++ /dev/null
@@ -1 +0,0 @@
-type touch_offload_device, dev_type;
diff --git a/input/dumpstate.te b/input/dumpstate.te
deleted file mode 100644
index 38aa25e..0000000
--- a/input/dumpstate.te
+++ /dev/null
@@ -1,2 +0,0 @@
-binder_call(dumpstate, twoshay)
-allow dumpstate touch_context_service:service_manager find;
diff --git a/input/file_contexts b/input/file_contexts
deleted file mode 100644
index 2157b00..0000000
--- a/input/file_contexts
+++ /dev/null
@@ -1,4 +0,0 @@
-/dev/touch_offload u:object_r:touch_offload_device:s0
-/dev/touch_offload_fts u:object_r:touch_offload_device:s0
-/dev/touch_offload_fts_ext u:object_r:touch_offload_device:s0
-/vendor/bin/twoshay u:object_r:twoshay_exec:s0
diff --git a/input/hal_dumpstate_default.te b/input/hal_dumpstate_default.te
deleted file mode 100644
index 81edc36..0000000
--- a/input/hal_dumpstate_default.te
+++ /dev/null
@@ -1,2 +0,0 @@
-allow hal_dumpstate_default touch_context_service:service_manager find;
-binder_call(hal_dumpstate_default, twoshay)
diff --git a/input/platform_app.te b/input/platform_app.te
deleted file mode 100644
index 9b4a7af..0000000
--- a/input/platform_app.te
+++ /dev/null
@@ -1,4 +0,0 @@
-allow platform_app screen_protector_detector_service:service_manager find;
-allow platform_app touch_context_service:service_manager find;
-allow platform_app gril_antenna_tuning_service:service_manager find;
-binder_call(platform_app, twoshay)
diff --git a/input/service.te b/input/service.te
deleted file mode 100644
index d59328b..0000000
--- a/input/service.te
+++ /dev/null
@@ -1,3 +0,0 @@
-type gril_antenna_tuning_service, service_manager_type, hal_service_type;
-type touch_context_service, service_manager_type, hal_service_type;
-type screen_protector_detector_service, service_manager_type, hal_service_type;
diff --git a/input/service_contexts b/input/service_contexts
deleted file mode 100644
index f48eee4..0000000
--- a/input/service_contexts
+++ /dev/null
@@ -1,3 +0,0 @@
-com.google.input.algos.gril.IGrilAntennaTuningService/default u:object_r:gril_antenna_tuning_service:s0
-com.google.input.ITouchContextService/default u:object_r:touch_context_service:s0
-com.google.input.algos.spd.IScreenProtectorDetectorService/default u:object_r:screen_protector_detector_service:s0
diff --git a/input/touchflow_debug/file_contexts b/input/touchflow_debug/file_contexts
deleted file mode 100644
index ff6aa22..0000000
--- a/input/touchflow_debug/file_contexts
+++ /dev/null
@@ -1,3 +0,0 @@
-/vendor/bin/hw/android\.hardware\.input\.processor-reflector u:object_r:hal_input_processor_default_exec:s0
-/vendor/bin/twoshay_touchflow u:object_r:twoshay_exec:s0
-
diff --git a/input/twoshay.te b/input/twoshay.te
deleted file mode 100644
index 1cbbbc6..0000000
--- a/input/twoshay.te
+++ /dev/null
@@ -1,26 +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, screen_protector_detector_service)
-add_service(twoshay, touch_context_service)
-add_service(twoshay, gril_antenna_tuning_service)
-binder_call(twoshay, platform_app)
-
-allow twoshay fwk_stats_service:service_manager find;
-binder_call(twoshay, stats_service_server)
-
-# Allow dumpsys output in bugreports.
-allow twoshay dumpstate:fd use;
-allow twoshay dumpstate:fifo_file write;
-
-# b/198755236
-dontaudit twoshay twoshay:capability dac_override;
-
-# b/226830650
-dontaudit twoshay boot_status_prop:file read;