summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTao Bao <tbao@google.com>2015-07-24 20:18:42 +0200
committerAndroid Git Automerger <android-git-automerger@android.com>2015-07-24 20:18:42 +0200
commitc69095d8cd9685f9d9c7e3863a5e087efeadba3a (patch)
treee33ba32027becb515a5d9c1806c545c0bc84d0c2
parentam cc3c3414: Merge "updater: libapplypatch needs libbase now." (diff)
parentMerge "uncrypt: Support file level encryption." (diff)
downloadandroid_bootable_recovery-c69095d8cd9685f9d9c7e3863a5e087efeadba3a.tar
android_bootable_recovery-c69095d8cd9685f9d9c7e3863a5e087efeadba3a.tar.gz
android_bootable_recovery-c69095d8cd9685f9d9c7e3863a5e087efeadba3a.tar.bz2
android_bootable_recovery-c69095d8cd9685f9d9c7e3863a5e087efeadba3a.tar.lz
android_bootable_recovery-c69095d8cd9685f9d9c7e3863a5e087efeadba3a.tar.xz
android_bootable_recovery-c69095d8cd9685f9d9c7e3863a5e087efeadba3a.tar.zst
android_bootable_recovery-c69095d8cd9685f9d9c7e3863a5e087efeadba3a.zip
-rw-r--r--uncrypt/uncrypt.cpp2
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, "") &&