diff options
| author | Tao Bao <tbao@google.com> | 2015-07-17 07:50:07 +0200 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-07-17 07:50:07 +0200 |
| commit | c31f8a116759d549db00e958b3ddd2853cca78db (patch) | |
| tree | d5469ac48c93c969553ccbbec966631a224f72b3 /uncrypt | |
| parent | am ac780c90: am 328cb8cb: am 025c0e79: Merge "Clean up LOG functions." (diff) | |
| parent | am 6e9dda70: uncrypt: Support file level encryption. (diff) | |
| download | android_bootable_recovery-c31f8a116759d549db00e958b3ddd2853cca78db.tar android_bootable_recovery-c31f8a116759d549db00e958b3ddd2853cca78db.tar.gz android_bootable_recovery-c31f8a116759d549db00e958b3ddd2853cca78db.tar.bz2 android_bootable_recovery-c31f8a116759d549db00e958b3ddd2853cca78db.tar.lz android_bootable_recovery-c31f8a116759d549db00e958b3ddd2853cca78db.tar.xz android_bootable_recovery-c31f8a116759d549db00e958b3ddd2853cca78db.tar.zst android_bootable_recovery-c31f8a116759d549db00e958b3ddd2853cca78db.zip | |
Diffstat (limited to 'uncrypt')
| -rw-r--r-- | uncrypt/uncrypt.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/uncrypt/uncrypt.cpp b/uncrypt/uncrypt.cpp index 20a272949..8785b29af 100644 --- a/uncrypt/uncrypt.cpp +++ b/uncrypt/uncrypt.cpp @@ -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, "") && |