commit f0654b4414c750703f50d4e84319d31d57e86284
author Tao Bao <tbao@google.com> Fri Jul 24 21:02:50 2015 +0000
committer Android Git Automerger <android-git-automerger@android.com> Fri Jul 24 21:02:50 2015 +0000
tree 77e6d2791ba832b1ddda0ff43ce5e6d232bbc7e5
parent 7665d443e2e3de775661068c29df38581476cc71
parent c69095d8cd9685f9d9c7e3863a5e087efeadba3a

am c69095d8: am afb8f320: Merge "uncrypt: Support file level encryption."

* commit 'c69095d8cd9685f9d9c7e3863a5e087efeadba3a':
  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, "") &&