db845c: Make userdata formattable am: 650d7b5440 am: ce06042c3f
Change-Id: I9dd27310125e3adf50ef7a071e2f9d22e218acf0
diff --git a/fstab.common b/fstab.common
index 7ccfed5..ad29337 100644
--- a/fstab.common
+++ b/fstab.common
@@ -2,5 +2,5 @@
#<src> <mnt_point> <type> <mnt_flags and options> <fs_mgr_flags>
# The filesystem that contains the filesystem checker binary (typically /system) cannot
# specify MF_CHECK, and must come before any filesystems that do specify MF_CHECK
-LABEL=data /data ext4 discard,noauto_da_alloc,data=ordered,user_xattr,barrier=1 wait
+/dev/block/platform/soc@0/1d84000.ufshc/by-name/userdata /data ext4 discard,noauto_da_alloc,data=ordered,user_xattr,barrier=1 wait,formattable
/dev/block/by-name/metadata /metadata ext4 noatime,nosuid,nodev,discard wait,formattable
diff --git a/sepolicy/file_contexts b/sepolicy/file_contexts
index 81edb8c..f1d323c 100644
--- a/sepolicy/file_contexts
+++ b/sepolicy/file_contexts
@@ -11,6 +11,8 @@
/sys/devices/platform/soc@0/ae00000.mdss u:object_r:sysfs_gpu:s0
/sys/devices/platform/soc@0/c440000.spmi/spmi-0/0-00/c440000.spmi:pmic@0:rtc@6000/rtc u:object_r:sysfs_rtc:s0
+/dev/block/platform/soc@0/1d84000\.ufshc/by-name/userdata u:object_r:userdata_block_device:s0
+
/vendor/bin/hw/android\.hardware\.gatekeeper@1\.0-service\.software u:object_r:hal_gatekeeper_default_exec:s0
/vendor/lib(64)?/dri/.* u:object_r:same_process_hal_file:s0