summaryrefslogtreecommitdiffstats
path: root/uncrypt/uncrypt.cpp
diff options
context:
space:
mode:
authorTao Bao <tbao@google.com>2015-07-17 05:04:13 +0200
committerTao Bao <tbao@google.com>2015-07-17 05:04:39 +0200
commit6e9dda70cb00dd1f1948e071d7df7ca6e2bd8332 (patch)
tree877e9c93c7bb005a2ad57d777eef6ca36a4db407 /uncrypt/uncrypt.cpp
parentChange init sequence to support file level encryption (diff)
downloadandroid_bootable_recovery-6e9dda70cb00dd1f1948e071d7df7ca6e2bd8332.tar
android_bootable_recovery-6e9dda70cb00dd1f1948e071d7df7ca6e2bd8332.tar.gz
android_bootable_recovery-6e9dda70cb00dd1f1948e071d7df7ca6e2bd8332.tar.bz2
android_bootable_recovery-6e9dda70cb00dd1f1948e071d7df7ca6e2bd8332.tar.lz
android_bootable_recovery-6e9dda70cb00dd1f1948e071d7df7ca6e2bd8332.tar.xz
android_bootable_recovery-6e9dda70cb00dd1f1948e071d7df7ca6e2bd8332.tar.zst
android_bootable_recovery-6e9dda70cb00dd1f1948e071d7df7ca6e2bd8332.zip
Diffstat (limited to '')
-rw-r--r--uncrypt/uncrypt.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/uncrypt/uncrypt.cpp b/uncrypt/uncrypt.cpp
index 1db3013c6..46da86d61 100644
--- a/uncrypt/uncrypt.cpp
+++ b/uncrypt/uncrypt.cpp
@@ -144,7 +144,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, "") &&