Merge "Enable not rebooting during default encryption" into lmp-dev

init/builtins.c

@@ -537,7 +537,6 @@ int do_mount_all(int nargs, char **args)
     }
 
     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

@@ -429,7 +429,6 @@ on property:vold.decrypt=trigger_default_encryption
 on property:vold.decrypt=trigger_encryption
     start surfaceflinger
     start encrypt
-    class_start main
 
 on property:sys.init_log_level=*
     loglevel ${sys.init_log_level}