Merge "fix denials for wifi_hal_prop in cnd domain"
diff --git a/vendor/google/file_contexts b/vendor/google/file_contexts
index 710c256..56322b6 100644
--- a/vendor/google/file_contexts
+++ b/vendor/google/file_contexts
@@ -26,7 +26,7 @@
# vendor binaries
/vendor/bin/hw/android\.hardware\.camera\.provider@2\.6-service-google u:object_r:hal_camera_default_exec:s0
-/vendor/bin/hw/android\.hardware\.contexthub@1\.1-service\.generic u:object_r:hal_contexthub_default_exec:s0
+/vendor/bin/hw/android\.hardware\.contexthub@1\.2-service\.generic u:object_r:hal_contexthub_default_exec:s0
/vendor/bin/hw/android\.hardware\.neuralnetworks@1\.2-service-noronha u:object_r:hal_neuralnetworks_darwinn_exec:s0
/vendor/bin/hw/android\.hardware\.power\.stats@1\.0-service\.pixel u:object_r:hal_power_stats_default_exec:s0
/vendor/bin/hw/hardware\.google\.light@1\.1-service u:object_r:hal_light_default_exec:s0
diff --git a/vendor/google/hal_wifi_ext.te b/vendor/google/hal_wifi_ext.te
index c4f17fb..880f944 100644
--- a/vendor/google/hal_wifi_ext.te
+++ b/vendor/google/hal_wifi_ext.te
@@ -36,3 +36,10 @@
# Allow wifi_ext to read the updated firmware files from app
allow hal_wifi_ext priv_app:fd use;
allow hal_wifi_ext privapp_data_file:file { read map };
+
+userdebug_or_eng(`
+# debugfs entries are only needed in user-debug or eng builds
+
+# Allow wifi hal to access wlan debugfs directories
+allow hal_wifi_ext debugfs_wlan:dir r_dir_perms;
+')
diff --git a/vendor/google/logger_app.te b/vendor/google/logger_app.te
index cab24ae..e066075 100644
--- a/vendor/google/logger_app.te
+++ b/vendor/google/logger_app.te
@@ -20,4 +20,5 @@
set_prop(logger_app, vendor_modem_diag_prop)
set_prop(logger_app, vendor_wifi_sniffer_prop)
set_prop(logger_app, vendor_usb_prop)
+ set_prop(logger_app, vendor_logging_prop)
')
diff --git a/vendor/google/modem_diagnostics.te b/vendor/google/modem_diagnostics.te
index 57da246..4e7f3d5 100644
--- a/vendor/google/modem_diagnostics.te
+++ b/vendor/google/modem_diagnostics.te
@@ -9,6 +9,10 @@
userdebug_or_eng(`
allow modem_diagnostic_app diag_device:chr_file rw_file_perms;
allow modem_diagnostic_app sysfs_esim:file r_file_perms;
+
+ allow modem_diagnostic_app ssr_log_file:dir r_dir_perms;
+ allow modem_diagnostic_app ssr_log_file:file r_file_perms;
+
unix_socket_connect(modem_diagnostic_app, diag, qlogd);
set_prop(modem_diagnostic_app, vendor_modem_diag_prop)
