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

am 6e9dda70: uncrypt: Support file level encryption.

Browse Source 
* commit '6e9dda70cb00dd1f1948e071d7df7ca6e2bd8332':
  uncrypt: Support file level encryption.
This commit is contained in:
Tao Bao
2015-07-17 05:43:35 +00:00
committed by Android Git Automerger
parent ac780c9046 6e9dda70cb
commit f2c4e4ce76
1 changed files with 1 additions and 1 deletions
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, "") &&