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

am: 399bd0866c

Change-Id: I4a675722c79bc74bcfc106365a1f056c9b338cc4
This commit is contained in:
Seigo Nonaka 2017-04-04 23:46:15 +00:00 committed by android-build-merger
commit e1f216cc4d

View file

@ -1716,11 +1716,11 @@ static int cryptfs_restart_internal(int restart_main)
return -1; return -1;
} }
property_set("vold.decrypt", "trigger_load_persist_props");
/* Create necessary paths on /data */ /* Create necessary paths on /data */
if (prep_data_fs()) { if (prep_data_fs()) {
return -1; return -1;
} }
property_set("vold.decrypt", "trigger_load_persist_props");
/* startup service classes main and late_start */ /* startup service classes main and late_start */
property_set("vold.decrypt", "trigger_restart_framework"); property_set("vold.decrypt", "trigger_restart_framework");