Skip to content
Snippets Groups Projects
Commit 2b216aa8 authored by Paul Lawrence's avatar Paul Lawrence Committed by Android (Google) Code Review
Browse files

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

parents f429d378 751dfddc
Branches marshmallow-mr1-dev
Tags
No related merge requests found
Show whitespace changes
Inline Side-by-side
Showing
with 1 addition and 1 deletion
rootdir/init.rc
+ 1
− 1
View file @ 2b216aa8
...@@ -667,7 +667,7 @@ service defaultcrypto /system/bin/vdc --wait cryptfs mountdefaultencrypted ...@@ -667,7 +667,7 @@ service defaultcrypto /system/bin/vdc --wait cryptfs mountdefaultencrypted
# encryption) or trigger_restart_min_framework (other encryption) # encryption) or trigger_restart_min_framework (other encryption)
# One shot invocation to encrypt unencrypted volumes # 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 disabled
oneshot oneshot
# vold will set vold.decrypt to trigger_restart_framework (default # vold will set vold.decrypt to trigger_restart_framework (default
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment