Attach vendor_property_type to properties

We are going to enforce that each property has an explicit owner, such
as system, vendor, or product. This attaches vendor_property_type to
properties defined under vendor sepolicy directories.

Bug: 159097992
Test: m selinux_policy
Change-Id: If187026e0940c0bcc06c4d78bdbe860d2692a6e6
Merged-In: If187026e0940c0bcc06c4d78bdbe860d2692a6e6
(cherry picked from commit 980434f8ce731a4820621f4098208b6495726787)

4 files changed, 79 insertions, 78 deletions

diff --git a/public/property.te b/public/property.te
index 1441642..b5b87f1 100644
--- a/public/property.te
+++ b/public/property.te
@@ -1,2 +1,2 @@
-type persist_dpm_prop, property_type;
-type vendor_bt_prop, property_type;
+vendor_internal_prop(persist_dpm_prop)
+vendor_internal_prop(vendor_bt_prop)
diff --git a/vendor/google/property.te b/vendor/google/property.te
index 18633c6..fe0ab10 100644
--- a/vendor/google/property.te
+++ b/vendor/google/property.te
@@ -1,13 +1,14 @@
-type vendor_tcpdump_log_prop, property_type;
-type vendor_build_type_prop, property_type;
-type vendor_aware_available_prop, property_type;
-type vendor_modem_prop, property_type;
-type camera_ro_prop, property_type;
-type vendor_ramoops_prop, property_type;
-type ecoservice_prop, property_type;
-type vendor_shutdown_prop, property_type;
-type vendor_battery_defender_prop, property_type;
-type vendor_vibrator_prop, property_type;
+vendor_internal_prop(ecoservice_prop)
+vendor_internal_prop(vendor_aware_available_prop)
+vendor_internal_prop(vendor_battery_defender_prop)
+vendor_internal_prop(vendor_build_type_prop)
+vendor_internal_prop(vendor_modem_prop)
+vendor_internal_prop(vendor_ramoops_prop)
+vendor_internal_prop(vendor_shutdown_prop)
+vendor_internal_prop(vendor_tcpdump_log_prop)
+vendor_internal_prop(vendor_vibrator_prop)
 
 # vendor verbose logging property
