Clean up the obsoleted services, properties, files

Bug: 158846535
Test: Build selinux modules successfully
      Push selinux modules, make sure the device can boot to home
      Verify the following functionality:
        Wifi, VoiceCall, Text messages, Google Camera App, Audio, Video, GPS,
	Flash ROM, OTA, Screen lock/unlock
	No crash loop observed
Change-Id: I5ffd217dc04f5b2d2a8d0a99b2a2f46f18158b65
diff --git a/public/file.te b/public/file.te
deleted file mode 100644
index ddf72a6..0000000
--- a/public/file.te
+++ /dev/null
@@ -1 +0,0 @@
-type dpmtcm_socket, file_type, coredomain_socket, mlstrustedobject;
diff --git a/public/property.te b/public/property.te
deleted file mode 100644
index 1441642..0000000
--- a/public/property.te
+++ /dev/null
@@ -1,2 +0,0 @@
-type persist_dpm_prop, property_type;
-type vendor_bt_prop, property_type;
diff --git a/vendor/google/device.te b/vendor/google/device.te
index 3851136..7b8a31b 100644
--- a/vendor/google/device.te
+++ b/vendor/google/device.te
@@ -1,10 +1,6 @@
-type abc_tpu_device, dev_type;
 type citadel_device, dev_type;
-type ipu_device, dev_type, mlstrustedobject;
 type ramoops_device, dev_type;
-type maxfg_device, dev_type;
 type rls_device, dev_type;
-type pwrstats_device, dev_type;
 type dp_block_device, dev_type;
 type qg_device, dev_type;
 type smcinvoke_device, dev_type;
diff --git a/vendor/google/file.te b/vendor/google/file.te
index fa17be6..e93d36f 100644
--- a/vendor/google/file.te
+++ b/vendor/google/file.te
@@ -12,16 +12,12 @@
 type sysfs_power_stats, sysfs_type, fs_type;
 type sysfs_power_stats_ignore, sysfs_type, fs_type;
 type sysfs_camera, sysfs_type, fs_type;
-type sysfs_devcfg, sysfs_type, fs_type;
-type sysfs_msm_boardid, fs_type, sysfs_type;
 type sysfs_iio_devices, fs_type, sysfs_type;
 type sysfs_pixelstats, fs_type, sysfs_type;
 type sysfs_wlc, sysfs_type, fs_type;
 type sysfs_pstore, sysfs_type, fs_type;
 type debugfs_f2fs, debugfs_type, fs_type;
 type proc_f2fs, proc_type, fs_type;
-type debugfs_ufs, debugfs_type, fs_type;
-type sysfs_lights, sysfs_type, fs_type;
 type sysfs_esim, sysfs_type, fs_type;
 type sysfs_imei, sysfs_type, fs_type;
 type debugfs_usb, debugfs_type, fs_type;
@@ -32,10 +28,7 @@
 type debugfs_clk, debugfs_type, fs_type;
 type debugfs_pmic, debugfs_type, fs_type;
 type sysfs_contaminant, sysfs_type, fs_type;
-type hal_neuralnetworks_darwinn_hal_camera_data_file, file_type, data_file_type;
 type hal_rebootescrow_citadel_data_file, file_type, data_file_type;
-type camera_calibration_vendor_data_file, file_type, data_file_type;
-type sysfs_knowles_info, fs_type, sysfs_type;
 type sysfs_fingerprint, sysfs_type, fs_type;
 type sysfs_typec_info, sysfs_type, fs_type;
 type per_boot_file, file_type, data_file_type, core_data_file_type;
diff --git a/vendor/google/file_contexts b/vendor/google/file_contexts
index e4f9661..360c6de 100644
--- a/vendor/google/file_contexts
+++ b/vendor/google/file_contexts
@@ -1,15 +1,11 @@
 # dev nodes
-/dev/abc-pcie-tpu_0                                                                   u:object_r:abc_tpu_device:s0
 /dev/access-metadata                                                                  u:object_r:ramoops_device:s0
 /dev/access-ramoops                                                                   u:object_r:ramoops_device:s0
 /dev/block/zram0                                                                      u:object_r:swap_block_device:s0
 /dev/citadel0                                                                         u:object_r:citadel_device:s0
-/dev/ipu                                                                              u:object_r:ipu_device:s0
-/dev/maxfg_history                                                                    u:object_r:maxfg_device:s0
 /dev/vd6281                                                                           u:object_r:rls_device:s0
 /dev/snd/controlC0                                                                    u:object_r:rls_device:s0
 /dev/sensor_tunnel                                                                    u:object_r:rls_device:s0
-/dev/iaxxx-module-celldrv                                                             u:object_r:pwrstats_device:s0
 /dev/qg                                                                               u:object_r:qg_device:s0
 /dev/qg_battery                                                                       u:object_r:qg_device:s0
 
@@ -59,8 +55,6 @@
 /data/vendor/modem_dump(/.*)?                                                         u:object_r:modem_dump_file:s0
 /data/vendor/tcpdump_logger(/.*)?                                                     u:object_r:tcpdump_vendor_data_file:s0
 /data/vendor_ce/[0-9]+/ramoops(/.*)?                                                  u:object_r:ramoops_vendor_data_file:s0
