diff options
| author | Paul Lawrence <paullawrence@google.com> | 2016-04-18 15:37:31 -0700 |
|---|---|---|
| committer | Paul Lawrence <paullawrence@google.com> | 2016-04-18 15:37:31 -0700 |
| commit | 1f99218612fa12f2c3354c29bf8d761a27e50148 (patch) | |
| tree | 80f16e45a45841e115b192809c4d6a22c40758ac /init/builtins.cpp | |
| parent | 3c535de75e3da05e32e69dfcdd6a864dbdc451fd (diff) | |
Don't start defaultcrypto twice
The old way (using triggers) starts defaultcrypto twice because
queue_property_triggers_action retriggers the action.
Bug: 27452459
Change-Id: I48c844836f551673d0dbfed6c33bd8ee1e035f40
Diffstat (limited to 'init/builtins.cpp')
| -rw-r--r-- | init/builtins.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/init/builtins.cpp b/init/builtins.cpp index c8780bb53..b77f9ad32 100644 --- a/init/builtins.cpp +++ b/init/builtins.cpp @@ -537,11 +537,11 @@ static int do_mount_all(const std::vector<std::string>& args) { import_late(args, 2); 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) { property_set("ro.crypto.state", "encrypted"); 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) { property_set("ro.crypto.state", "unencrypted"); ActionManager::GetInstance().QueueEventTrigger("nonencrypted"); |