From 36d0eaecd7bd7970b91ac35d6753bf715097e3b9 Mon Sep 17 00:00:00 2001 From: Paul Lawrence Date: Wed, 21 Jan 2015 09:57:01 -0800 Subject: 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 --- rootdir/init.rc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'rootdir') 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 -- cgit v1.1