commit e2ef0c0da454a5b9224d340260e9ad5be46092fe
author Seigo Nonaka <nona@google.com> Mon Jun 20 17:05:40 2016 +0900
committer Seigo Nonaka <nona@google.com> Mon Jun 20 17:05:40 2016 +0900
tree dcdd8d7e22cb6d90b43c8d815f3e6049feca09a3
parent 908527a70b0cd4e2cd4fece29c35314fee116f3c

Prepare necessary data directory before loading persistent properties.

init reads files in /data/property/ but it is not ready to read when
trigger_load_persist_props is triggered by vold.decrypt.

Bug: 29332975
Change-Id: I14beac8714ff2f722d8b11f666bc7ca693ccd46e

cryptfs.c

diff --git a/cryptfs.c b/cryptfs.c
index f3a9e3a..bc3e87c 100644
--- a/cryptfs.c
+++ b/cryptfs.c
@@ -1737,11 +1737,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");