commit 59296a4f6d9efa6003cbb9c7fe75418df447ec0d
author Paul Lawrence <paullawrence@google.com> Tue Apr 28 19:14:45 2015 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Tue Apr 28 19:14:45 2015 +0000
tree 684c19a54a0f82c7edd0005dd3cf2de86e4d409e
parent 037963824360c2a0f8d3317fb8a28b291dbc0ed8
parent 468ba48bd0eb6d47df8ce85f5891d161b3f5a2f4

Merge "Revert "Only run vold command when file encryption enabled""

init/builtins.cpp

diff --git a/init/builtins.cpp b/init/builtins.cpp
index d772383..c039689 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);
@@ -829,16 +826,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;
 }