Snap for 10103804 from 3ae91d9c27e1301538b8f1de59067ddc6e63f0b6 to mainline-tzdata5-release
Change-Id: I2bf168ce159aa55c286c38d5d39fa42a8e8c1c96
diff --git a/bluejay/genfs_contexts b/bluejay/genfs_contexts
index 0e9b2a8..6b11056 100644
--- a/bluejay/genfs_contexts
+++ b/bluejay/genfs_contexts
@@ -4,3 +4,8 @@
genfscon sysfs /devices/platform/10970000.hsi2c/i2c-6/i2c-cs40l26a u:object_r:sysfs_vibrator:s0
genfscon sysfs /devices/platform/10970000.hsi2c/i2c-7/i2c-cs40l26a u:object_r:sysfs_vibrator:s0
genfscon sysfs /devices/platform/10970000.hsi2c/i2c-8/i2c-cs40l26a u:object_r:sysfs_vibrator:s0
+
+# Storage
+genfscon sysfs /devices/platform/14700000.ufs/vendor u:object_r:sysfs_scsi_devices_0000:s0
+genfscon sysfs /devices/platform/14700000.ufs/model u:object_r:sysfs_scsi_devices_0000:s0
+genfscon sysfs /devices/platform/14700000.ufs/rev u:object_r:sysfs_scsi_devices_0000:s0
diff --git a/tracking_denials/bug_map b/tracking_denials/bug_map
index 7752139..5aa59ad 100644
--- a/tracking_denials/bug_map
+++ b/tracking_denials/bug_map
@@ -5,6 +5,7 @@
dump_stm sysfs_spi dir b/268147400
dump_storage radio_vendor_data_file file b/269218359
dump_storage vendor_slog_file file b/269218359
+dump_trusty modem_efs_file file b/277529247
dumpstate app_zygote process b/238263942
dumpstate system_data_file dir b/261932945
hal_dumpstate_default dump_ramdump process b/270247072
diff --git a/tracking_denials/hal_vibrator_default.te b/tracking_denials/hal_vibrator_default.te
new file mode 100644
index 0000000..f634fe6
--- /dev/null
+++ b/tracking_denials/hal_vibrator_default.te
@@ -0,0 +1,2 @@
+# b/275645961
+dontaudit hal_vibrator_default service_manager_type:service_manager find;
diff --git a/vendor/device.te b/vendor/device.te
new file mode 100644
index 0000000..d2a91db
--- /dev/null
+++ b/vendor/device.te
@@ -0,0 +1,2 @@
+# Block Devices
+type fips_block_device, dev_type;
diff --git a/vendor/file_contexts b/vendor/file_contexts
new file mode 100644
index 0000000..a273c79
--- /dev/null
+++ b/vendor/file_contexts
@@ -0,0 +1,5 @@
+# Binaries
+/vendor/bin/ufs_firmware_update\.sh u:object_r:ufs_firmware_update_exec:s0
+
+# Devices
+/dev/block/platform/14700000\.ufs/by-name/fips u:object_r:fips_block_device:s0
diff --git a/vendor/ufs_firmware_update.te b/vendor/ufs_firmware_update.te
new file mode 100644
index 0000000..53ceba5
--- /dev/null
+++ b/vendor/ufs_firmware_update.te
@@ -0,0 +1,10 @@
+type ufs_firmware_update, domain;
+type ufs_firmware_update_exec, vendor_file_type, exec_type, file_type;
+
+init_daemon_domain(ufs_firmware_update)
+
+allow ufs_firmware_update vendor_toolbox_exec:file execute_no_trans;
+allow ufs_firmware_update block_device:dir r_dir_perms;
+allow ufs_firmware_update fips_block_device:blk_file rw_file_perms;
+allow ufs_firmware_update sysfs:dir r_dir_perms;
+allow ufs_firmware_update sysfs_scsi_devices_0000:file r_file_perms;
