summaryrefslogtreecommitdiffstats
path: root/toolbox
diff options
context:
space:
mode:
authorSreeram Ramachandran <sreeram@google.com>2014-07-19 00:47:59 -0700
committerSreeram Ramachandran <sreeram@google.com>2014-07-22 22:43:42 +0000
commit435fe9bb02f250c5bc617462d82f718b67207774 (patch)
treea2016ff7f19628d9c00d47240bf5924873d1316c /toolbox
parent930d53eae6a12b3b11c7d0043ec8c7674b1047cc (diff)
downloadsystem_core-435fe9bb02f250c5bc617462d82f718b67207774.zip
system_core-435fe9bb02f250c5bc617462d82f718b67207774.tar.gz
system_core-435fe9bb02f250c5bc617462d82f718b67207774.tar.bz2
Stop and start netd explicitly for "adb shell stop/start". DO NOT MERGE
netd is supposed to be restarted when the zygote is restarted (see the "onrestart" section for "service zygote" in init.zygote*.rc). But this only works if you send a restart command (say via "ctl.restart"). "stop && start" != "restart". It seems ingrained in developers to do "stop && start", so we don't have much hope of convincing everyone to switch to "adb shell restart", even if we did add such a toolbox command. (cherry picked from commit 018c6a57f3ba41b46deb8dc5fe542765e5b78791) Bug: 15855807 Change-Id: I387fe86600f4a2862abc3a05a2ef9a1e7374e21d
Diffstat (limited to 'toolbox')
-rw-r--r--toolbox/start.c1
-rw-r--r--toolbox/stop.c1
2 files changed, 2 insertions, 0 deletions
diff --git a/toolbox/start.c b/toolbox/start.c
index 0941e64..6c8a3f2 100644
--- a/toolbox/start.c
+++ b/toolbox/start.c
@@ -11,6 +11,7 @@ int start_main(int argc, char *argv[])
property_set("ctl.start", argv[1]);
} else {
/* defaults to starting the common services stopped by stop.c */
+ property_set("ctl.start", "netd");
property_set("ctl.start", "surfaceflinger");
property_set("ctl.start", "zygote");
property_set("ctl.start", "zygote_secondary");
diff --git a/toolbox/stop.c b/toolbox/stop.c
index ed9a293..5e3ce3c 100644
--- a/toolbox/stop.c
+++ b/toolbox/stop.c
@@ -12,6 +12,7 @@ int stop_main(int argc, char *argv[])
property_set("ctl.stop", "zygote_secondary");
property_set("ctl.stop", "zygote");
property_set("ctl.stop", "surfaceflinger");
+ property_set("ctl.stop", "netd");
}
return 0;