From c23074f386ded6cd28b2f8ba2331814b7491c802 Mon Sep 17 00:00:00 2001 From: Paul Lawrence Date: Mon, 18 Aug 2014 07:42:29 -0700 Subject: [PATCH] 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 | 1 - rootdir/init.rc | 1 - 2 files changed, 2 deletions(-) diff --git a/init/builtins.c b/init/builtins.c index 60321844e..de83c93ad 100644 --- a/init/builtins.c +++ b/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"); diff --git a/rootdir/init.rc b/rootdir/init.rc index 08b9a35da..8f17ebcd9 100644 --- a/rootdir/init.rc +++ b/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}