Revert "Enable metadata encryption"

Bug: 37792477

This reverts commit 2bf87eebe4.

Change-Id: I1a43793beda24c01f0fe9e25a7c183af1200fa76
This commit is contained in:
Guang Zhu 2017-04-28 23:56:48 +00:00
parent 2bf87eebe4
commit 9709c5a7ff
1 changed files with 1 additions and 3 deletions

View File

@ -272,7 +272,6 @@ on late-init
# some services can be started.
trigger late-fs
on later-init
# Now we can mount /data. File encryption requires keymaster to decrypt
# /data, which in turn can only be loaded when system properties are present.
trigger post-fs-data
@ -619,7 +618,6 @@ on boot
class_start core
on nonencrypted
trigger later-init
class_start main
class_start late_start
@ -638,7 +636,7 @@ on property:vold.decrypt=trigger_load_persist_props
start logd-reinit
on property:vold.decrypt=trigger_post_fs_data
trigger later-init
trigger post-fs-data
on property:vold.decrypt=trigger_restart_min_framework
# A/B update verifier that marks a successful boot.