-/data/vendor/hal_neuralnetworks_darwinn/hal_camera(/.*)?                              u:object_r:hal_neuralnetworks_darwinn_hal_camera_data_file:s0
-/data/vendor/camera_calibration(/.*)?                                                 u:object_r:camera_calibration_vendor_data_file:s0
 /data/vendor/rebootescrow(/.*)?                                                       u:object_r:hal_rebootescrow_citadel_data_file:s0
 /data/per_boot(/.*)?                                                                  u:object_r:per_boot_file:s0
 
diff --git a/vendor/google/genfs_contexts b/vendor/google/genfs_contexts
index 4d5d45d..e722a70 100644
--- a/vendor/google/genfs_contexts
+++ b/vendor/google/genfs_contexts
@@ -1,6 +1,4 @@
 genfscon debugfs /f2fs                                u:object_r:debugfs_f2fs:s0
-genfscon debugfs /1d84000.ufshc                       u:object_r:debugfs_ufs:s0
-genfscon proc /sys/kernel/sched_boost                 u:object_r:proc_sysctl_schedboost:s0
 genfscon sysfs /devices/soc0                          u:object_r:sysfs_soc:s0
 genfscon sysfs /devices/platform/soc/1d84000.ufshc/slowio_read_cnt           u:object_r:sysfs_scsi_devices_0000:s0
 genfscon sysfs /devices/platform/soc/1d84000.ufshc/slowio_write_cnt          u:object_r:sysfs_scsi_devices_0000:s0
@@ -62,7 +60,6 @@
 
 # Display
 genfscon sysfs /devices/platform/soc/soc:qcom,dsi-display-primary/backlight                          u:object_r:sysfs_leds:s0
-genfscon sysfs /devices/platform/soc/soc:qcom,dsi-display-primary/backlight/panel0-backlight/vr_mode u:object_r:sysfs_lights:s0
 genfscon sysfs /devices/platform/soc/soc:qcom,dsi-display-primary/panel_info                         u:object_r:sysfs_display:s0
 genfscon sysfs /devices/platform/soc/soc:qcom,dsi-display-primary/gamma                              u:object_r:sysfs_display:s0
 
@@ -78,9 +75,6 @@
 genfscon sysfs /devices/platform/soc/ac4a000.qcom,cci                           u:object_r:sysfs_camera:s0
 genfscon sysfs /devices/platform/soc/ac4b000.qcom,cci                           u:object_r:sysfs_camera:s0
 
-# Device config (device build)
-genfscon sysfs /firmware/devicetree/base/chosen/cdt/cdb2/devcfg                 u:object_r:sysfs_devcfg:s0
-
 # eSIM status
 genfscon sysfs /firmware/devicetree/base/chosen/cdt/cdb2/esim                   u:object_r:sysfs_esim:s0
 
@@ -124,9 +118,6 @@
 # Audio Dsp for HardwareInfo
 genfscon sysfs /devices/platform/codec_detect/hwinfo_part_number      u:object_r:sysfs_audio:s0
 
-# init_citadel might need to read this
-genfscon sysfs /firmware/devicetree/base/qcom,board-id                     u:object_r:sysfs_msm_boardid:s0
-
 # USB
 genfscon debugfs /usb/tcpm-usbpd0                     u:object_r:debugfs_usb:s0
 genfscon debugfs /logbuffer/usbpd                     u:object_r:debugfs_usb:s0
diff --git a/vendor/google/hwservice.te b/vendor/google/hwservice.te
index 2e8e1a8..45e4f9d 100644
--- a/vendor/google/hwservice.te
+++ b/vendor/google/hwservice.te
@@ -1,5 +1,4 @@
 type hal_pixelstats_hwservice, hwservice_manager_type;
-type hal_darwinn_hwservice, hwservice_manager_type;
 type hal_radioext_hwservice, hwservice_manager_type;
 type hal_wifi_ext_hwservice, hwservice_manager_type;
 type hal_wlc_hwservice, hwservice_manager_type;
diff --git a/vendor/google/hwservice_contexts b/vendor/google/hwservice_contexts
index be2a514..e5c6fe8 100644
--- a/vendor/google/hwservice_contexts
+++ b/vendor/google/hwservice_contexts
@@ -1,6 +1,5 @@
 hardware.google.pixelstats::IPixelStats                         u:object_r:hal_pixelstats_hwservice:s0
 hardware.google.light::ILight                                   u:object_r:hal_light_hwservice:s0
-vendor.google.darwinn.service::IDarwinnService                  u:object_r:hal_darwinn_hwservice:s0
 vendor.google.radioext::IRadioExt                               u:object_r:hal_radioext_hwservice:s0
 vendor.google.wifi_ext::IWifiExt                                u:object_r:hal_wifi_ext_hwservice:s0
 vendor.google.wireless_charger::IWirelessCharger                u:object_r:hal_wlc_hwservice:s0
diff --git a/vendor/google/modem_diagnostics.te b/vendor/google/modem_diagnostics.te
index 6ac73d6..eb89486 100644
--- a/vendor/google/modem_diagnostics.te
+++ b/vendor/google/modem_diagnostics.te
@@ -1,5 +1,4 @@
 type modem_diagnostic_app, domain;
