diff options
| author | Paul Lawrence <paullawrence@google.com> | 2014-04-11 14:55:51 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2014-04-11 14:55:52 +0000 |
| commit | 391224c807d2e28e55817b53ff3a30e57d08e996 (patch) | |
| tree | 1e64d0ac5004a3c37b661923f63a4e5e7e67b134 /rootdir | |
| parent | 7bd273e04e77a60598d26a358861568fe11f8efc (diff) | |
| parent | f24aab7d744b708a897e70e2cbdb76a81bc069b7 (diff) | |
| download | core-391224c807d2e28e55817b53ff3a30e57d08e996.tar.gz core-391224c807d2e28e55817b53ff3a30e57d08e996.tar.bz2 core-391224c807d2e28e55817b53ff3a30e57d08e996.zip | |
Merge "Fix forceencrypt"
Diffstat (limited to 'rootdir')
| -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 79e33efc2..d9e4d1cf6 100644 --- a/rootdir/init.rc +++ b/rootdir/init.rc @@ -557,7 +557,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 +service encrypt /system/bin/vdc --wait cryptfs enablecrypto inplace default disabled oneshot # vold will set vold.decrypt to trigger_restart_framework (default |