commit bf146b8fc0ec19ca26aa13babe36a1d408a99197
author Nicolas Catania <niko@google.com> Tue Oct 13 16:55:21 2009 -0700
committer Android Git Automerger <android-git-automerger@android.com> Tue Oct 13 16:55:21 2009 -0700
tree 87b94898ea0328be02b7dc8150d2b76a9f5a3a09
parent d98635c7ae1cb1ddb1213f4277d568cb519708e6
parent 9f6c3d6036a7c8043217f112c2f1bb9eaebc9b11

am 9f6c3d60: Merge branch \'eclair-plus-aosp\' of ssh://android-git.corp.google.com:29418/platform/system/core into eclair-mr2-plus-aosp

Merge commit '9f6c3d6036a7c8043217f112c2f1bb9eaebc9b11'

* commit '9f6c3d6036a7c8043217f112c2f1bb9eaebc9b11':
  Force the mediaserver process to restart whenever the zygote or system

rootdir/init.rc

diff --git a/rootdir/init.rc b/rootdir/init.rc
index e07e106..e777970 100644
--- a/rootdir/init.rc
+++ b/rootdir/init.rc
@@ -276,6 +276,7 @@
     socket zygote stream 666
     onrestart write /sys/android_power/request_state wake
     onrestart write /sys/power/state on
+    onrestart restart media
 
 service media /system/bin/mediaserver
     user media