diff options
| author | Paul Lawrence <paullawrence@google.com> | 2016-04-19 14:44:26 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2016-04-19 14:44:26 +0000 |
| commit | fe5d55a68b9dc3a593d3f6ee5be919b8a9de710c (patch) | |
| tree | fe4734da204feea89e6db6e7ed8f46da7eab0ca6 /rootdir/init.rc | |
| parent | a9e818f4632eca67a5ffd1fb680d15550591ecd9 (diff) | |
| parent | 1f99218612fa12f2c3354c29bf8d761a27e50148 (diff) | |
Merge "Don't start defaultcrypto twice" into nyc-dev
Diffstat (limited to 'rootdir/init.rc')
| -rw-r--r-- | rootdir/init.rc | 7 |
1 files changed, 0 insertions, 7 deletions
diff --git a/rootdir/init.rc b/rootdir/init.rc index 28a9b9ac9..f505faf36 100644 --- a/rootdir/init.rc +++ b/rootdir/init.rc @@ -557,13 +557,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} |