Merge "Namspace modem_diag_prop and cnss_diag_prop (1/6)" into pi-dev

7 files changed, 13 insertions, 13 deletions

diff --git a/sepolicy/vendor/hal_dumpstate_impl.te b/sepolicy/vendor/hal_dumpstate_impl.te
index 2edc914f..6ee9f8f8 100644
--- a/sepolicy/vendor/hal_dumpstate_impl.te
+++ b/sepolicy/vendor/hal_dumpstate_impl.te
@@ -27,7 +27,7 @@ userdebug_or_eng(`
   allow hal_dumpstate_impl ssr_log_file:file r_file_perms;
 
 
-  set_prop(hal_dumpstate_impl, modem_diag_prop)
+  set_prop(hal_dumpstate_impl, vendor_modem_diag_prop)
 ')
 
 allow hal_dumpstate_impl uio_device:chr_file rw_file_perms;
@@ -79,7 +79,7 @@ allow hal_dumpstate_impl mpss_rfs_data_file:file r_file_perms;
 # For collecting bugreports.
 allow hal_dumpstate_impl shell_data_file:file getattr;
 allow hal_dumpstate_impl sysfs_system_sleep_stats:file r_file_perms;
-# For '/vendor/bin/sh -c getprop | grep sys.modem.diag'
+# For '/vendor/bin/sh -c getprop | grep vendor.sys.modem.diag'
 allow hal_dumpstate_impl vendor_file:file execute_no_trans;
 userdebug_or_eng(`allow hal_dumpstate_impl debugfs_dma_bufinfo:file r_file_perms;')
 dontaudit hal_dumpstate_impl debugfs_dma_bufinfo:file r_file_perms;
diff --git a/sepolicy/vendor/logger_app.te b/sepolicy/vendor/logger_app.te
index 941da8b7..fde0d06f 100644
--- a/sepolicy/vendor/logger_app.te
+++ b/sepolicy/vendor/logger_app.te
@@ -16,6 +16,6 @@ userdebug_or_eng(`
   allow logger_app cnss_vendor_data_file:dir create_dir_perms;
   allow logger_app cnss_vendor_data_file:file create_file_perms;
 
-  set_prop(logger_app, cnss_diag_prop)
-  set_prop(logger_app, modem_diag_prop)
+  set_prop(logger_app, vendor_cnss_diag_prop)
+  set_prop(logger_app, vendor_modem_diag_prop)
 ')
diff --git a/sepolicy/vendor/modem_diagnostics.te b/sepolicy/vendor/modem_diagnostics.te
index d34033bd..4f602b62 100644
--- a/sepolicy/vendor/modem_diagnostics.te
+++ b/sepolicy/vendor/modem_diagnostics.te
@@ -9,5 +9,5 @@ allow modem_diagnostic_app surfaceflinger_service:service_manager find;
 userdebug_or_eng(`
   allow modem_diagnostic_app diag_device:chr_file rw_file_perms;
 
-  set_prop(modem_diagnostic_app, modem_diag_prop)
+  set_prop(modem_diagnostic_app, vendor_modem_diag_prop)
 ')
diff --git a/sepolicy/vendor/property.te b/sepolicy/vendor/property.te
index 2f71f4a9..d20af4ef 100644
--- a/sepolicy/vendor/property.te
+++ b/sepolicy/vendor/property.te
@@ -7,11 +7,11 @@ type ramdump_prop, property_type;
 type post_boot_prop, property_type;
 type public_vendor_system_prop, property_type;
 type ssr_prop, property_type;
-type cnss_diag_prop, property_type;
+type vendor_cnss_diag_prop, property_type;
 type tee_listener_prop, property_type;
 type wc_prop, property_type;
 type vendor_thermal_prop, property_type;
-type modem_diag_prop, property_type;
+type vendor_modem_diag_prop, property_type;
 type tel_mon_prop, property_type;
 type vendor_time_prop, property_type;
 type power_prop, property_type;
diff --git a/sepolicy/vendor/property_contexts b/sepolicy/vendor/property_contexts
index 5c0dfb8d..37d153f2 100644
--- a/sepolicy/vendor/property_contexts
+++ b/sepolicy/vendor/property_contexts
@@ -13,13 +13,13 @@ rcs.publish.status         u:object_r:radio_prop:s0
 debug.ramdump.             u:object_r:ramdump_prop:s0
 persist.sys.crash_rcu      u:object_r:ramdump_prop:s0
 debug.ssrdump              u:object_r:ssr_prop:s0
-persist.sys.cnss.          u:object_r:cnss_diag_prop:s0
+persist.vendor.sys.cnss.   u:object_r:vendor_cnss_diag_prop:s0
 sys.listeners.registered   u:object_r:tee_listener_prop:s0
 wc_transport.              u:object_r:wc_prop:s0
 vendor.sys.qcom.thermalcfg u:object_r:vendor_thermal_prop:s0
 ctl.vendor.thermal-engine  u:object_r:vendor_thermal_prop:s0
-persist.sys.modem.diag.    u:object_r:modem_diag_prop:s0
-sys.modem.diag.            u:object_r:modem_diag_prop:s0
+persist.vendor.sys.modem.diag.  u:object_r:vendor_modem_diag_prop:s0
+vendor.sys.modem.diag.     u:object_r:vendor_modem_diag_prop:s0
 persist.radio.enable_tel_mon  u:object_r:tel_mon_prop:s0
 persist.radio.poweranomaly.start u:object_r:tel_mon_prop:s0
 persist.radio.lowpowermonitor.start u:object_r:tel_mon_prop:s0
diff --git a/sepolicy/vendor/qlogd.te b/sepolicy/vendor/qlogd.te
index f3a8f9bc..e000ecb8 100644
--- a/sepolicy/vendor/qlogd.te
+++ b/sepolicy/vendor/qlogd.te
@@ -11,5 +11,5 @@ userdebug_or_eng(`
   allow qlogd radio_vendor_data_file:file create_file_perms;
   allow qlogd radio_vendor_data_file:dir create_dir_perms;
 
-  set_prop(qlogd, modem_diag_prop)
-')
\ No newline at end of file
+  set_prop(qlogd, vendor_modem_diag_prop)
+')
diff --git a/sepolicy/vendor/vendor_init.te b/sepolicy/vendor/vendor_init.te
index 21ae14a2..47513709 100644
--- a/sepolicy/vendor/vendor_init.te
+++ b/sepolicy/vendor/vendor_init.te
@@ -20,7 +20,7 @@ dontaudit vendor_init kernel:system module_request;
 
 set_prop(vendor_init, bluetooth_prop)
 set_prop(vendor_init, camera_prop)
-set_prop(vendor_init, modem_diag_prop)
+set_prop(vendor_init, vendor_modem_diag_prop)
 set_prop(vendor_init, power_prop)
 set_prop(vendor_init, vendor_thermal_prop)