tequilaOS/platform_bootable_recovery
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

am afb8f320: Merge "uncrypt: Support file level encryption."

Browse source 
* commit 'afb8f320bf244630035e011f7840f90120ec4f8f':
  uncrypt: Support file level encryption.
This commit is contained in:
Tao Bao 2015-07-24 18:18:42 +00:00 committed by Android Git Automerger
commit c69095d8cd
1 changed files with 1 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
uncrypt/uncrypt.cpp
View file

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