Revert "Update EVS sepolicy"
Revert "Update EVS service configurations"
Revert submission 12518161-evs_cherrypick
Reason for revert: Broken build 6821687 on git_rvc-qpr-dev-plus-aosp on aosp_hawk-userdebug
Reverted Changes:
Id4127d387:Rename the reference EVS HW service
Id4c489fd2:Fix a stream configuration size calculation
I393721d1b:Update EVS sepolicy
Ib771f95a4:Update EVS service configurations
I4f801ad03:Add a command line option for the test mode
Change-Id: I0cb2830cf75b7ac39cbb93f3eea07759555a7518
diff --git a/evs/sepolicy/evs.mk b/evs/sepolicy/evs.mk
deleted file mode 100644
index aee4003..0000000
--- a/evs/sepolicy/evs.mk
+++ /dev/null
@@ -1,3 +0,0 @@
-# Extended View System Selinux Policies
-PRODUCT_PUBLIC_SEPOLICY_DIRS += packages/services/Car/evs/sepolicy/public
-PRODUCT_PRIVATE_SEPOLICY_DIRS += packages/services/Car/evs/sepolicy/private
diff --git a/evs/sepolicy/private/evs_app.te b/evs/sepolicy/evs_app.te
similarity index 100%
rename from evs/sepolicy/private/evs_app.te
rename to evs/sepolicy/evs_app.te
diff --git a/evs/sepolicy/private/evs_driver.te b/evs/sepolicy/evs_driver.te
similarity index 94%
rename from evs/sepolicy/private/evs_driver.te
rename to evs/sepolicy/evs_driver.te
index 5b847fa..9bb7b97 100644
--- a/evs/sepolicy/private/evs_driver.te
+++ b/evs/sepolicy/evs_driver.te
@@ -1,4 +1,5 @@
-# evs reference hardware driver service
+# evs_mock mock hardware driver service
+type hal_evs_driver, domain;
hal_server_domain(hal_evs_driver, hal_evs)
hal_client_domain(hal_evs_driver, hal_evs)
diff --git a/evs/sepolicy/private/evs_manager.te b/evs/sepolicy/evs_manager.te
similarity index 74%
rename from evs/sepolicy/private/evs_manager.te
rename to evs/sepolicy/evs_manager.te
index 32bbc32..cf649bb 100644
--- a/evs/sepolicy/private/evs_manager.te
+++ b/evs/sepolicy/evs_manager.te
@@ -1,4 +1,5 @@
# evs manager
+type evs_manager, domain, coredomain;
hal_server_domain(evs_manager, hal_evs)
hal_client_domain(evs_manager, hal_evs)
@@ -6,7 +7,10 @@
type evs_manager_exec, exec_type, file_type, system_file_type;
init_daemon_domain(evs_manager)
-# allow write messages to the shell
+# allow use of hwservices
+allow evs_manager hal_graphics_allocator_default:fd use;
+
+# allow write to fd
allow evs_manager shell:fd use;
allow evs_manager shell:fifo_file write;
diff --git a/evs/sepolicy/private/file_contexts b/evs/sepolicy/file_contexts
similarity index 100%
rename from evs/sepolicy/private/file_contexts
rename to evs/sepolicy/file_contexts
diff --git a/evs/sepolicy/private/automotive_display_service.te b/evs/sepolicy/private/automotive_display_service.te
deleted file mode 100644
index cd42ed6..0000000
--- a/evs/sepolicy/private/automotive_display_service.te
+++ /dev/null
@@ -1,2 +0,0 @@
-allow automotive_display_service hal_evs_driver:binder transfer;
-allow automotive_display_service hal_evs_driver:fd use;
diff --git a/evs/sepolicy/public/evs_driver.te b/evs/sepolicy/public/evs_driver.te
deleted file mode 100644
index 9f72441..0000000
--- a/evs/sepolicy/public/evs_driver.te
+++ /dev/null
@@ -1,2 +0,0 @@
-# reference evs hardware driver service
-type hal_evs_driver, domain;
diff --git a/evs/sepolicy/public/evs_manager.te b/evs/sepolicy/public/evs_manager.te
deleted file mode 100644
index 24f3e6c..0000000
--- a/evs/sepolicy/public/evs_manager.te
+++ /dev/null
@@ -1,2 +0,0 @@
-# evs manager
-type evs_manager, domain, coredomain;
diff --git a/evs/sepolicy/private/servicemanager.te b/evs/sepolicy/servicemanager.te
similarity index 100%
rename from evs/sepolicy/private/servicemanager.te
rename to evs/sepolicy/servicemanager.te
diff --git a/evs/sepolicy/private/surfaceflinger.te b/evs/sepolicy/surfaceflinger.te
similarity index 100%
rename from evs/sepolicy/private/surfaceflinger.te
rename to evs/sepolicy/surfaceflinger.te
