commit f2c4e4ce767103603cdc6137339f013af3dc1ad1
author Tao Bao <tbao@google.com> Fri Jul 17 05:43:35 2015 +0000
committer Android Git Automerger <android-git-automerger@android.com> Fri Jul 17 05:43:35 2015 +0000
tree d5469ac48c93c969553ccbbec966631a224f72b3
parent ac780c904670f61083f6831bb2d09bc0a15a0bd6
parent 6e9dda70cb00dd1f1948e071d7df7ca6e2bd8332

am 6e9dda70: uncrypt: Support file level encryption.

* commit '6e9dda70cb00dd1f1948e071d7df7ca6e2bd8332':
  uncrypt: Support file level encryption.

uncrypt/uncrypt.cpp

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, "") &&