commit 7016a2c4e6efa673f32b119a031e952593892665
author Steven Moreland <smoreland@google.com> Wed Jul 08 00:02:14 2020 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Wed Jul 08 00:02:14 2020 +0000
tree d457b581174f92b254e92d22edfcd71acba839f1
parent 587ebed7968d8080fb8ae1cee8b7b818b9a16495
parent fbb79f7bbe2aac2a75ef750fc020e8ed483b16bb

Merge "servicemanager: restart more services on crash" am: 021f5e9d9d am: 8107fd2da8 am: 4a83ba8f08 am: 971c242f94 am: fbb79f7bbe

Original change: https://android-review.googlesource.com/c/platform/frameworks/native/+/1312355

Change-Id: I88aec40f1e28925bcd8b818750acce82521d6fb9

cmds/servicemanager/servicemanager.rc

diff --git a/cmds/servicemanager/servicemanager.rc b/cmds/servicemanager/servicemanager.rc
index 152ac28..6d5070f 100644
--- a/cmds/servicemanager/servicemanager.rc
+++ b/cmds/servicemanager/servicemanager.rc
@@ -3,16 +3,11 @@
     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

cmds/servicemanager/vndservicemanager.rc

diff --git a/cmds/servicemanager/vndservicemanager.rc b/cmds/servicemanager/vndservicemanager.rc
index 3fa4d7d..756f6c3 100644
--- a/cmds/servicemanager/vndservicemanager.rc
+++ b/cmds/servicemanager/vndservicemanager.rc
@@ -3,4 +3,7 @@
     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