Updating for metadata fbe decryption

diff --git a/BoardConfig.mk b/BoardConfig.mk
index 111b78de2e7a9aa89c776ccb25e21c083e2df221..aa46766e78ccecc5c230c0a3a6b830e7caba0813 100644 (file)
--- a/BoardConfig.mk
+++ b/BoardConfig.mk
@@ -125,6 +125,7 @@ AB_OTA_PARTITIONS += \
 PLATFORM_SECURITY_PATCH := 2025-12-31
 TW_INCLUDE_CRYPTO := true
 TW_INCLUDE_CRYPTO_FBE := true
+TW_INCLUDE_FBE_METADATA_DECRYPT := true
 BOARD_USES_METADATA_PARTITION := true
 
 # Extras

diff --git a/recovery/root/etc/twrp.fstab b/recovery/root/etc/twrp.fstab
index 1b462426e4deb9a67f17299d47bce6859541a3a2..d1ef7b41fcb0a5679b556079f7ac62c2cd5ffa8e 100644 (file)
--- a/recovery/root/etc/twrp.fstab
+++ b/recovery/root/etc/twrp.fstab
@@ -5,16 +5,17 @@
 /vendor                ext4    /dev/block/bootdevice/by-name/vendor                                    flags=slotselect;display="Vendor";backup=1;wipeingui
 /vendor_image  emmc    /dev/block/bootdevice/by-name/vendor                                    flags=slotselect
 /metadata      ext4    /dev/block/bootdevice/by-name/metadata                                  
-/data          ext4    /dev/block/bootdevice/by-name/userdata                                  flags=fileencryption=ice:aes-256-cts
+/data          ext4    /dev/block/bootdevice/by-name/userdata                                  flags=latemount;fileencryption=ice:aes-256-cts;keydirectory=/metadata/vold/metadata_encryption
 /firmware      vfat    /dev/block/bootdevice/by-name/modem                                     flags=slotselect;display="Firmware";mounttodecrypt;fsflags=ro
 /misc          emmc    /dev/block/bootdevice/by-name/misc
-/modem         emmc    /dev/block/bootdevice/by-name/modem                                     flags=slotselect;backup=1;display="Modem"
-/bluetooth     emmc    /dev/block/bootdevice/by-name/bluetooth                                 flags=slotselect;backup=1;subpartitionof=/modem
-/dsp           emmc    /dev/block/bootdevice/by-name/dsp                                       flags=slotselect;backup=1;subpartitionof=/modem
+/vendor/firmware_mnt           emmc    /dev/block/bootdevice/by-name/modem                                     flags=slotselect;backup=1;display="Modem"
+/vendor/bt_firmware    emmc    /dev/block/bootdevice/by-name/bluetooth                                 flags=slotselect;backup=1;subpartitionof=/modem
+/vendor/dsp            emmc    /dev/block/bootdevice/by-name/dsp                                       flags=slotselect;backup=1;subpartitionof=/modem
 /efs1          emmc    /dev/block/bootdevice/by-name/modemst1                                  flags=backup=1;display=EFS
 /efs2          emmc    /dev/block/bootdevice/by-name/modemst2                                  flags=backup=1;subpartitionof=/efs1
 /efsc          emmc    /dev/block/bootdevice/by-name/fsc                                       flags=backup=1;subpartitionof=/efs1
 /efsg          emmc    /dev/block/bootdevice/by-name/fsg                                       flags=backup=1;subpartitionof=/efs1
+/op2           ext4    /dev/block/bootdevice/by-name/op2   
 
 # Removable storage
 /usbstorage      vfat    /dev/block/sdg1                            /dev/block/sdg     flags=fsflags=utf8;display="USB Storage";storage;wipeingui;removable