diff options
| author | Paul Lawrence <paullawrence@google.com> | 2015-02-09 04:14:22 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-02-09 04:14:22 +0000 |
| commit | d933fc0c05c9dff977ec6824cecb37e49a5b28ff (patch) | |
| tree | b240b4c7d4c430641c038e7d2203ed3d18e5dbec /rootdir | |
| parent | 14b964f52ebf9a4e86fdb1ced0ca4d9a3cb6fcab (diff) | |
| parent | a1738915329e704ea52fc09c222bb4893e6e51df (diff) | |
| download | system_core-d933fc0c05c9dff977ec6824cecb37e49a5b28ff.zip system_core-d933fc0c05c9dff977ec6824cecb37e49a5b28ff.tar.gz system_core-d933fc0c05c9dff977ec6824cecb37e49a5b28ff.tar.bz2 | |
am a1738915: am 317b4024: Revert "Make encryption configurable"
* commit 'a1738915329e704ea52fc09c222bb4893e6e51df':
Revert "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 7f29eca..84e8799 100644 --- a/rootdir/init.rc +++ b/rootdir/init.rc @@ -589,7 +589,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 maybeenabledefaultcrypto +service encrypt /system/bin/vdc --wait cryptfs enablecrypto inplace default disabled oneshot # vold will set vold.decrypt to trigger_restart_framework (default |