diff options
author | Narayan Kamath <narayan@google.com> | 2015-01-19 15:14:02 +0000 |
---|---|---|
committer | Android Git Automerger <android-git-automerger@android.com> | 2015-01-19 15:14:02 +0000 |
commit | 17f50f8119f4a8bdec304cde527f68ddd0b3bc0a (patch) | |
tree | 1727c50bb38f1600e66bf7b2cf2ec3ec1711c628 /core/java/android/os | |
parent | 3e809794fe558d8a10851c0ac22a65a2c81fa315 (diff) | |
parent | d8beca64e086a9c4a214c7dcb9b6e59c2c482173 (diff) | |
download | frameworks_base-17f50f8119f4a8bdec304cde527f68ddd0b3bc0a.zip frameworks_base-17f50f8119f4a8bdec304cde527f68ddd0b3bc0a.tar.gz frameworks_base-17f50f8119f4a8bdec304cde527f68ddd0b3bc0a.tar.bz2 |
am d8beca64: Merge "Remove support for --classpath and make --runtime-init the default."
* commit 'd8beca64e086a9c4a214c7dcb9b6e59c2c482173':
Remove support for --classpath and make --runtime-init the default.
Diffstat (limited to 'core/java/android/os')
-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) { |