-type modem_diagnostic_app_tmpfs, file_type;
 
 app_domain(modem_diagnostic_app)
 net_domain(modem_diagnostic_app)
diff --git a/vendor/google/property.te b/vendor/google/property.te
index 10916eb..6e9d3ae 100644
--- a/vendor/google/property.te
+++ b/vendor/google/property.te
@@ -1,6 +1,5 @@
 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;
diff --git a/vendor/google/property_contexts b/vendor/google/property_contexts
index a079eb8..db4fa29 100644
--- a/vendor/google/property_contexts
+++ b/vendor/google/property_contexts
@@ -39,7 +39,6 @@
 
 ro.vendor.build.type                            u:object_r:vendor_build_type_prop:s0
 
-ro.vendor.aware_available                       u:object_r:vendor_aware_available_prop:s0
 
 persist.vendor.modem.                           u:object_r:vendor_modem_prop:s0
 persist.vendor.mdm.                             u:object_r:vendor_modem_prop:s0
diff --git a/vendor/qcom/common/device.te b/vendor/qcom/common/device.te
index 211d3d4..db7a09c 100644
--- a/vendor/qcom/common/device.te
+++ b/vendor/qcom/common/device.te
@@ -1,61 +1,17 @@
 type diag_device, dev_type, mlstrustedobject;
-type smem_log_device, dev_type;
-type hsic_device, dev_type;
-type mhi_device, dev_type;
-type bhi_device, dev_type;
-type smd_device, dev_type;
 type rmnet_device, dev_type;
-type thermal_device, dev_type;
-type battery_data_device, dev_type;
 type qdsp_device, dev_type, mlstrustedobject;
-type dsp_device, dev_type;
-type xdsp_device, dev_type;
-type hvdcp_device, dev_type;
-type device_latency, dev_type;
-type  fm_radio_device, dev_type;
-type modem_efs_partition_device, dev_type;
-type ssd_device, dev_type;
-type rpmb_device, dev_type;
+type fm_radio_device, dev_type;
 type sg_device, dev_type;
-type dip_device, dev_type;
-type sd_device, dev_type;
 type ssd_block_device, dev_type;
-type esoc_device, dev_type;
-type ssr_device, dev_type;
 type ramdump_device, dev_type;
-type ksbridgehsic_device, dev_type;
-type efsbridgehsic_device, dev_type;
-type efs_boot_dev, dev_type;
-type mba_debug_dev, dev_type;
-type logdump_partition, dev_type;
-type bootselect_device, dev_type;
 type ipa_dev, dev_type;
-type wcnss_device, dev_type;
-type spcom_device, dev_type;
-type skp_device, dev_type;
-type sp_ssr_device, dev_type;
-type sp_keymaster_device, dev_type;
-type sec_nvm_device, dev_type;
-type cryptoapp_device, dev_type;
-type spdaemon_ssr_device, dev_type;
 type modem_ssr_device, dev_type;
-type qsee_ipc_irq_spss_device, dev_type;
-type gadget_serial_device, dev_type;
-type pta_device, dev_type;
 type qce_device, dev_type;
-type rng_device, dev_type;
-type system_health_monitor_device, dev_type;
-type qbt1000_device, dev_type;
-type avtimer_device, dev_type;
 type at_device, dev_type;
-type bt_device, dev_type;
 type wlan_device, dev_type;
-type rawdump_block_device, dev_type;
 type custom_ab_block_device, dev_type;
 type xbl_block_device, dev_type;
 type gpt_block_device, dev_type;
 type modem_block_device, dev_type;
-type uefi_block_device, dev_type;
 type persist_block_device, dev_type;
-type npu_device, dev_type;
-type devinfo_block_device, dev_type;
diff --git a/vendor/qcom/common/file.te b/vendor/qcom/common/file.te
index c8524e2..eae74fd 100644
--- a/vendor/qcom/common/file.te
+++ b/vendor/qcom/common/file.te
@@ -1,77 +1,27 @@
 type qmuxd_socket, file_type;
 type netmgrd_socket, file_type;
-type vendor_qti_data_file, file_type, data_file_type;
 type proc_wifi_dbg, proc_type, fs_type;
 type proc_swappiness, proc_type, fs_type;
-type qdcmsocket_socket, file_type;
-type cnd_socket, file_type, mlstrustedobject;
 type cnd_data_file, file_type, data_file_type;
 type chre_socket, file_type;
-type sysfs_hsic_modem_wait, sysfs_type, fs_type;
-type sysfs_smd_open_timeout, sysfs_type, fs_type;
 type sysfs_soc, sysfs_type, fs_type;
 type sysfs_msm_subsys, sysfs_type, fs_type;
-type sysfs_spss, sysfs_type, fs_type;
 type netmgrd_data_file, file_type, data_file_type;
-type sysrq_trigger_proc, fs_type, mlstrustedobject;
-type persist_bluetooth_file, file_type , vendor_persist_type;
 type persist_camera_file, file_type , vendor_persist_type;
-type persist_data_file, file_type , vendor_persist_type;
 type persist_drm_file, file_type , vendor_persist_type;
-type data_qtee_file, file_type, data_file_type;
 type dataadpl_socket, file_type;
