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

Merge "Don\'t start defaultcrypto twice" into nyc-dev am: fe5d55a

Browse source 
am: 1a920d7

* commit '1a920d72dcc6f8c91fd6ec04954facd4d351fb9d':
  Don't start defaultcrypto twice

Change-Id: I44819ec85dfe2d3eb2589453911b5c0703fc670f
This commit is contained in:
Paul Lawrence 2016-04-19 14:49:52 +00:00 • committed by android-build-merger
commit fa3e4ea7c3
2 changed files with 2 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
init/builtins.cpp
View file

@ -538,11 +538,11 @@ static int do_mount_all(const std::vector<std::string>& args) {
import_late(args, 2); import_late(args, 2);
if (ret == FS_MGR_MNTALL_DEV_NEEDS_ENCRYPTION) { if (ret == FS_MGR_MNTALL_DEV_NEEDS_ENCRYPTION) {
property_set("vold.decrypt", "trigger_encryption"); ActionManager::GetInstance().QueueEventTrigger("encrypt");
} 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");
property_set("ro.crypto.type", "block"); property_set("ro.crypto.type", "block");
property_set("vold.decrypt", "trigger_default_encryption"); ActionManager::GetInstance().QueueEventTrigger("defaultcrypto");
} else if (ret == FS_MGR_MNTALL_DEV_NOT_ENCRYPTED) { } else if (ret == FS_MGR_MNTALL_DEV_NOT_ENCRYPTED) {
property_set("ro.crypto.state", "unencrypted"); property_set("ro.crypto.state", "unencrypted");
ActionManager::GetInstance().QueueEventTrigger("nonencrypted"); ActionManager::GetInstance().QueueEventTrigger("nonencrypted");

7
rootdir/init.rc
View file

@ -551,13 +551,6 @@ on nonencrypted
class_start main class_start main
class_start late_start class_start late_start
on property:vold.decrypt=trigger_default_encryption
start defaultcrypto
on property:vold.decrypt=trigger_encryption
start surfaceflinger
start encrypt
on property:sys.init_log_level=* on property:sys.init_log_level=*
loglevel ${sys.init_log_level} loglevel ${sys.init_log_level}