Merge "Don't show UI on default encryption" into mnc-dr-dev

This commit is contained in:
Paul Lawrence 2015-10-21 14:27:38 +00:00 committed by Android (Google) Code Review
commit 2b216aa89b

View file

@ -667,7 +667,7 @@ service defaultcrypto /system/bin/vdc --wait cryptfs mountdefaultencrypted
# encryption) or trigger_restart_min_framework (other encryption)
# One shot invocation to encrypt unencrypted volumes
service encrypt /system/bin/vdc --wait cryptfs enablecrypto inplace default
service encrypt /system/bin/vdc --wait cryptfs enablecrypto inplace default noui
disabled
oneshot
# vold will set vold.decrypt to trigger_restart_framework (default