-type vendor_persist_mmi_file, file_type, vendor_persist_type;
-type persist_misc_file, file_type , vendor_persist_type;
-type persist_bms_file, file_type , vendor_persist_type;
-type persist_secnvm_file, file_type , vendor_persist_type;
 type persist_hvdcp_file, file_type , vendor_persist_type;
 type persist_audio_file, file_type , vendor_persist_type;
-type proc_sysctl_schedboost, proc_type, fs_type;
 type proc_irq, fs_type, proc_type;
-type sysfs_irq, fs_type, sysfs_type;
-type irqbalance_socket, file_type;
-type sensors_socket, file_type;
 type sensors_persist_file, file_type, vendor_persist_type;
 type persist_sensors_reg_fac_file, file_type, vendor_persist_type;
-type sysfs_sensors, sysfs_type, fs_type;
-type thermal_socket, file_type;
-type sysfs_msmuart_file, sysfs_type, fs_type;
-type rfs_system_file, system_file_type, file_type;
-type rfs_file, file_type, data_file_type;
-type rfs_shared_hlos_file, file_type, data_file_type;
 type persist_rfs_file, file_type, vendor_persist_type;
 type persist_rfs_shared_hlos_file, file_type, vendor_persist_type;
 type sysfs_graphics, sysfs_type, fs_type;
 type sysfs_graphics_unused, sysfs_type, fs_type;
-type sysfs_usb_supply, sysfs_type, fs_type;
-type sysfs_battery_supply, sysfs_type, fs_type;
-type sysfs_usbpd_device, sysfs_type, fs_type;
-type sysfs_vadc_dev, sysfs_type, fs_type;
-type sysfs_spmi_dev, sysfs_type, fs_type;
-type sysfs_poweron_alarm, sysfs_type, fs_type;
-type sysfs_mpdecision, fs_type, sysfs_type;
-type sysfs_rqstats, fs_type, sysfs_type;
-type sysfs_cpu_online, fs_type, sysfs_type;
-type mpctl_socket, file_type, mlstrustedobject;
-type mpctl_data_file, file_type, data_file_type;
-type lm_data_file, file_type, data_file_type;
-type sysfs_devfreq, fs_type, sysfs_type;
-type sysfs_devfreq_l3cdsp, fs_type, sysfs_type;
-type sysfs_mmc_host, fs_type, sysfs_type;
-type sysfs_scsi_host, fs_type, sysfs_type;
-type sysfs_cpu_boost, fs_type, sysfs_type;
-type sysfs_msm_perf, fs_type, sysfs_type;
-type sysfs_memory, fs_type, sysfs_type;
-type sysfs_lib, fs_type, sysfs_type;
-type sysfs_slpi, fs_type, sysfs_type;
-type sysfs_process_reclaim, fs_type, sysfs_type;
-type sysfs_vmpressure, fs_type, sysfs_type;
 type sysfs_msm_boot, fs_type, sysfs_type;
 type sysfs_timestamp_switch, sysfs_type, fs_type;
-type iop_socket, file_type;
-type iop_data_file, file_type, data_file_type;
 type ims_socket, file_type;
-type ssgqmig_socket, file_type, mlstrustedobject;
 type ssgtzd_socket, file_type, mlstrustedobject;
 type location_data_file, file_type, data_file_type;
 type location_socket, file_type, data_file_type;
@@ -79,67 +29,23 @@
 type sysfs_esoc, sysfs_type, fs_type;
 type sysfs_ssr,  sysfs_type, fs_type;
 type sysfs_ssr_writable, sysfs_type, fs_type;
-type sysfs_ssr_toggle,  sysfs_type, fs_type;
-type sysfs_hsic, sysfs_type, fs_type;
-type sysfs_hsic_host_rdy, sysfs_type, fs_type;
-type sysfs_socinfo, fs_type, sysfs_type;
-type qlogd_socket, file_type, mlstrustedobject;
 type display_vendor_data_file, file_type, data_file_type;
 type persist_display_file, file_type, vendor_persist_type;
-type ipacm_socket, file_type;
 type ipa_vendor_data_file, file_type, data_file_type;
 type camera_vendor_data_file, file_type, data_file_type;
-type vendor_tombstone_data_file, file_type, data_file_type;
-type port_bridge_data_file, file_type, data_file_type;
-type bt_firmware_file, file_type, contextmount_type, vendor_file_type;
-type proc_dirty_ratio, fs_type, proc_type;
 type sysfs_rmtfs, sysfs_type, fs_type;
 type adsprpcd_file, file_type, mlstrustedobject, vendor_file_type;
-type regionalization_file, file_type , vendor_persist_type;
-type vendor_carrier_file, file_type, vendor_file_type;
-type swap_data_file, file_type, data_file_type;
-type dynamic_nv_data_file, file_type, data_file_type;
-type wifi_vendor_data_file, file_type, data_file_type;
-type wifi_vendor_wpa_socket, file_type, data_file_type;
-type vendor_mediadrm_data_file, file_type, data_file_type;
-type wififtmd_socket, file_type;
-type persist_alarm_file, file_type, vendor_persist_type;
 type persist_time_file, file_type, vendor_persist_type;
-type nfc_vendor_data_file, file_type, data_file_type;
-type sysfs_kgsl, sysfs_type, fs_type;
 type sysfs_kgsl_proc, sysfs_type, fs_type;
-type sysfs_kgsl_snapshot, sysfs_type, fs_type;
-type sysfs_securetouch, fs_type, sysfs_type;
-type sysfs_data, fs_type, sysfs_type;
 type sysfs_diag, fs_type, sysfs_type;
-type qti_debugfs, fs_type, debugfs_type;
 type vendor_radio_data_file, file_type, data_file_type, mlstrustedobject;
-type vendor_mbn_data_file, file_type, data_file_type;
-type sysfs_uio_file, fs_type, sysfs_type;
-type sysfs_irqbalance , sysfs_type, fs_type;
-type vendor_camera_data_file, file_type, data_file_type;
-type vendor_media_data_file, file_type, data_file_type;
 type sensors_vendor_data_file, file_type, data_file_type;
-type sysfs_bond0, fs_type, sysfs_type;
-type sysfs_ea, fs_type, sysfs_type;
 type sysfs_audio, fs_type, sysfs_type;
 type audio_vendor_data_file, file_type, data_file_type;
-type sysfs_msm_stats, fs_type, sysfs_type;
-type sysfs_msm_power, fs_type, sysfs_type;
-type sysfs_fm, sysfs_type, fs_type;
-type sysfs_boot_adsp, sysfs_type, fs_type;
-type data_tzstorage_file, file_type, data_file_type;
-type data_qsee_file, file_type, data_file_type;
-type sysfs_sectouch, sysfs_type, fs_type;
 type vendor_tui_data_file, file_type, data_file_type;
-type vendor_bt_data_file, file_type, data_file_type;
-type sysfs_jpeg, fs_type, sysfs_type;
 type ramdump_vendor_data_file, file_type, data_file_type, mlstrustedobject;
 type ramdump_vendor_mnt_file, file_type, data_file_type, mlstrustedobject;
 
-type sysfs_npu, fs_type, sysfs_type;
-type vendor_ramdump_data_file, file_type, data_file_type;
-type vendor_mdmhelperdata_data_file, file_type, data_file_type;
 type ssr_log_file, file_type, data_file_type;
 typeattribute mnt_vendor_file vendor_persist_type;
 type hal_neuralnetworks_data_file, file_type, data_file_type;
@@ -154,4 +60,3 @@
 type debugfs_ion, debugfs_type, fs_type;
 type debugfs_tzdbg, debugfs_type, fs_type;
 type cnss_vendor_data_file, file_type, data_file_type, mlstrustedobject;
-type modem_fdr_file, file_type, data_file_type;
diff --git a/vendor/qcom/common/file_contexts b/vendor/qcom/common/file_contexts
index 2f120f1..5c77c16 100644
--- a/vendor/qcom/common/file_contexts
+++ b/vendor/qcom/common/file_contexts
@@ -26,7 +26,6 @@
 /(vendor|system/vendor)/bin/sensors.qcom        u:object_r:sensors_exec:s0
 /(vendor|system/vendor)/bin/sensors.qti         u:object_r:sensors_exec:s0
 /(vendor|system/vendor)/bin/test_diag           u:object_r:diag_exec:s0
-/system/rfs.*                                   u:object_r:rfs_system_file:s0
 /(vendor|system/vendor)/bin/time_daemon         u:object_r:time_daemon_exec:s0
 /(vendor|system/vendor)/bin/rmt_storage         u:object_r:rmt_storage_exec:s0
 /(vendor|system/vendor)/bin/tftp_server         u:object_r:rfs_access_exec:s0
@@ -83,12 +82,10 @@
 
 # dev socket nodes
 /dev/socket/chre                                u:object_r:chre_socket:s0
-/dev/socket/msm_irqbalance                      u:object_r:irqbalance_socket:s0
 /dev/socket/qmux_radio(/.*)?                    u:object_r:qmuxd_socket:s0
 /dev/socket/netmgr(/.*)?                        u:object_r:netmgrd_socket:s0
 /dev/socket/ims_qmid                            u:object_r:ims_socket:s0
 /dev/socket/ims_datad                           u:object_r:ims_socket:s0
-/dev/socket/cnd                                 u:object_r:cnd_socket:s0
 /dev/socket/ssgtzd                              u:object_r:ssgtzd_socket:s0
 /dev/socket/adpl_cmd_uds_file                   u:object_r:dataadpl_socket:s0
 
@@ -96,11 +93,9 @@
 # persist files
 #
 /mnt/vendor/persist/camera(/.*)?                                               u:object_r:persist_camera_file:s0
-/mnt/vendor/persist/bluetooth(/.*)?                                            u:object_r:persist_bluetooth_file:s0
 /mnt/vendor/persist/drm(/.*)?                                                  u:object_r:persist_drm_file:s0
 /mnt/vendor/persist/sensors(/.*)?                                              u:object_r:sensors_persist_file:s0
 /mnt/vendor/persist/sensors/registry/factory_data(/.*)?                        u:object_r:persist_sensors_reg_fac_file:s0
