commit c23074f386ded6cd28b2f8ba2331814b7491c802
author Paul Lawrence <paullawrence@google.com> Mon Aug 18 07:42:29 2014 -0700
committer JP Abgrall <jpa@google.com> Mon Aug 25 19:24:10 2014 +0000
tree 3d7907f3a16aeaab57497f71ce980c8b06bd5d58
parent 82b76249fbc339e82ab47a956f7e17160247e4c4

Enable not rebooting during default encryption

Need to not set this property) during mount, since it can't
be changed later (ro property)

Also no reason to start class main on encryption cycle - we'll
show surfaceflinger, which is enough UI for this short cycle.

Bug: 17041092
Change-Id: Ica5339c54e45716d0fe20e23c0ab857f388d23ed

init/builtins.c

diff --git a/init/builtins.c b/init/builtins.c
index 6032184..de83c93 100644
--- a/init/builtins.c
+++ b/init/builtins.c
@@ -537,7 +537,6 @@
     }
 
     if (ret == FS_MGR_MNTALL_DEV_NEEDS_ENCRYPTION) {
-        property_set("ro.crypto.state", "unencrypted");
         property_set("vold.decrypt", "trigger_encryption");
     } else if (ret == FS_MGR_MNTALL_DEV_MIGHT_BE_ENCRYPTED) {
         property_set("ro.crypto.state", "encrypted");

rootdir/init.rc

diff --git a/rootdir/init.rc b/rootdir/init.rc
index 08b9a35..8f17ebc 100644
--- a/rootdir/init.rc
+++ b/rootdir/init.rc
@@ -429,7 +429,6 @@
 on property:vold.decrypt=trigger_encryption
     start surfaceflinger
     start encrypt
-    class_start main
 
 on property:sys.init_log_level=*
     loglevel ${sys.init_log_level}