diff options
| author | Tao Bao <tbao@google.com> | 2015-07-24 23:02:50 +0200 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-07-24 23:02:50 +0200 |
| commit | f0654b4414c750703f50d4e84319d31d57e86284 (patch) | |
| tree | 77e6d2791ba832b1ddda0ff43ce5e6d232bbc7e5 /uncrypt/uncrypt.cpp | |
| parent | am 87f2c673: am cc3c3414: Merge "updater: libapplypatch needs libbase now." (diff) | |
| parent | am afb8f320: Merge "uncrypt: Support file level encryption." (diff) | |
| download | android_bootable_recovery-f0654b4414c750703f50d4e84319d31d57e86284.tar android_bootable_recovery-f0654b4414c750703f50d4e84319d31d57e86284.tar.gz android_bootable_recovery-f0654b4414c750703f50d4e84319d31d57e86284.tar.bz2 android_bootable_recovery-f0654b4414c750703f50d4e84319d31d57e86284.tar.lz android_bootable_recovery-f0654b4414c750703f50d4e84319d31d57e86284.tar.xz android_bootable_recovery-f0654b4414c750703f50d4e84319d31d57e86284.tar.zst android_bootable_recovery-f0654b4414c750703f50d4e84319d31d57e86284.zip | |
Diffstat (limited to 'uncrypt/uncrypt.cpp')
| -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, "") && |