commit 5ebcaf1bb09dbf2f7375163997acd843a0e5780a
author Wei Wang <wvw@google.com> Tue Jul 11 19:49:01 2017 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Tue Jul 11 19:49:01 2017 +0000
tree 9cf88c4eaf2267835f037facc4fb367d09216499
parent 2b7b5c34d31d11d3f2066afd7ab1c406e8c99fc4
parent 699fbb73daaf33e080288f8513b0d56037dfe1a9

Merge changes from topic 'svcmgr_shutdown_critical' into oc-dr1-dev

* changes:
  servicemanager: Mark servicemanager as shutdown critical
  servicemanager: Mark vndservicemanager as shutdown critical

cmds/servicemanager/servicemanager.rc

diff --git a/cmds/servicemanager/servicemanager.rc b/cmds/servicemanager/servicemanager.rc
index aec211a..d336a43 100644
--- a/cmds/servicemanager/servicemanager.rc
+++ b/cmds/servicemanager/servicemanager.rc
@@ -12,3 +12,4 @@
     onrestart restart drm
     onrestart restart cameraserver
     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 d5ddaaf..3fa4d7d 100644
--- a/cmds/servicemanager/vndservicemanager.rc
+++ b/cmds/servicemanager/vndservicemanager.rc
@@ -3,4 +3,4 @@
     user system
     group system readproc
     writepid /dev/cpuset/system-background/tasks
-
+    shutdown critical