summaryrefslogtreecommitdiffstats
path: root/toolbox
diff options
context:
space:
mode:
authorNarayan Kamath <narayan@google.com>2014-05-15 09:20:27 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2014-05-15 09:20:27 +0000
commitb3bd09cda0ff29d53e91a6ec056b30a3c8b148a2 (patch)
treef9383ba03986222cb80977a42b03a7629e17c393 /toolbox
parent101e92acf18c43cffe1af30a3ced0296947c482d (diff)
parent9cbc808827950ae70b2a0bb9cb92f30fd1fbc724 (diff)
downloadsystem_core-b3bd09cda0ff29d53e91a6ec056b30a3c8b148a2.zip
system_core-b3bd09cda0ff29d53e91a6ec056b30a3c8b148a2.tar.gz
system_core-b3bd09cda0ff29d53e91a6ec056b30a3c8b148a2.tar.bz2
am 9cbc8088: am 5f6beb12: Merge ""stop" / "start must apply to the secondary zygote as well."
* commit '9cbc808827950ae70b2a0bb9cb92f30fd1fbc724': "stop" / "start must apply to the secondary zygote as well.
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 665a941..26344da 100644
--- a/toolbox/start.c
+++ b/toolbox/start.c
@@ -15,6 +15,7 @@ int start_main(int argc, char *argv[])
/* defaults to starting the common services stopped by stop.c */
property_set("ctl.start", "surfaceflinger");
property_set("ctl.start", "zygote");
+ property_set("ctl.start", "zygote_secondary");
}
return 0;
diff --git a/toolbox/stop.c b/toolbox/stop.c
index 460f377..6552c7c 100644
--- a/toolbox/stop.c
+++ b/toolbox/stop.c
@@ -11,6 +11,7 @@ int stop_main(int argc, char *argv[])
property_set("ctl.stop", argv[1]);
} else{
/* defaults to stopping the common services */
+ property_set("ctl.stop", "zygote_secondary");
property_set("ctl.stop", "zygote");
property_set("ctl.stop", "surfaceflinger");
}