diff options
| author | Paul Lawrence <paullawrence@google.com> | 2016-04-19 14:44:26 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2016-04-19 14:44:26 +0000 |
| commit | fe5d55a68b9dc3a593d3f6ee5be919b8a9de710c (patch) | |
| tree | fe4734da204feea89e6db6e7ed8f46da7eab0ca6 /init/builtins.cpp | |
| parent | a9e818f4632eca67a5ffd1fb680d15550591ecd9 (diff) | |
| parent | 1f99218612fa12f2c3354c29bf8d761a27e50148 (diff) | |
Merge "Don't start defaultcrypto twice" into nyc-dev
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"); |