commit 6e9dda70cb00dd1f1948e071d7df7ca6e2bd8332
author Tao Bao <tbao@google.com> Thu Jul 16 20:04:13 2015 -0700
committer Tao Bao <tbao@google.com> Thu Jul 16 20:04:39 2015 -0700
tree 877e9c93c7bb005a2ad57d777eef6ca36a4db407
parent 90c75b0beb375b8d261e2df92292e9b542470f6e

uncrypt: Support file level encryption.

Bug: 22534003
Change-Id: Iaf42a6e5b40cfef904de66e212ae8b77b2953ef7

uncrypt/uncrypt.cpp

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