Merge "Revert "Add ro.fstype.data to indicate fs type of /data"" into main
diff --git a/private/compat/202404/202404.ignore.cil b/private/compat/202404/202404.ignore.cil
index efeeff7..2a11a55 100644
--- a/private/compat/202404/202404.ignore.cil
+++ b/private/compat/202404/202404.ignore.cil
@@ -8,7 +8,6 @@
profcollectd_etr_prop
fs_bpf_lmkd_memevents_rb
fs_bpf_lmkd_memevents_prog
- fstype_prop
binderfs_logs_transactions
binderfs_logs_transaction_history
proc_compaction_proactiveness
diff --git a/private/property_contexts b/private/property_contexts
index d22ee7d..81370c0 100644
--- a/private/property_contexts
+++ b/private/property_contexts
@@ -973,7 +973,6 @@
ro.boottime.init.mount.data u:object_r:boottime_public_prop:s0 exact string
ro.boottime.init.fsck.data u:object_r:boottime_public_prop:s0 exact string
-ro.fstype.data u:object_r:fstype_prop:s0 exact string
ro.build.characteristics u:object_r:build_prop:s0 exact string
ro.build.date u:object_r:build_prop:s0 exact string
diff --git a/private/vendor_init.te b/private/vendor_init.te
index 72157ad..6944a41 100644
--- a/private/vendor_init.te
+++ b/private/vendor_init.te
@@ -15,10 +15,6 @@
# Let vendor_init use apex.<name>.ready to start services from vendor APEX
get_prop(vendor_init, apex_ready_prop)
-# Let vendor_init read ro.fstype.data to process init.rc triggers
-# for this property
-get_prop(vendor_init, fstype_prop)
-
# chown/chmod on devices, e.g. /dev/ttyHS0
allow vendor_init {
dev_type
diff --git a/public/property.te b/public/property.te
index f6f9f9b..47a1bde 100644
--- a/public/property.te
+++ b/public/property.te
@@ -77,7 +77,6 @@
system_restricted_prop(device_config_vendor_system_native_boot_prop)
system_restricted_prop(drm_forcel3_prop)
system_restricted_prop(fingerprint_prop)
-system_restricted_prop(fstype_prop)
system_restricted_prop(gwp_asan_prop)
system_restricted_prop(hal_instrumentation_prop)
system_restricted_prop(userdebug_or_eng_prop)