summaryrefslogtreecommitdiffstats
path: root/rootdir/init.rc
diff options
context:
space:
mode:
authorPaul Lawrence <paullawrence@google.com>2014-08-18 07:42:29 -0700
committerJP Abgrall <jpa@google.com>2014-08-25 19:24:10 +0000
commitc23074f386ded6cd28b2f8ba2331814b7491c802 (patch)
tree3d7907f3a16aeaab57497f71ce980c8b06bd5d58 /rootdir/init.rc
parent82b76249fbc339e82ab47a956f7e17160247e4c4 (diff)
downloadsystem_core-c23074f386ded6cd28b2f8ba2331814b7491c802.zip
system_core-c23074f386ded6cd28b2f8ba2331814b7491c802.tar.gz
system_core-c23074f386ded6cd28b2f8ba2331814b7491c802.tar.bz2
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
Diffstat (limited to 'rootdir/init.rc')
-rw-r--r--rootdir/init.rc1
1 files changed, 0 insertions, 1 deletions
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_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}