summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Steven Moreland <smoreland@google.com> 2020-07-07 23:50:00 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2020-07-07 23:50:00 +0000
commitfbb79f7bbe2aac2a75ef750fc020e8ed483b16bb (patch)
tree054545c63a228151f10b5ad51de47880713a8038
parentfab440f73c556203e61cfb8e43175a97e0a27afb (diff)
parent971c242f946c70d02a8705971fa72bef3af826b6 (diff)
Merge "servicemanager: restart more services on crash" am: 021f5e9d9d am: 8107fd2da8 am: 4a83ba8f08 am: 971c242f94
Original change: https://android-review.googlesource.com/c/platform/frameworks/native/+/1312355 Change-Id: Ia5265b6f53e207812bd984583202da69b0c024dd
-rw-r--r--cmds/servicemanager/servicemanager.rc13
-rw-r--r--cmds/servicemanager/vndservicemanager.rc3
2 files changed, 7 insertions, 9 deletions
diff --git a/cmds/servicemanager/servicemanager.rc b/cmds/servicemanager/servicemanager.rc
index 152ac28ba4..6d5070fa04 100644
--- a/cmds/servicemanager/servicemanager.rc
+++ b/cmds/servicemanager/servicemanager.rc
@@ -3,16 +3,11 @@ service servicemanager /system/bin/servicemanager
user system
group system readproc
critical
- onrestart restart healthd
- onrestart restart zygote
+ onrestart restart apexd
onrestart restart audioserver
- onrestart restart media
- onrestart restart surfaceflinger
- onrestart restart inputflinger
- onrestart restart drm
- onrestart restart cameraserver
- onrestart restart keystore
onrestart restart gatekeeperd
- onrestart restart thermalservice
+ onrestart class_restart main
+ onrestart class_restart hal
+ onrestart class_restart early_hal
writepid /dev/cpuset/system-background/tasks
shutdown critical
diff --git a/cmds/servicemanager/vndservicemanager.rc b/cmds/servicemanager/vndservicemanager.rc
index 3fa4d7debd..756f6c3bc8 100644
--- a/cmds/servicemanager/vndservicemanager.rc
+++ b/cmds/servicemanager/vndservicemanager.rc
@@ -3,4 +3,7 @@ service vndservicemanager /vendor/bin/vndservicemanager /dev/vndbinder
user system
group system readproc
writepid /dev/cpuset/system-background/tasks
+ onrestart class_restart main
+ onrestart class_restart hal
+ onrestart class_restart early_hal
shutdown critical