wayne: Disable encrypt

BoardConfig.mk

@@ -81,7 +81,6 @@ TARGET_RECOVERY_QCOM_RTC_FIX := true
 TW_BRIGHTNESS_PATH := /sys/class/leds/lcd-backlight/brightness
 TW_EXCLUDE_DEFAULT_USB_INIT := true
 TW_EXTRA_LANGUAGES := true
-TW_INCLUDE_CRYPTO := true
 TW_INCLUDE_NTFS_3G := true
 TW_IGNORE_MISC_WIPE_DATA := true
 TW_INPUT_BLACKLIST := "hbtp_vm"

recovery/root/init.recovery.qcom.rc

@@ -4,80 +4,13 @@ on early-init
 on fs
     wait /dev/block/platform/soc/${ro.boot.bootdevice}
     symlink /dev/block/platform/soc/${ro.boot.bootdevice} /dev/block/bootdevice
-    chmod 0660 /dev/qseecom
-    chown system drmrpc /dev/qseecom
-    chmod 0664 /dev/ion
-    chown system system /dev/ion
-    install_keyring
-    setprop crypto.ready 0
-    setprop crypto.ready 1
-
-# Separate copy needed to use /sbin/linker64 instead of /system/bin/linker64
-service sbinqseecomd /sbin/qseecomd
-    user root
-    group root
-    disabled
-    seclabel u:r:recovery:s0
-
-service hwservicemanager /sbin/hwservicemanager
-    user root
-    group root
-    disabled
-    onrestart setprop hwservicemanager.ready false
-    seclabel u:r:recovery:s0
-
-service servicemanager /sbin/servicemanager
-    user root
-    group root readproc
-    disabled
-    seclabel u:r:recovery:s0
-
-service keystore_auth /sbin/keystore_auth
-    oneshot
-    user system
-    group root
-    disabled
-    seclabel u:r:recovery:s0
-
-service keystore /sbin/keystore /tmp/misc/keystore
-    user root
-    group root drmrpc readproc
-    disabled
-    seclabel u:r:recovery:s0
-
-service gatekeeper-1-0 /sbin/[email protected]
-    user root
-    group root
-    disabled
-    seclabel u:r:recovery:s0
-
-service keymaster-3-0 /sbin/[email protected]
-    user root
-    group root
-    disabled
-    seclabel u:r:recovery:s0
 
 on boot
     # Workaround for adb not coming up
     setprop sys.usb.config mtp,adb
     setprop sys.usb.config adb
     setprop sys.usb.configfs 1
 
-on property:crypto.ready=0
-    stop sbinqseecomd
-    stop keymaster-3-0
-    stop gatekeeper-1-0
-    stop hwservicemanager
-    stop keystore
-    stop servicemanager
-
-on property:crypto.ready=1
-    start sbinqseecomd
-    start hwservicemanager
-    start keymaster-3-0
-    start gatekeeper-1-0
-    start servicemanager
-
 on boot
     # Enable Power modes and set the CPU Freq Sampling rates
     write /sys/module/msm_thermal/core_control/enabled 0

recovery/root/system/etc/recovery.fstab

@@ -6,8 +6,8 @@
 # Currently we dont have e2fsck compiled. So fs check would failed.
 
 #<src>                                                 <mnt_point>        <type>  <mnt_flags and options>                            <fs_mgr_flags>
-/dev/block/bootdevice/by-name/userdata                  /data              ext4    nosuid,noatime,nodev,barrier=0,noauto_da_alloc,discard,lazytime       wait,check,reservedsize=128M,fileencryption=ice,quota
-/dev/block/bootdevice/by-name/userdata                  /data              f2fs    nosuid,nodev,noatime,discard,background_gc=off,fsync_mode=nobarrier   wait,quota,fileencryption=ice
+/dev/block/bootdevice/by-name/userdata                  /data              ext4    nosuid,noatime,nodev,barrier=0,noauto_da_alloc,discard,lazytime       wait,check,reservedsize=128M,encryptable=footer,quota
+/dev/block/bootdevice/by-name/userdata                  /data              f2fs    nosuid,nodev,noatime,discard,background_gc=off,fsync_mode=nobarrier   wait,quota,encryptable=footer
 /dev/block/bootdevice/by-name/cache                     /cache             ext4    nosuid,noatime,nodev,barrier=1                       wait
 /dev/block/bootdevice/by-name/cache                     /cache             f2fs    nosuid,nodev,noatime,discard,background_gc=off,fsync_mode=nobarrier   wait,quota
 /dev/block/bootdevice/by-name/cust                      /cust              ext4    ro,nosuid,nodev,barrier=1                            wait,check

recovery/root/system/etc/twrp.flags

@@ -1,7 +1,7 @@
 # mount point  fstype  device                             device2                flags
 
-/data          ext4    /dev/block/bootdevice/by-name/userdata                    flags=fileencryption=ice
-/data          f2fs    /dev/block/bootdevice/by-name/userdata                    flags=fileencryption=ice
+/data          ext4    /dev/block/bootdevice/by-name/userdata                    flags=encryptable=footer
+/data          f2fs    /dev/block/bootdevice/by-name/userdata                    flags=encryptable=footer
 /cache         ext4    /dev/block/bootdevice/by-name/cache
 /cache         ext4    /dev/block/bootdevice/by-name/cache
 /cust          ext4    /dev/block/bootdevice/by-name/cust                        flags=display="Cust"