Merge \"Only restorecon CE storage after unlocked.\" into nyc-mr1-dev

am: 96f387e8c0

Change-Id: I3a1c31334d32e7bdff8e05558356d2833fcfb831

1 files changed, 5 insertions, 1 deletions

diff --git a/init/builtins.cpp b/init/builtins.cpp
index 38b44b7d8..b227d40b7 100644
--- a/init/builtins.cpp
+++ b/init/builtins.cpp
@@ -861,8 +861,12 @@ static int do_restorecon_recursive(const std::vector<std::string>& args) {
     int ret = 0;
 
     for (auto it = std::next(args.begin()); it != args.end(); ++it) {
-        if (restorecon_recursive(it->c_str()) < 0)
+        /* The contents of CE paths are encrypted on FBE devices until user
+         * credentials are presented (filenames inside are mangled), so we need
+         * to delay restorecon of those until vold explicitly requests it. */
+        if (restorecon_recursive_skipce(it->c_str()) < 0) {
             ret = -errno;
+        }
     }
     return ret;
 }