Remove wifi_logger related sepolicy settings
Due to the fact that /vendor/bin/wifi_logger no longer exists
on the P21 master branch any more, we remove obsolete sepolicy.
Also, move another rule to the correct package.
Bug: 201599426
Test: wlan_logger in Pixel Logger is workable
Change-Id: I5d27cb4033bd41d128d8b56d510165e9dfa206fd
diff --git a/wifi_logger/file.te b/logger_app/file.te
similarity index 100%
rename from wifi_logger/file.te
rename to logger_app/file.te
diff --git a/logger_app/logger_app.te b/logger_app/logger_app.te
index 6ee040c..942daba 100644
--- a/logger_app/logger_app.te
+++ b/logger_app/logger_app.te
@@ -7,4 +7,8 @@
allow logger_app app_api_service:service_manager find;
allow logger_app tcpdump_vendor_data_file:dir create_dir_perms;
allow logger_app tcpdump_vendor_data_file:file create_file_perms;
+
+ allow logger_app wifi_logging_data_file:dir create_dir_perms;
+ allow logger_app wifi_logging_data_file:file create_file_perms;
+ set_prop(logger_app, vendor_wlan_logging_prop)
')
diff --git a/wifi_logger/property.te b/logger_app/property.te
similarity index 100%
rename from wifi_logger/property.te
rename to logger_app/property.te
diff --git a/wifi_logger/property_contexts b/logger_app/property_contexts
similarity index 100%
rename from wifi_logger/property_contexts
rename to logger_app/property_contexts
diff --git a/wifi_ext/file_contexts b/wifi_ext/file_contexts
index acbd266..ab8343b 100644
--- a/wifi_ext/file_contexts
+++ b/wifi_ext/file_contexts
@@ -1,3 +1,6 @@
# Wifi
/vendor/bin/hw/vendor\.google\.wifi_ext@1\.0-service-vendor u:object_r:hal_wifi_ext_exec:s0
/vendor/bin/hw/vendor\.google\.wifi_ext@1\.0-service-vendor-lazy u:object_r:hal_wifi_ext_exec:s0
+
+# Wifi logger
+/data/vendor/wifi/wlan_logs(/.*)? u:object_r:wifi_logging_data_file:s0
diff --git a/wifi_ext/hal_wifi_ext.te b/wifi_ext/hal_wifi_ext.te
index 7f20b42..2ed274e 100644
--- a/wifi_ext/hal_wifi_ext.te
+++ b/wifi_ext/hal_wifi_ext.te
@@ -9,3 +9,8 @@
# Allow to set up bridged interface
allowxperm hal_wifi_ext self:udp_socket ioctl { SIOCBRADDBR SIOCBRDELBR SIOCBRADDIF SIOCBRDELIF};
+
+userdebug_or_eng(`
+ allow hal_wifi_ext wifi_logging_data_file:dir rw_dir_perms;
+ allow hal_wifi_ext wifi_logging_data_file:file create_file_perms;
+')
diff --git a/wifi_logger/README.md b/wifi_logger/README.md
deleted file mode 100644
index f7fc7c0..0000000
--- a/wifi_logger/README.md
+++ /dev/null
@@ -1,6 +0,0 @@
-### wifi logger SELinux rules
-
-This directory contains all the SELinux rules for communication with the
-wlan logger and HAL, and forward the configuration parameter from the file.
-
-The implementation is at ['vendor/google/apps/PixelLogger'] directory
diff --git a/wifi_logger/file_contexts b/wifi_logger/file_contexts
deleted file mode 100644
index c4f7b21..0000000
--- a/wifi_logger/file_contexts
+++ /dev/null
@@ -1,2 +0,0 @@
-/vendor/bin/wifi_logger u:object_r:wifi_logger_exec:s0
-/data/vendor/wifi/wlan_logs(/.*)? u:object_r:wifi_logging_data_file:s0
diff --git a/wifi_logger/hal_wifi_ext.te b/wifi_logger/hal_wifi_ext.te
deleted file mode 100644
index 6d28cfd..0000000
--- a/wifi_logger/hal_wifi_ext.te
+++ /dev/null
@@ -1,4 +0,0 @@
-userdebug_or_eng(`
- allow hal_wifi_ext wifi_logging_data_file:dir rw_dir_perms;
- allow hal_wifi_ext wifi_logging_data_file:file create_file_perms;
-')
diff --git a/wifi_logger/logger_app.te b/wifi_logger/logger_app.te
deleted file mode 100644
index 117a6fe..0000000
--- a/wifi_logger/logger_app.te
+++ /dev/null
@@ -1,5 +0,0 @@
-userdebug_or_eng(`
- allow logger_app wifi_logging_data_file:dir create_dir_perms;
- allow logger_app wifi_logging_data_file:file create_file_perms;
- set_prop(logger_app, vendor_wlan_logging_prop)
-')
diff --git a/wifi_logger/wifi_logger.te b/wifi_logger/wifi_logger.te
deleted file mode 100644
index 7a15732..0000000
--- a/wifi_logger/wifi_logger.te
+++ /dev/null
@@ -1,22 +0,0 @@
-type wifi_logger, domain;
-type wifi_logger_exec, exec_type, vendor_file_type, file_type;
-
-userdebug_or_eng(`
- # make transition from init to its domain
- init_daemon_domain(wifi_logger)
- net_domain(wifi_logger)
-
- get_prop(wifi_logger, hwservicemanager_prop)
- get_prop(wifi_logger, wifi_hal_prop)
- get_prop(wifi_logger, vendor_wlan_logging_prop)
- binder_call(wifi_logger, hwservicemanager)
- binder_call(wifi_logger, hal_wifi_ext)
-
- allow wifi_logger hal_wifi_ext_hwservice:hwservice_manager find;
- allow wifi_logger wifi_logging_data_file:dir create_dir_perms;
- allow wifi_logger wifi_logging_data_file:file create_file_perms;
- allow wifi_logger wpa_data_file:dir r_dir_perms;
- allow wifi_logger wpa_data_file:sock_file getattr;
- allow wifi_logger hostapd_data_file:dir r_dir_perms;
- allow wifi_logger hostapd_data_file:sock_file getattr;
-')