diff options
| author | Dave Platt <dplatt@google.com> | 2014-02-13 13:34:11 -0800 |
|---|---|---|
| committer | Dave Platt <dplatt@google.com> | 2014-02-13 13:34:11 -0800 |
| commit | 80bf291ca9ea0e300aed82368ae77eb6218c9a19 (patch) | |
| tree | 234541fe798b07d84d739c3eb474017e296548e4 /dalvik | |
| parent | 421686e232cfddcf2800c04963242edd234d8a39 (diff) | |
| download | libcore-80bf291ca9ea0e300aed82368ae77eb6218c9a19.zip libcore-80bf291ca9ea0e300aed82368ae77eb6218c9a19.tar.gz libcore-80bf291ca9ea0e300aed82368ae77eb6218c9a19.tar.bz2 | |
Remove old fork-and-specialize API
As promised, this is the cleanup patch-set which removes the
old native "fork and specialize" API, which has been replaced
by a slightly-enhanced one which can close the Zygote socket
descriptors in the Zygote child.
Change-Id: Icaeab730bee8638354dc664524e4118cdd946d2f
Diffstat (limited to 'dalvik')
| -rw-r--r-- | dalvik/src/main/java/dalvik/system/Zygote.java | 16 |
1 files changed, 2 insertions, 14 deletions
diff --git a/dalvik/src/main/java/dalvik/system/Zygote.java b/dalvik/src/main/java/dalvik/system/Zygote.java index c8bc628..62ba7b0 100644 --- a/dalvik/src/main/java/dalvik/system/Zygote.java +++ b/dalvik/src/main/java/dalvik/system/Zygote.java @@ -133,26 +133,14 @@ public class Zygote { public static int forkAndSpecialize(int uid, int gid, int[] gids, int debugFlags, int[][] rlimits, int mountExternal, String seInfo, String niceName, int[] fdsToClose) { preFork(); - int pid = nativeForkAndSpecialize_new( - uid, gid, gids, debugFlags, rlimits, mountExternal, seInfo, niceName, fdsToClose); - postFork(); - return pid; - } - - public static int forkAndSpecialize(int uid, int gid, int[] gids, int debugFlags, - int[][] rlimits, int mountExternal, String seInfo, String niceName) { - preFork(); int pid = nativeForkAndSpecialize( - uid, gid, gids, debugFlags, rlimits, mountExternal, seInfo, niceName); + uid, gid, gids, debugFlags, rlimits, mountExternal, seInfo, niceName, fdsToClose); postFork(); return pid; } - native public static int nativeForkAndSpecialize_new(int uid, int gid, int[] gids, int debugFlags, - int[][] rlimits, int mountExternal, String seInfo, String niceName, int[] fdsToClose); - native public static int nativeForkAndSpecialize(int uid, int gid, int[] gids, int debugFlags, - int[][] rlimits, int mountExternal, String seInfo, String niceName); + int[][] rlimits, int mountExternal, String seInfo, String niceName, int[] fdsToClose); /** * Special method to start the system server process. In addition to the |