Merge "sepolicy: Rename vendor soc_id and soc_name properties" into sepolicy.lnx.6.0

generic/vendor/common/init_shell.te

@@ -176,9 +176,9 @@ allow vendor_qti_init_shell proc_meminfo:file r_file_perms;
 
 allow vendor_qti_init_shell vendor_sysfs_suspend:file w_file_perms;
 
-# Set ro.vendor.qti.soc to soc_id in QCV init script
-set_prop(vendor_qti_init_shell, vendor_soc_prop);
-# Set ro.vendor.qti.soc.name to soc_name in QCV init script
+# Set ro.vendor.qti.soc_id to soc_id in QCV init script
+set_prop(vendor_qti_init_shell, vendor_soc_id_prop);
+# Set ro.vendor.qti.soc_name to soc_name in QCV init script
 set_prop(vendor_qti_init_shell, vendor_soc_name_prop);
 
 # Get persist.console.silent.config for kernel console log level

generic/vendor/common/property.te

@@ -104,7 +104,7 @@ vendor_restricted_prop(vendor_adsprpc_prop);
 vendor_internal_prop(vendor_wifi_version);
 
 # QCV properties for storing soc_id and soc_name
-vendor_internal_prop(vendor_soc_prop);
+vendor_internal_prop(vendor_soc_id_prop);
 vendor_internal_prop(vendor_soc_name_prop);
 
 #kernel console log level

generic/vendor/common/property_contexts

@@ -129,8 +129,8 @@ vendor.display.qdcm_socket_service u:object_r:vendor_qdcmss_prop:s0
 vendor.fastrpc.                  u:object_r:vendor_adsprpc_prop:s0
 
 # QCV properties for storing soc_id and soc_name
-ro.vendor.qti.soc            u:object_r:vendor_soc_prop:s0
-ro.vendor.qti.soc.name       u:object_r:vendor_soc_name_prop:s0
+ro.vendor.qti.soc_id         u:object_r:vendor_soc_id_prop:s0
+ro.vendor.qti.soc_name       u:object_r:vendor_soc_name_prop:s0
 
 #kernel console log level
 persist.console.silent.config    u:object_r:vendor_console_log_level_prop:s0

generic/vendor/common/te_macros

@@ -167,5 +167,5 @@ define(`use_vendor_fwk_detect', `
 # SoC detection at run time by vendor modules
 # Adds rules needed for vendor modules to get soc info at run time
 define(`use_libsoc_helper', `
-get_prop($1, vendor_soc_prop);
+get_prop($1, vendor_soc_id_prop);
 ')