diff options
| author | Paul Lawrence <paullawrence@google.com> | 2015-01-26 16:22:49 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-01-26 16:22:49 +0000 |
| commit | 7e890a4d32816d34b30fb5d1f651d966d64bbf36 (patch) | |
| tree | 6df70cd1ef437a00dffeb7c497bcda90500dc45d /rootdir | |
| parent | 406865adcb23e3de573b61b29be205a76b2fc211 (diff) | |
| parent | bda6272446454886339841a62daaa1b66c07ad60 (diff) | |
| download | core-7e890a4d32816d34b30fb5d1f651d966d64bbf36.tar.gz core-7e890a4d32816d34b30fb5d1f651d966d64bbf36.tar.bz2 core-7e890a4d32816d34b30fb5d1f651d966d64bbf36.zip | |
am bda62724: Make encryption configurable
* commit 'bda6272446454886339841a62daaa1b66c07ad60':
Make encryption configurable
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 b4bed9101..3c0b82016 100644 --- a/rootdir/init.rc +++ b/rootdir/init.rc @@ -574,7 +574,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 maybeenabledefaultcrypto disabled oneshot # vold will set vold.decrypt to trigger_restart_framework (default |