diff options
| author | Paul Lawrence <paullawrence@google.com> | 2015-02-07 00:11:12 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-02-07 00:11:12 +0000 |
| commit | a1738915329e704ea52fc09c222bb4893e6e51df (patch) | |
| tree | 1ca57494303eb4e662c744f271807ef383ded03c /rootdir | |
| parent | e6ed63e610c5e6a56b04a5168e873dfa48c73aec (diff) | |
| parent | 317b4024a2a46b8c57abfa08f2a649df13572bd3 (diff) | |
| download | system_core-a1738915329e704ea52fc09c222bb4893e6e51df.zip system_core-a1738915329e704ea52fc09c222bb4893e6e51df.tar.gz system_core-a1738915329e704ea52fc09c222bb4893e6e51df.tar.bz2 | |
am 317b4024: Revert "Make encryption configurable"
* commit '317b4024a2a46b8c57abfa08f2a649df13572bd3':
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 dd665f9..26cc121 100644 --- a/rootdir/init.rc +++ b/rootdir/init.rc @@ -578,7 +578,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 |