commit 34276a15347cb2dc603ca8e34e57f5c9a0b4ad0d
author Paul Lawrence <paullawrence@google.com> Tue Apr 28 19:12:35 2015 +0000
committer Paul Lawrence <paullawrence@google.com> Tue Apr 28 19:12:35 2015 +0000
tree df4b5d81b2e7ba676bf18a9c5f434a1971f93a4a
parent efe190e02387de382bb6d187ce62aec0fe9cfb44

Revert "Only run vold command when file encryption enabled"

This reverts commit efe190e02387de382bb6d187ce62aec0fe9cfb44.

Change-Id: Ib15af9a85b0b885a388bda28511a6fc39a777264

init/builtins.cpp

diff --git a/init/builtins.cpp b/init/builtins.cpp
index 55100bd..d0e56ec 100644
--- a/init/builtins.cpp
+++ b/init/builtins.cpp
@@ -440,7 +440,6 @@
         property_set("vold.decrypt", "trigger_encryption");
     } 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");
     } else if (ret == FS_MGR_MNTALL_DEV_NOT_ENCRYPTED) {
         property_set("ro.crypto.state", "unencrypted");
@@ -458,7 +457,6 @@
             return -1;
         }
         property_set("ro.crypto.state", "encrypted");
-        property_set("ro.crypto.type", "file");
 
         // Although encrypted, we have device key, so we do not need to
         // do anything different from the nonencrypted case.
@@ -468,7 +466,6 @@
             return -1;
         }
         property_set("ro.crypto.state", "encrypted");
-        property_set("ro.crypto.type", "file");
         property_set("vold.decrypt", "trigger_restart_min_framework");
     } else if (ret > 0) {
         ERROR("fs_mgr_mount_all returned unexpected error %d\n", ret);
@@ -838,16 +835,10 @@
 
 int do_installkey(int nargs, char **args)
 {
-    if (nargs != 2) {
-        return -1;
+    if (nargs == 2) {
+      return e4crypt_create_device_key(args[1],
+                                       do_installkeys_ensure_dir_exists);
     }
 
-    char prop_value[PROP_VALUE_MAX] = {0};
-    property_get("ro.crypto.type", prop_value);
-    if (strcmp(prop_value, "file")) {
-        return 0;
-    }
-
-    return e4crypt_create_device_key(args[1],
-                                     do_installkeys_ensure_dir_exists);
+    return -1;
 }