summaryrefslogtreecommitdiff
path: root/rootdir/init.rc
diff options
context:
space:
mode:
authorPaul Lawrence <paullawrence@google.com>2016-04-18 15:37:31 -0700
committerPaul Lawrence <paullawrence@google.com>2016-04-18 15:37:31 -0700
commit1f99218612fa12f2c3354c29bf8d761a27e50148 (patch)
tree80f16e45a45841e115b192809c4d6a22c40758ac /rootdir/init.rc
parent3c535de75e3da05e32e69dfcdd6a864dbdc451fd (diff)
Don't start defaultcrypto twice
The old way (using triggers) starts defaultcrypto twice because queue_property_triggers_action retriggers the action. Bug: 27452459 Change-Id: I48c844836f551673d0dbfed6c33bd8ee1e035f40
Diffstat (limited to 'rootdir/init.rc')
-rw-r--r--rootdir/init.rc7
1 files changed, 0 insertions, 7 deletions
diff --git a/rootdir/init.rc b/rootdir/init.rc
index 3e2f0a589..2f027d7df 100644
--- a/rootdir/init.rc
+++ b/rootdir/init.rc
@@ -556,13 +556,6 @@ on nonencrypted
class_start main
class_start late_start
-on property:vold.decrypt=trigger_default_encryption
- start defaultcrypto
-
-on property:vold.decrypt=trigger_encryption
- start surfaceflinger
- start encrypt
-
on property:sys.init_log_level=*
loglevel ${sys.init_log_level}