From cb46b9b0c89c2e07c9b1135e54c40ba5fc637a6a Mon Sep 17 00:00:00 2001
From: Seigo Nonaka <nona@google.com>
Date: Mon, 20 Jun 2016 17:05:40 +0900
Subject: [PATCH] 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)
---
 cryptfs.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/cryptfs.c b/cryptfs.c
index b1d1fc7..53624ce 100644
--- a/cryptfs.c
+++ b/cryptfs.c
@@ -1716,11 +1716,11 @@ static int cryptfs_restart_internal(int restart_main)
             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");