diff options
| author | Paul Lawrence <paullawrence@google.com> | 2015-10-21 14:27:38 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2015-10-21 14:27:38 +0000 |
| commit | 2b216aa89b76dbadb315322e4fd31aa37059b262 (patch) | |
| tree | 08cf6c0d77c3e2c4c5629d86a7374f0bf6b4fc9c | |
| parent | f429d37807a005c1de38a7616669bf1834d45432 (diff) | |
| parent | 751dfddc198b64409d035b8a80b526c0815432fb (diff) | |
| download | core-2b216aa89b76dbadb315322e4fd31aa37059b262.tar.gz | |
Merge "Don't show UI on default encryption" into mnc-dr-devmarshmallow-mr1-dev
| -rw-r--r-- | rootdir/init.rc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/rootdir/init.rc b/rootdir/init.rc index e814d0c58..317207c70 100644 --- a/rootdir/init.rc +++ b/rootdir/init.rc @@ -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 |