-type vendor_logging_prop, property_type;
+vendor_internal_prop(vendor_logging_prop)
+
+vendor_restricted_prop(camera_ro_prop)
diff --git a/vendor/qcom/common/property.te b/vendor/qcom/common/property.te
index e088dad..d232ac6 100644
--- a/vendor/qcom/common/property.te
+++ b/vendor/qcom/common/property.te
@@ -1,64 +1,64 @@
-type uicc_prop, property_type;
-type qcom_ims_prop, property_type;
-type ctl_vendor_netmgrd_prop, property_type;
-type ctl_vendor_port-bridge_prop, property_type;
-type ctl_qcrild_prop, property_type;
-type vendor_tee_listener_prop, property_type;
-type ctl_vendor_rild_prop, property_type;
-type ctl_LKCore_prop, property_type;
-type freq_prop, property_type;
-type vendor_dataqti_prop, property_type;
-type cnd_vendor_prop, property_type;
-type sensors_prop, property_type;
-type slpi_prop, property_type;
-type msm_irqbalance_prop, property_type;
-type msm_irqbl_sdm630_prop, property_type;
-type camera_prop, property_type;
-type spcomlib_prop, property_type;
-type vendor_display_prop, property_type;
-type scr_enabled_prop, property_type;
-type bg_boot_complete_prop, property_type;
-type opengles_prop, property_type;
-type mdm_helper_prop, property_type;
-type vendor_mpctl_prop, property_type;
-type vendor_iop_prop, property_type;
-type vendor_preobtain_prop, property_type;
-type vendor_am_prop, property_type;
-type vendor_gralloc_prop, property_type;
-type fm_prop, property_type;
-type chgdiabled_prop, property_type;
-type vendor_xlat_prop, property_type;
-type location_prop, property_type;
-type qemu_hw_mainkeys_prop, property_type;
-type vendor_usb_prop, property_type;
-type public_vendor_system_prop, property_type;
-type vendor_coresight_prop, property_type;
-type public_vendor_default_prop, property_type;
-type vendor_alarm_boot_prop, property_type;
-type dolby_prop, property_type;
-type hwui_prop, property_type;
-type graphics_vulkan_prop, property_type;
-type bservice_prop, property_type;
-type reschedule_service_prop, property_type;
-type vendor_boot_mode_prop, property_type;
-type nfc_nq_prop, property_type;
-type vendor_rild_libpath_prop, property_type;
-type vendor_per_mgr_state_prop, property_type;
-type vendor_system_prop, property_type;
-type vendor_bluetooth_prop, property_type;
-type ctl_vendor_imsrcsservice_prop, property_type;
-type vendor_time_service_prop, property_type;
-type vendor_radio_prop, property_type;
-type vendor_audio_prop, property_type;
-type vendor_ssr_prop, property_type;
-type vendor_pd_locater_dbg_prop, property_type;
-type vendor_qdcmss_prop, property_type;
-type vendor_softap_prop, property_type;
-type mm_parser_prop, property_type;
-type mm_video_prop, property_type;
-type ctl_vendor_rmt_storage_prop, property_type;
-type vendor_wifi_version, property_type;
-type vendor_cnss_diag_prop, property_type;
-type vendor_modem_diag_prop, property_type;
-type vendor_ramdump_prop, property_type;
-type vendor_hvdcp_opti_prop, property_type;
+vendor_internal_prop(uicc_prop)
+vendor_restricted_prop(qcom_ims_prop)
+vendor_internal_prop(ctl_vendor_netmgrd_prop)
+vendor_internal_prop(ctl_vendor_port-bridge_prop)
+vendor_internal_prop(ctl_qcrild_prop)
+vendor_internal_prop(vendor_tee_listener_prop)
+vendor_internal_prop(ctl_vendor_rild_prop)
+vendor_internal_prop(ctl_LKCore_prop)
+vendor_internal_prop(freq_prop)
+vendor_internal_prop(vendor_dataqti_prop)
+vendor_restricted_prop(cnd_vendor_prop)
+vendor_internal_prop(sensors_prop)
+vendor_internal_prop(slpi_prop)
+vendor_internal_prop(msm_irqbalance_prop)
+vendor_internal_prop(msm_irqbl_sdm630_prop)
+vendor_restricted_prop(camera_prop)
+vendor_internal_prop(spcomlib_prop)
+vendor_restricted_prop(vendor_display_prop)
+vendor_internal_prop(scr_enabled_prop)
+vendor_internal_prop(bg_boot_complete_prop)
+vendor_internal_prop(opengles_prop)
+vendor_internal_prop(mdm_helper_prop)
+vendor_internal_prop(vendor_mpctl_prop)
+vendor_internal_prop(vendor_iop_prop)
+vendor_internal_prop(vendor_preobtain_prop)
+vendor_internal_prop(vendor_am_prop)
+vendor_internal_prop(vendor_gralloc_prop)
+vendor_internal_prop(fm_prop)
+vendor_internal_prop(chgdiabled_prop)
+vendor_internal_prop(vendor_xlat_prop)
+vendor_internal_prop(location_prop)
+vendor_internal_prop(qemu_hw_mainkeys_prop)
+vendor_internal_prop(vendor_usb_prop)
+vendor_internal_prop(public_vendor_system_prop)
+vendor_internal_prop(vendor_coresight_prop)
+vendor_restricted_prop(public_vendor_default_prop)
+vendor_internal_prop(vendor_alarm_boot_prop)
+vendor_internal_prop(dolby_prop)
+vendor_internal_prop(hwui_prop)
+vendor_internal_prop(graphics_vulkan_prop)
+vendor_internal_prop(bservice_prop)
+vendor_internal_prop(reschedule_service_prop)
+vendor_internal_prop(vendor_boot_mode_prop)
+vendor_internal_prop(nfc_nq_prop)
+vendor_internal_prop(vendor_rild_libpath_prop)
+vendor_internal_prop(vendor_per_mgr_state_prop)
+vendor_internal_prop(vendor_system_prop)
+vendor_internal_prop(vendor_bluetooth_prop)
+vendor_internal_prop(ctl_vendor_imsrcsservice_prop)
+vendor_internal_prop(vendor_time_service_prop)
+vendor_restricted_prop(vendor_radio_prop)
+vendor_internal_prop(vendor_audio_prop)
+vendor_internal_prop(vendor_ssr_prop)
+vendor_internal_prop(vendor_pd_locater_dbg_prop)
+vendor_internal_prop(vendor_qdcmss_prop)
+vendor_internal_prop(vendor_softap_prop)
+vendor_internal_prop(mm_parser_prop)
+vendor_internal_prop(mm_video_prop)
+vendor_internal_prop(ctl_vendor_rmt_storage_prop)
+vendor_internal_prop(vendor_wifi_version)
+vendor_internal_prop(vendor_cnss_diag_prop)
+vendor_internal_prop(vendor_modem_diag_prop)
+vendor_internal_prop(vendor_ramdump_prop)
+vendor_restricted_prop(vendor_hvdcp_opti_prop)
diff --git a/vendor/st/property.te b/vendor/st/property.te
index d070080..33a01ec 100644
--- a/vendor/st/property.te
+++ b/vendor/st/property.te
@@ -1 +1 @@
-type vendor_secure_element_prop, property_type;
+vendor_internal_prop(vendor_secure_element_prop)