commit 399bd0866c23efa95b10af28b6301f34bb32c806
author Treehugger Robot <treehugger-gerrit@google.com> Tue Apr 04 23:34:23 2017 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Tue Apr 04 23:34:24 2017 +0000
tree 3c662ef13fb6f4a36a9a3049a9472f86de7d4b8a
parent e3a8a600242b6d97d7d604b301a6753b242d17b1
parent cb46b9b0c89c2e07c9b1135e54c40ba5fc637a6a

Merge "Prepare necessary data directory before loading persistent properties."

cryptfs.c

diff --git a/cryptfs.c b/cryptfs.c
index b1d1fc7..53624ce 100644
--- a/cryptfs.c
+++ b/cryptfs.c
@@ -1716,11 +1716,11 @@
             return -1;
         }
 
-        property_set("vold.decrypt", "trigger_load_persist_props");
         /* Create necessary paths on /data */
         if (prep_data_fs()) {
             return -1;
         }
+        property_set("vold.decrypt", "trigger_load_persist_props");
 
         /* startup service classes main and late_start */
         property_set("vold.decrypt", "trigger_restart_framework");