ACPR/android_system_core
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge "Fix FDE" into pi-dev

Browse source
This commit is contained in:
TreeHugger Robot 2018-04-17 16:48:29 +00:00 • committed by Android (Google) Code Review
commit b3b1a5eacf
2 changed files with 4 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
fs_mgr/fs_mgr_priv.h
View file

@ -45,7 +45,7 @@
#define PWARNING PLOG(WARNING) << FS_MGR_TAG #define PWARNING PLOG(WARNING) << FS_MGR_TAG
#define PERROR PLOG(ERROR) << 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: /* fstab has the following format:
* *

3
rootdir/init.rc
View file

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