| commit | dd738c11a49d594183dde9f0e46f56c7a575900a | [log] [tgz] |
|---|---|---|
| author | Tao Bao <tbao@google.com> | Fri Jul 24 18:17:49 2015 +0000 |
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | Fri Jul 24 18:17:49 2015 +0000 |
| tree | 8dbfd4f0af9bd655f99b9246dfc5d649c2f4df9f | |
| parent | afb8f320bf244630035e011f7840f90120ec4f8f [diff] | |
| parent | abba55b4c52cc347e8806ba833645f150f2965ce [diff] |
Merge "applypatch: Support flash mode."
diff --git a/uncrypt/uncrypt.cpp b/uncrypt/uncrypt.cpp index 20a2729..8785b29 100644 --- a/uncrypt/uncrypt.cpp +++ b/uncrypt/uncrypt.cpp
@@ -146,7 +146,7 @@ (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, "") &&