commit 7cf50c60b5c955010a8b8d0c23264f03ab673deb
author Tao Bao <tbao@google.com> Thu Jul 16 20:04:13 2015 -0700
committer Tao Bao <tbao@google.com> Fri Jul 24 11:13:25 2015 -0700
tree e33ba32027becb515a5d9c1806c545c0bc84d0c2
parent cc3c34145e4816a84fe597ce273b016ae9587530

uncrypt: Support file level encryption.

Bug: 22534003
Change-Id: I2bc22418c416491da573875dce78daed24f2c046
(cherry picked from commit 6e9dda70cb00dd1f1948e071d7df7ca6e2bd8332)

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