-/mnt/vendor/persist/alarm(/.*)?                                                u:object_r:persist_alarm_file:s0
 /mnt/vendor/persist/time(/.*)?                                                 u:object_r:persist_time_file:s0
 /mnt/vendor/persist/data(/.*)?                                                 u:object_r:persist_drm_file:s0
 /mnt/vendor/persist/data/tz(/.*)?                                              u:object_r:persist_drm_file:s0
@@ -108,11 +103,6 @@
 /mnt/vendor/persist/hlos_rfs(/.*)?                                             u:object_r:persist_rfs_shared_hlos_file:s0
 /mnt/vendor/persist/display(/.*)?                                              u:object_r:persist_display_file:s0
 /mnt/vendor/persist/rfs.*                                                      u:object_r:persist_rfs_file:s0
-/mnt/vendor/persist/speccfg(/.*)?                                              u:object_r:regionalization_file:s0
-/mnt/vendor/persist/misc(/.*)?                                                 u:object_r:persist_misc_file:s0
-/mnt/vendor/persist/bms(/.*)?                                                  u:object_r:persist_bms_file:s0
-/mnt/vendor/persist/secnvm(/.*)?                                               u:object_r:persist_secnvm_file:s0
-/mnt/vendor/persist/FTM_AP(/.*)?                                               u:object_r:vendor_persist_mmi_file:s0
 /mnt/vendor/persist/hvdcp_opti(/.*)?                                           u:object_r:persist_hvdcp_file:s0
 /mnt/vendor/persist/audio(/.*)?                                                u:object_r:persist_audio_file:s0
 
@@ -135,7 +125,6 @@
 ###################################
 # vendor files
 #
-/vendor/package(/.*)?                      u:object_r:vendor_carrier_file:s0
 /vendor/package(/.*)?/overlay(/.*)?        u:object_r:vendor_overlay_file:s0
 /vendor/package(/.*)?/app(/.*)?            u:object_r:vendor_app_file:s0
 
@@ -216,7 +205,6 @@
 ###################################
 # firmware images
 #
-/vendor/bt_firmware(/.*)?                                           u:object_r:bt_firmware_file:s0
 
 #Android NN Driver
 /(vendor|system/vendor)/bin/hw/android\.hardware\.neuralnetworks@1\.3-service-qti u:object_r:hal_neuralnetworks_default_exec:s0
@@ -239,14 +227,8 @@
 /dev/adsprpc-smd-secure                         u:object_r:qdsp_device:s0
 /dev/kgsl-3d0                                   u:object_r:gpu_device:s0
 /dev/wlan                                       u:object_r:wlan_device:s0
-/dev/smem_log                                   u:object_r:smem_log_device:s0
 /dev/subsys_modem                               u:object_r:modem_ssr_device:s0
 /dev/diag                                       u:object_r:diag_device:s0
-/dev/sp_kernel                                  u:object_r:skp_device:s0
-/dev/qsee_ipc_irq_spss                          u:object_r:qsee_ipc_irq_spss_device:s0
-/dev/spcom                                      u:object_r:spcom_device:s0
-/dev/sp_ssr                                     u:object_r:sp_ssr_device:s0
-/dev/sp_keymaster                               u:object_r:sp_keymaster_device:s0
 /dev/btpower                                    u:object_r:hci_attach_dev:s0
 /dev/ttyHS0                                     u:object_r:hci_attach_dev:s0
 /dev/ttyMSM0                                    u:object_r:tty_device:s0
@@ -260,7 +242,6 @@
 /dev/qce                                        u:object_r:qce_device:s0
 
 # dev socket nodes
-/dev/socket/ipacm_log_file                      u:object_r:ipacm_socket:s0
 /dev/socket/location(/.*)?                      u:object_r:location_socket:s0
 /dev/socket/wifihal(/.*)?                       u:object_r:wifihal_socket:s0
 
@@ -274,7 +255,6 @@
 /data/vendor/rfs/mpss(/.*)?            u:object_r:mpss_rfs_data_file:s0
 /data/vendor/radio(/.*)?               u:object_r:vendor_radio_data_file:s0
 /data/vendor/netmgr(/.*)?              u:object_r:netmgrd_data_file:s0
-/data/vendor/modem_fdr(/.*)?           u:object_r:modem_fdr_file:s0
 /data/vendor/mediadrm(/.*)?            u:object_r:mediadrm_vendor_data_file:s0
 /data/vendor/nnhal(/.*)?               u:object_r:hal_neuralnetworks_data_file:s0
 /data/vendor/ramdump(/.*)?             u:object_r:ramdump_vendor_data_file:s0
@@ -288,8 +268,6 @@
 /data/vendor/time(/.*)?                u:object_r:time_data_file:s0
 
 # spdaemon and sec_nvm files
-/dev/spdaemon_ssr                               u:object_r:spdaemon_ssr_device:s0
-/dev/sec_nvm_.*                                 u:object_r:sec_nvm_device:s0
 
 # cnss_diag files
 /data/vendor/wifi/cnss_diag(/.*)?               u:object_r:cnss_vendor_data_file:s0
