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
(cherry picked from commit e2ef0c0da454a5b9224d340260e9ad5be46092fe)
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");