am b6b31549: am 10cf0942: Merge "Revert "Change init sequence to support file level encryption"" into mnc-dev

* commit 'b6b31549dfe3c9ec6b32e2862ee7e08a949e2f9c':
  Revert "Change init sequence to support file level encryption"
This commit is contained in:
Paul Lawrence
2015-07-07 20:36:14 +00:00
committed by Android Git Automerger
+3 -3
View File
@@ -46,8 +46,8 @@ on boot
class_start default
# Load properties from /system/ + /factory after fs mount.
on load_system_props_action
load_system_props
on load_all_props_action
load_all_props
on firmware_mounts_complete
rm /dev/.booting
@@ -62,7 +62,7 @@ on late-init
# Load properties from /system/ + /factory after fs mount. Place
# this in another action so that the load will be scheduled after the prior
# issued fs triggers have completed.
trigger load_system_props_action
trigger load_all_props_action
# Remove a file to wake up anything waiting for firmware
trigger firmware_mounts_complete