diff options
| author | Paul Lawrence <paullawrence@google.com> | 2015-01-28 21:14:09 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2015-01-28 21:14:09 +0000 |
| commit | 07dcb12e3ee7b7a6f959ae531ffe87f038786730 (patch) | |
| tree | 412e77874c7bc23b5d932708eccf0319b7d4d108 /rootdir | |
| parent | 06b4e9826a33ddbdbddf7e74076ac29f9450414a (diff) | |
| parent | 36d0eaecd7bd7970b91ac35d6753bf715097e3b9 (diff) | |
| download | system_core-07dcb12e3ee7b7a6f959ae531ffe87f038786730.zip system_core-07dcb12e3ee7b7a6f959ae531ffe87f038786730.tar.gz system_core-07dcb12e3ee7b7a6f959ae531ffe87f038786730.tar.bz2 | |
Merge changes If22008be,Id0049ce6
* changes:
Make encryption configurable
Provide a way to select force encryption from vendor partition
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 642af09..dcdc658 100644 --- a/rootdir/init.rc +++ b/rootdir/init.rc @@ -581,7 +581,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 |