Merge "uncrypt: Support file level encryption."

This commit is contained in:
Tao Bao 2015-07-24 18:13:58 +00:00 committed by Gerrit Code Review
commit afb8f320bf

View file

@ -146,7 +146,7 @@ static const char* find_block_device(const char* path, bool* encryptable, bool*
(path[len] == '/' || path[len] == 0)) { (path[len] == '/' || path[len] == 0)) {
*encrypted = false; *encrypted = false;
*encryptable = false; *encryptable = false;
if (fs_mgr_is_encryptable(v)) { if (fs_mgr_is_encryptable(v) || fs_mgr_is_file_encrypted(v)) {
*encryptable = true; *encryptable = true;
char buffer[PROPERTY_VALUE_MAX+1]; char buffer[PROPERTY_VALUE_MAX+1];
if (property_get("ro.crypto.state", buffer, "") && if (property_get("ro.crypto.state", buffer, "") &&