diff options
| author | Paul Lawrence <paullawrence@google.com> | 2015-01-21 09:57:01 -0800 |
|---|---|---|
| committer | Paul Lawrence <paullawrence@google.com> | 2015-01-28 11:41:53 -0800 |
| commit | 36d0eaecd7bd7970b91ac35d6753bf715097e3b9 (patch) | |
| tree | 5fc2626551d91d10f65796280403938541b9d894 /rootdir | |
| parent | 2f7ee6b7dd36f3d5c55473b67dc2430c795402ce (diff) | |
| download | system_core-36d0eaecd7bd7970b91ac35d6753bf715097e3b9.zip system_core-36d0eaecd7bd7970b91ac35d6753bf715097e3b9.tar.gz system_core-36d0eaecd7bd7970b91ac35d6753bf715097e3b9.tar.bz2 | |
Make encryption configurable
Delay mounting encryptable but unencrypted volumes until we can
check the ro.vold.forceencrypt flag, then optionally encrypt.
Requires matching vold change from
https://googleplex-android-review.git.corp.google.com/#/c/615309/
Bug: 18764230
Change-Id: If22008be8de6a4f3216b349f81ace49be1730314
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 |