Merge "Enable not rebooting during default encryption" into lmp-dev
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");
diff --git a/rootdir/init.rc b/rootdir/init.rc
index 25593a9..4dd8458 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}