summaryrefslogtreecommitdiffstats
path: root/rootdir
diff options
context:
space:
mode:
authorPaul Lawrence <paullawrence@google.com>2014-02-03 13:27:49 -0800
committerPaul Lawrence <paullawrence@google.com>2014-03-24 15:00:53 -0700
commit166fa3de7060198252b43a4a9ddd841fb6d65cf7 (patch)
tree8835ae87de18f84267e858bae2583795c937fb38 /rootdir
parent347c8de285454af2d3cba3d9b43d3bf23b20babb (diff)
downloadsystem_core-166fa3de7060198252b43a4a9ddd841fb6d65cf7.zip
system_core-166fa3de7060198252b43a4a9ddd841fb6d65cf7.tar.gz
system_core-166fa3de7060198252b43a4a9ddd841fb6d65cf7.tar.bz2
Auto-encrypt drive at startup
Modify fs_mgr to unmount encryptable drives after test mounting them and then trigger an auto-encrypt via the init script Needs matching vold changes from https://googleplex-android-review.googlesource.com/#/c/414200/ Feature is limited to list of serial numbers with this change Bug: 11985952 Change-Id: I84f85a258b6a7e9809467c9149249302e203c41b
Diffstat (limited to 'rootdir')
-rw-r--r--rootdir/init.rc12
1 files changed, 12 insertions, 0 deletions
diff --git a/rootdir/init.rc b/rootdir/init.rc
index 5675cac..f63b332 100644
--- a/rootdir/init.rc
+++ b/rootdir/init.rc
@@ -399,6 +399,11 @@ on property:vold.decrypt=trigger_default_encryption
start surfaceflinger
start defaultcrypto
+on property:vold.decrypt=trigger_encryption
+ start surfaceflinger
+ start encrypt
+ class_start main
+
on charger
class_start charger
@@ -554,6 +559,13 @@ service defaultcrypto /system/bin/vdc --wait cryptfs mountdefaultencrypted
# vold will set vold.decrypt to trigger_restart_framework (default
# encryption) or trigger_restart_min_framework (other encryption)
+# One shot invocation to encrypt unencrypted volumes
+service encrypt /system/bin/vdc --wait cryptfs enablecrypto inplace
+ disabled
+ oneshot
+ # vold will set vold.decrypt to trigger_restart_framework (default
+ # encryption)
+
service bootanim /system/bin/bootanimation
class main
user graphics