diff options
| author | Tao Bao <tbao@google.com> | 2015-07-16 20:04:13 -0700 |
|---|---|---|
| committer | The Android Automerger <android-build@google.com> | 2015-07-17 08:10:56 -0700 |
| commit | a20063905a4b358fc8a276d87d262c46131494f0 (patch) | |
| tree | 877e9c93c7bb005a2ad57d777eef6ca36a4db407 | |
| parent | 698937b9737bbf520e8020ad00373b7d464dac3f (diff) | |
| download | bootable_recovery-a20063905a4b358fc8a276d87d262c46131494f0.zip bootable_recovery-a20063905a4b358fc8a276d87d262c46131494f0.tar.gz bootable_recovery-a20063905a4b358fc8a276d87d262c46131494f0.tar.bz2 | |
uncrypt: Support file level encryption.
Bug: 22534003
Change-Id: Iaf42a6e5b40cfef904de66e212ae8b77b2953ef7
| -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 1db3013..46da86d 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, "") && |