diff --git a/vendor/qcom/common/genfs_contexts b/vendor/qcom/common/genfs_contexts
index 79e0d18..2188997 100644
--- a/vendor/qcom/common/genfs_contexts
+++ b/vendor/qcom/common/genfs_contexts
@@ -6,7 +6,6 @@
 genfscon sysfs /devices/virtual/kgsl/kgsl/proc                                                                                         u:object_r:sysfs_kgsl_proc:s0
 genfscon sysfs /devices/platform/soc/0.qcom,rmtfs_sharedmem                                                                            u:object_r:sysfs_rmtfs:s0
 genfscon sysfs /devices/platform/soc/soc:qcom,kgsl-hyp                                                                                 u:object_r:sysfs_msm_subsys:s0
-genfscon sysfs /devices/platform/soc/soc:qcom,spss_utils                                                                               u:object_r:sysfs_spss:s0
 genfscon sysfs /bus/esoc                                                                                                               u:object_r:sysfs_esoc:s0
 genfscon sysfs /bus/msm_subsys                                                                                                         u:object_r:sysfs_msm_subsys:s0
 genfscon debugfs /wlan                                                                                                                 u:object_r:debugfs_wlan:s0
@@ -22,9 +21,6 @@
 genfscon sysfs /devices/platform/soc/ae00000.qcom,mdss_rotator                                                                         u:object_r:sysfs_msm_subsys:s0
 genfscon sysfs /devices/platform/soc/18800000.qcom,icnss/net                                                                           u:object_r:sysfs_net:s0
 genfscon sysfs /module/diagchar/parameters/timestamp_switch                                                                            u:object_r:sysfs_timestamp_switch:s0
-genfscon sysfs /devices/platform/soc/soc:qcom,ipa_fws@1e08000                                                                          u:object_r:sysfs_data:s0
-genfscon sysfs /devices/virtual/xt_hardidletimer/timers                                                                                u:object_r:sysfs_data:s0
-genfscon sysfs /devices/virtual/xt_idletimer/timers                                                                                    u:object_r:sysfs_data:s0
 genfscon sysfs /devices/platform/vim2m.0/video4linux/video0/name                                                                       u:object_r:sysfs_graphics_unused:s0
 genfscon sysfs /devices/platform/vicodec.0/video4linux/video1/name                                                                     u:object_r:sysfs_graphics_unused:s0
 genfscon sysfs /devices/platform/vicodec.0/video4linux/video2/name                                                                     u:object_r:sysfs_graphics_unused:s0
diff --git a/vendor/qcom/common/hwservice.te b/vendor/qcom/common/hwservice.te
index 2056fb4..bb9f8f1 100644
--- a/vendor/qcom/common/hwservice.te
+++ b/vendor/qcom/common/hwservice.te
@@ -2,20 +2,13 @@
 type hal_iwlan_hwservice, hwservice_manager_type;
 type hal_display_config_hwservice, hwservice_manager_type;
 type hal_display_postproc_hwservice, hwservice_manager_type;
-type hal_dpmqmi_hwservice, hwservice_manager_type;
 type hal_imsrtp_hwservice, hwservice_manager_type;
 type hal_imscallinfo_hwservice, hwservice_manager_type;
 type hal_datafactory_hwservice, hwservice_manager_type;
 type hal_cne_hwservice, hwservice_manager_type;
-type hal_latency_hwservice, hwservice_manager_type;
 type hal_imsrcsd_hwservice, hwservice_manager_type;
-type hal_ipacm_hwservice, hwservice_manager_type;
 type hal_qteeconnector_hwservice, hwservice_manager_type;
-type hal_voiceprint_hwservice, hwservice_manager_type;
-type vendor_hal_factory_qti_hwservice, hwservice_manager_type;
 type hal_tui_comm_hwservice, hwservice_manager_type;
-type hal_qdutils_disp_hwservice, hwservice_manager_type;
-type hal_sensorscalibrate_qti_hwservice, hwservice_manager_type;
 type vnd_atcmdfwd_hwservice, hwservice_manager_type;
 type hal_dataconnection_hwservice, hwservice_manager_type;
 type hal_bluetooth_coexistence_hwservice, hwservice_manager_type;
diff --git a/vendor/qcom/common/hwservice_contexts b/vendor/qcom/common/hwservice_contexts
index cda6939..c04eb35 100644
--- a/vendor/qcom/common/hwservice_contexts
+++ b/vendor/qcom/common/hwservice_contexts
@@ -1,4 +1,3 @@
-com.qualcomm.qti.dpm.api::IdpmQmi                                       u:object_r:hal_dpmqmi_hwservice:s0
 com.qualcomm.qti.qcril.qcrilhook::IQtiOemHook                           u:object_r:hal_telephony_hwservice:s0
 vendor.qti.hardware.data.iwlan::IIWlan                                  u:object_r:hal_iwlan_hwservice:s0
 com.qualcomm.qti.uceservice::IUceService                                u:object_r:hal_imsrcsd_hwservice:s0
@@ -10,7 +9,6 @@
 vendor.qti.hardware.display.mapper::IQtiMapper                          u:object_r:hal_graphics_mapper_hwservice:s0
 vendor.qti.hardware.bluetooth_sar::IBluetoothSar                        u:object_r:hal_bluetooth_coexistence_hwservice:s0
 vendor.qti.hardware.bt_channel_avoidance::IBTChannelAvoidance           u:object_r:hal_bluetooth_coexistence_hwservice:s0
