PawletOS/android_bootable_recovery
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
* commit 'c69095d8cd9685f9d9c7e3863a5e087efeadba3a':
  uncrypt: Support file level encryption.
This commit is contained in:
Tao Bao
2015-07-24 21:02:50 +00:00
committed by Android Git Automerger
parent 7665d443e2 c69095d8cd
commit f0654b4414
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
uncrypt/uncrypt.cpp
+1 -1
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, "") &&