[coastguard skipped] Merge sparse cherrypicks from sparse-10683547-L40900000963064768 into udc-d1-release.

COASTGUARD_SKIP: Ie6db9d6241417e4d03bf11f579fc548f9ddc3e17
COASTGUARD_SKIP: I48ef806f9f3ad4f5edb96b8f83a5bd23e04c22c6

Change-Id: Ie38a476e56497ae16ca4dba4bfceb7fb8d7211f3

vendor/file_contexts

diff --git a/vendor/file_contexts b/vendor/file_contexts
index f5e254f..c601837 100644
--- a/vendor/file_contexts
+++ b/vendor/file_contexts
@@ -27,9 +27,6 @@
 /vendor/bin/hw/android\.hardware\.security\.keymint-service\.trusty         u:object_r:hal_keymint_default_exec:s0
 /vendor/bin/hw/android\.hardware\.security\.keymint-service\.rust\.trusty         u:object_r:hal_keymint_default_exec:s0
 /vendor/bin/ufs_firmware_update\.sh                                         u:object_r:ufs_firmware_update_exec:s0
-/vendor/bin/thermistor_log\.sh                                              u:object_r:thermistor_log_exec:s0
-/vendor/bin/mark_normal_boot\.sh                                            u:object_r:thermistor_log_exec:s0
-/vendor/bin/mark_recovery_boot\.sh                                          u:object_r:thermistor_log_exec:s0
 /vendor/bin/hw/android\.hardware\.memtrack-service\.pixel                   u:object_r:hal_memtrack_default_exec:s0
 /vendor/bin/hw/disable_contaminant_detection\.sh                            u:object_r:disable-contaminant-detection-sh_exec:s0
 

vendor/hal_power_default.te

diff --git a/vendor/hal_power_default.te b/vendor/hal_power_default.te
index 64521fb..1f0cd3a 100644
--- a/vendor/hal_power_default.te
+++ b/vendor/hal_power_default.te
@@ -5,4 +5,5 @@
 allow hal_power_default sysfs_display:file rw_file_perms;
 allow hal_power_default sysfs_trusty:file rw_file_perms;
 allow hal_power_default sysfs_ospm:file rw_file_perms;
+allow hal_power_default sysfs_scsi_devices_0000:file rw_file_perms;
 set_prop(hal_power_default, vendor_camera_prop);

vendor/recovery.te

diff --git a/vendor/recovery.te b/vendor/recovery.te
index bc844f7..efbea53 100644
--- a/vendor/recovery.te
+++ b/vendor/recovery.te
@@ -4,8 +4,5 @@
   allow recovery tee_device:chr_file rw_file_perms;
   allow recovery sysfs_scsi_devices_0000:file r_file_perms;
   allow recovery sysfs_scsi_devices_0000:dir r_dir_perms;
-  allow recovery sysfs_thermal:file r_file_perms;
-  allow recovery persist_file:file rw_file_perms;
-  allow recovery thermistor_log_exec:file execute_no_trans;
   set_prop(recovery, boottime_prop)
 ')

vendor/ufs_firmware_update.te

diff --git a/vendor/ufs_firmware_update.te b/vendor/ufs_firmware_update.te
index 03c4028..04e532e 100644
--- a/vendor/ufs_firmware_update.te
+++ b/vendor/ufs_firmware_update.te
@@ -10,13 +10,3 @@
   allow ufs_firmware_update sysfs:dir r_dir_perms;
   allow ufs_firmware_update sysfs_scsi_devices_0000:file r_file_perms;
 ')
-
-type thermistor_log, domain;
-type thermistor_log_exec, vendor_file_type, exec_type, file_type;
-recovery_only(`
-  init_daemon_domain(thermistor_log)
-  allow thermistor_log sysfs_thermal:file r_file_perms;
-  allow thermistor_log persist_file:file rw_file_perms;
-')
-
-