Merge "Fix FDE" into pi-dev

am: b3b1a5eacf

Change-Id: I65d0389a9246a21fb2c876edfc5555f327cdec70
This commit is contained in:
Paul Lawrence 2018-04-17 10:01:20 -07:00 committed by android-build-merger
commit e233757948
2 changed files with 4 additions and 1 deletions

View file

@ -45,7 +45,7 @@
#define PWARNING PLOG(WARNING) << FS_MGR_TAG
#define PERROR PLOG(ERROR) << FS_MGR_TAG
#define CRYPTO_TMPFS_OPTIONS "size=256m,mode=0771,uid=1000,gid=1000"
#define CRYPTO_TMPFS_OPTIONS "size=512m,mode=0771,uid=1000,gid=1000"
/* fstab has the following format:
*

View file

@ -689,6 +689,7 @@ on property:vold.decrypt=trigger_load_persist_props
on property:vold.decrypt=trigger_post_fs_data
trigger post-fs-data
trigger zygote-start
on property:vold.decrypt=trigger_restart_min_framework
# A/B update verifier that marks a successful boot.
@ -696,6 +697,8 @@ on property:vold.decrypt=trigger_restart_min_framework
class_start main
on property:vold.decrypt=trigger_restart_framework
stop surfaceflinger
start surfaceflinger
# A/B update verifier that marks a successful boot.
exec_start update_verifier
class_start main