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

Merge "Enable not rebooting during default encryption" into lmp-dev

Browse source
This commit is contained in:
Paul Lawrence 2014-08-25 20:28:35 +00:00 • committed by Android (Google) Code Review
commit a005e7795e
2 changed files with 0 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
init/builtins.c
View file

@ -537,7 +537,6 @@ int do_mount_all(int nargs, char **args)
} }
if (ret == FS_MGR_MNTALL_DEV_NEEDS_ENCRYPTION) { if (ret == FS_MGR_MNTALL_DEV_NEEDS_ENCRYPTION) {
property_set("ro.crypto.state", "unencrypted");
property_set("vold.decrypt", "trigger_encryption"); property_set("vold.decrypt", "trigger_encryption");
} else if (ret == FS_MGR_MNTALL_DEV_MIGHT_BE_ENCRYPTED) { } else if (ret == FS_MGR_MNTALL_DEV_MIGHT_BE_ENCRYPTED) {
property_set("ro.crypto.state", "encrypted"); property_set("ro.crypto.state", "encrypted");

1
rootdir/init.rc
View file

@ -429,7 +429,6 @@ on property:vold.decrypt=trigger_default_encryption
on property:vold.decrypt=trigger_encryption on property:vold.decrypt=trigger_encryption
start surfaceflinger start surfaceflinger
start encrypt start encrypt
class_start main
on property:sys.init_log_level=* on property:sys.init_log_level=*
loglevel ${sys.init_log_level} loglevel ${sys.init_log_level}