diff options
| author | Paul Lawrence <paullawrence@google.com> | 2016-04-19 14:46:48 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2016-04-19 14:46:48 +0000 |
| commit | 1a920d72dcc6f8c91fd6ec04954facd4d351fb9d (patch) | |
| tree | c5475bd9915ba19da2f2e1fcaff60053cc1a1534 /init/builtins.cpp | |
| parent | 2f46a7d0ecdbff4cc8f08d2f63e855dde681cb25 (diff) | |
| parent | fe5d55a68b9dc3a593d3f6ee5be919b8a9de710c (diff) | |
Merge "Don\'t start defaultcrypto twice" into nyc-dev
am: fe5d55a
* commit 'fe5d55a68b9dc3a593d3f6ee5be919b8a9de710c':
Don't start defaultcrypto twice
Change-Id: I0e9a27208ea046a2cf738992ba97141da9026c08
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 66133fb6b..e56ec4e07 100644 --- a/init/builtins.cpp +++ b/init/builtins.cpp @@ -538,11 +538,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"); |