Merge "Prepare necessary data directory before loading persistent properties." am: 399bd0866c

am: e1f216cc4d

Change-Id: I69153c12ca16fcb8381972c70ac7e3e25c050d42
This commit is contained in:
Seigo Nonaka 2017-04-04 23:52:12 +00:00 committed by android-build-merger
commit cbe1f6b1e4

View file

@ -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");