diff options
| author | Narayan Kamath <narayan@google.com> | 2014-05-15 09:18:15 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-05-15 09:18:15 +0000 |
| commit | 9cbc808827950ae70b2a0bb9cb92f30fd1fbc724 (patch) | |
| tree | 2e2f2cbfcb8d3b77abee4ac3fea531e9b187f243 /toolbox | |
| parent | 020f81bf1270bfa72167e3c358abf33bb60778a5 (diff) | |
| parent | 5f6beb12c1b66d6fbcebd86383f29337674ac75c (diff) | |
| download | system_core-9cbc808827950ae70b2a0bb9cb92f30fd1fbc724.zip system_core-9cbc808827950ae70b2a0bb9cb92f30fd1fbc724.tar.gz system_core-9cbc808827950ae70b2a0bb9cb92f30fd1fbc724.tar.bz2 | |
am 5f6beb12: Merge ""stop" / "start must apply to the secondary zygote as well."
* commit '5f6beb12c1b66d6fbcebd86383f29337674ac75c':
"stop" / "start must apply to the secondary zygote as well.
Diffstat (limited to 'toolbox')
| -rw-r--r-- | toolbox/start.c | 1 | ||||
| -rw-r--r-- | toolbox/stop.c | 1 |
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"); } |