diff options
| author | Narayan Kamath <narayan@google.com> | 2015-01-19 15:21:30 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-01-19 15:21:30 +0000 |
| commit | 66bbfb6b2ccedecba3cbd0843b5a9ae498c68c82 (patch) | |
| tree | 676655edf897bf266a29601210b0d2d7e51f44d1 /core/java/android | |
| parent | 1f7d657b43fd7d40c402340c02ece5beb4b28c52 (diff) | |
| parent | 17f50f8119f4a8bdec304cde527f68ddd0b3bc0a (diff) | |
| download | frameworks_base-66bbfb6b2ccedecba3cbd0843b5a9ae498c68c82.zip frameworks_base-66bbfb6b2ccedecba3cbd0843b5a9ae498c68c82.tar.gz frameworks_base-66bbfb6b2ccedecba3cbd0843b5a9ae498c68c82.tar.bz2 | |
am 17f50f81: am d8beca64: Merge "Remove support for --classpath and make --runtime-init the default."
* commit '17f50f8119f4a8bdec304cde527f68ddd0b3bc0a':
Remove support for --classpath and make --runtime-init the default.
Diffstat (limited to 'core/java/android')
| -rw-r--r-- | core/java/android/os/Process.java | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/core/java/android/os/Process.java b/core/java/android/os/Process.java index 21a9904..4834f97 100644 --- a/core/java/android/os/Process.java +++ b/core/java/android/os/Process.java @@ -614,9 +614,9 @@ public class Process { synchronized(Process.class) { ArrayList<String> argsForZygote = new ArrayList<String>(); - // --runtime-init, --setuid=, --setgid=, + // --runtime-args, --setuid=, --setgid=, // and --setgroups= must go first - argsForZygote.add("--runtime-init"); + argsForZygote.add("--runtime-args"); argsForZygote.add("--setuid=" + uid); argsForZygote.add("--setgid=" + gid); if ((debugFlags & Zygote.DEBUG_ENABLE_JNI_LOGGING) != 0) { |