From 7cf50c60b5c955010a8b8d0c23264f03ab673deb Mon Sep 17 00:00:00 2001
From: Tao Bao <tbao@google.com>
Date: Thu, 16 Jul 2015 20:04:13 -0700
Subject: uncrypt: Support file level encryption.

Bug: 22534003
Change-Id: I2bc22418c416491da573875dce78daed24f2c046
(cherry picked from commit 6e9dda70cb00dd1f1948e071d7df7ca6e2bd8332)
---
 uncrypt/uncrypt.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/uncrypt/uncrypt.cpp b/uncrypt/uncrypt.cpp
index 20a272949..8785b29af 100644
--- a/uncrypt/uncrypt.cpp
+++ b/uncrypt/uncrypt.cpp
@@ -146,7 +146,7 @@ static const char* find_block_device(const char* path, bool* encryptable, bool*
             (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, "") &&
-- 
cgit v1.2.3