summaryrefslogtreecommitdiffstats
path: root/init
diff options
context:
space:
mode:
Diffstat (limited to 'init')
-rw-r--r--init/builtins.c8
1 files changed, 6 insertions, 2 deletions
diff --git a/init/builtins.c b/init/builtins.c
index a168062..a857c98 100644
--- a/init/builtins.c
+++ b/init/builtins.c
@@ -501,8 +501,12 @@ int do_mount_all(int nargs, char **args)
return -1;
}
- /* ret is 1 if the device appears encrypted, 0 if not, and -1 on error */
- if (ret == 1) {
+ /* ret is 2 if device needs encrypted, 1 if the device appears encrypted,
+ * 0 if not, and -1 on error */
+ if (ret == 2) {
+ property_set("ro.crypto.state", "unencrypted");
+ property_set("vold.decrypt", "trigger_encryption");
+ } else if (ret == 1) {
property_set("ro.crypto.state", "encrypted");
property_set("vold.decrypt", "trigger_default_encryption");
} else if (ret == 0) {