openkylin
/
platform_system_core
mirror of https://gitee.com/openkylin/platform_system_core.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

am a95e10fe: am a005e779: Merge "Enable not rebooting during default encryption" into lmp-dev 

* commit 'a95e10fe3187d1dd3fbbd01d6653d7d9c2f9fc4d':
  Enable not rebooting during default encryption
This commit is contained in:
Paul Lawrence 2014-08-26 10:07:27 +00:00 committed by Android Git Automerger
parent ec865a6c48 a95e10fe31
commit ad5b54aa64
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) {
property_set("ro.crypto.state", "unencrypted");
property_set("vold.decrypt", "trigger_encryption");
} else if (ret == FS_MGR_MNTALL_DEV_MIGHT_BE_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
start surfaceflinger
start encrypt
class_start main
on property:sys.init_log_level=*
loglevel ${sys.init_log_level}