-vendor.qti.hardware.qdutils_disp::IQdutilsDisp                          u:object_r:hal_qdutils_disp_hwservice:s0
 vendor.qti.hardware.qteeconnector::IAppConnector                        u:object_r:hal_qteeconnector_hwservice:s0
 vendor.qti.hardware.qteeconnector::IGPAppConnector                      u:object_r:hal_qteeconnector_hwservice:s0
 vendor.qti.hardware.radio.am::IQcRilAudio                               u:object_r:hal_telephony_hwservice:s0
@@ -22,10 +20,8 @@
 vendor.qti.hardware.radio.uim_remote_client::IUimRemoteServiceClient    u:object_r:hal_telephony_hwservice:s0
 vendor.qti.hardware.radio.uim::IUim                                     u:object_r:hal_telephony_hwservice:s0
 vendor.qti.hardware.radio.ims::IImsRadio                                u:object_r:hal_telephony_hwservice:s0
-vendor.qti.hardware.sensorscalibrate::ISensorsCalibrate                 u:object_r:hal_sensorscalibrate_qti_hwservice:s0
 vendor.qti.hardware.tui_comm::ITuiComm                                  u:object_r:hal_tui_comm_hwservice:s0
 vendor.qti.hardware.radio.atcmdfwd::IAtCmdFwd                           u:object_r:vnd_atcmdfwd_hwservice:s0
-vendor.qti.hardware.data.latency::ILinkLatency                          u:object_r:hal_latency_hwservice:s0
 vendor.qti.data.factory::IFactory                                       u:object_r:hal_datafactory_hwservice:s0
 vendor.qti.ims.factory::IImsFactory                                     u:object_r:hal_imsfactory_hwservice:s0
 vendor.qti.imsrtpservice::IRTPService                                   u:object_r:hal_imsrtp_hwservice:s0
diff --git a/vendor/qcom/common/property.te b/vendor/qcom/common/property.te
index e088dad..32d325b 100644
--- a/vendor/qcom/common/property.te
+++ b/vendor/qcom/common/property.te
@@ -1,62 +1,17 @@
-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;
diff --git a/vendor/qcom/common/property_contexts b/vendor/qcom/common/property_contexts
index 60f34de..07af86e 100644
--- a/vendor/qcom/common/property_contexts
+++ b/vendor/qcom/common/property_contexts
@@ -59,7 +59,6 @@
 vendor.wlan.driver.version                      u:object_r:vendor_wifi_version:s0
 vendor.wlan.firmware.version                    u:object_r:vendor_wifi_version:s0
 vendor.radio                                    u:object_r:vendor_radio_prop:s0
-vendor.spcom.                                   u:object_r:spcomlib_prop:s0
 vendor.sys.modem.diag.                          u:object_r:vendor_modem_diag_prop:s0
 vendor.debug.ssrdump                            u:object_r:vendor_ssr_prop:s0
 
@@ -67,7 +66,6 @@
 persist.vendor.sys.crash_rcu                    u:object_r:vendor_ramdump_prop:s0
 persist.vendor.sys.ssr.                         u:object_r:vendor_ssr_prop:s0
 
-ctl.vendor.rmt_storage                          u:object_r:ctl_vendor_rmt_storage_prop:s0
 
 vendor.sys.adsp.firmware.version                u:object_r:public_vendor_system_prop:s0
 
diff --git a/vendor/qcom/common/service.te b/vendor/qcom/common/service.te
index c2ea2f6..e69de29 100644
--- a/vendor/qcom/common/service.te
+++ b/vendor/qcom/common/service.te
@@ -1,6 +0,0 @@
-type wbc_service,                 service_manager_type;
-type dun_service,                 service_manager_type;
-type imsrcs_service,              service_manager_type;
-type improve_touch_service,       service_manager_type;
-type gba_auth_service,            service_manager_type;
-type qtitetherservice_service,    service_manager_type;
diff --git a/vendor/qcom/sm7250/file_contexts b/vendor/qcom/sm7250/file_contexts
index 625f78d..1007b21 100644
--- a/vendor/qcom/sm7250/file_contexts
+++ b/vendor/qcom/sm7250/file_contexts
@@ -9,7 +9,6 @@
 /dev/block/platform/soc/1d84000\.ufshc/by-name/cmnlib64_[ab]       u:object_r:custom_ab_block_device:s0
 /dev/block/platform/soc/1d84000\.ufshc/by-name/cmnlib_[ab]         u:object_r:custom_ab_block_device:s0
 /dev/block/platform/soc/1d84000\.ufshc/by-name/devcfg_[ab]         u:object_r:custom_ab_block_device:s0
-/dev/block/platform/soc/1d84000\.ufshc/by-name/devinfo             u:object_r:devinfo_block_device:s0
 /dev/block/platform/soc/1d84000\.ufshc/by-name/dtbo_[ab]           u:object_r:custom_ab_block_device:s0
 /dev/block/platform/soc/1d84000\.ufshc/by-name/featenabler_[ab]    u:object_r:custom_ab_block_device:s0
 /dev/block/platform/soc/1d84000\.ufshc/by-name/frp                 u:object_r:frp_block_device:s0