ACPR/android_system_core
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

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

Browse source
This commit is contained in:
Paul Lawrence 2015-04-28 19:14:45 +00:00 • committed by Gerrit Code Review
commit 6e8c8f542d
1 changed files with 4 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
init/builtins.cpp
View file

@ -440,7 +440,6 @@ int do_mount_all(int nargs, char **args)
property_set("vold.decrypt", "trigger_encryption"); property_set("vold.decrypt", "trigger_encryption");
} else if (ret == FS_MGR_MNTALL_DEV_MIGHT_BE_ENCRYPTED) { } else if (ret == FS_MGR_MNTALL_DEV_MIGHT_BE_ENCRYPTED) {
property_set("ro.crypto.state", "encrypted"); property_set("ro.crypto.state", "encrypted");
property_set("ro.crypto.type", "block");
property_set("vold.decrypt", "trigger_default_encryption"); property_set("vold.decrypt", "trigger_default_encryption");
} else if (ret == FS_MGR_MNTALL_DEV_NOT_ENCRYPTED) { } else if (ret == FS_MGR_MNTALL_DEV_NOT_ENCRYPTED) {
property_set("ro.crypto.state", "unencrypted"); property_set("ro.crypto.state", "unencrypted");
@ -458,7 +457,6 @@ int do_mount_all(int nargs, char **args)
return -1; return -1;
} }
property_set("ro.crypto.state", "encrypted"); property_set("ro.crypto.state", "encrypted");
property_set("ro.crypto.type", "file");
// Although encrypted, we have device key, so we do not need to // Although encrypted, we have device key, so we do not need to
// do anything different from the nonencrypted case. // do anything different from the nonencrypted case.
@ -468,7 +466,6 @@ int do_mount_all(int nargs, char **args)
return -1; return -1;
} }
property_set("ro.crypto.state", "encrypted"); property_set("ro.crypto.state", "encrypted");
property_set("ro.crypto.type", "file");
property_set("vold.decrypt", "trigger_restart_min_framework"); property_set("vold.decrypt", "trigger_restart_min_framework");
} else if (ret > 0) { } else if (ret > 0) {
ERROR("fs_mgr_mount_all returned unexpected error %d\n", ret); ERROR("fs_mgr_mount_all returned unexpected error %d\n", ret);
@ -829,16 +826,10 @@ static int do_installkeys_ensure_dir_exists(const char* dir)
int do_installkey(int nargs, char **args) int do_installkey(int nargs, char **args)
{ {
if (nargs != 2) { if (nargs == 2) {
return -1; return e4crypt_create_device_key(args[1],
do_installkeys_ensure_dir_exists);
} }
char prop_value[PROP_VALUE_MAX] = {0}; return -1;
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);
} }