diff options
author | Colin Cross <ccross@android.com> | 2013-08-23 14:42:21 -0700 |
---|---|---|
committer | Android Git Automerger <android-git-automerger@android.com> | 2013-08-23 14:42:21 -0700 |
commit | a34f1391bd9c368aceecb3f8dec158b2cb8b2dd4 (patch) | |
tree | aee58926a4d6e0c486439c6cb01a69baa61cb6cb /rootdir | |
parent | 51cf3502f645e96a40ce8f2f65cc21279609b8af (diff) | |
parent | 30caffc025aff450ebb354ee693174cc1732732b (diff) | |
download | system_core-a34f1391bd9c368aceecb3f8dec158b2cb8b2dd4.zip system_core-a34f1391bd9c368aceecb3f8dec158b2cb8b2dd4.tar.gz system_core-a34f1391bd9c368aceecb3f8dec158b2cb8b2dd4.tar.bz2 |
am 30caffc0: resolved conflicts for merge of a1af5cf6 to klp-dev-plus-aosp
* commit '30caffc025aff450ebb354ee693174cc1732732b':
Handle policy reloads within ueventd rather than restarting it.
Diffstat (limited to 'rootdir')
-rw-r--r-- | rootdir/init.rc | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/rootdir/init.rc b/rootdir/init.rc index 729879a..33dd40e 100644 --- a/rootdir/init.rc +++ b/rootdir/init.rc @@ -412,10 +412,6 @@ service healthd-charger /sbin/healthd -n critical seclabel u:r:healthd:s0 -on property:selinux.reload_policy=1 - restart ueventd - restart installd - service console /system/bin/sh class core console |