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: I33f504afd242e268863270139b4e421d4b0728f2

1 files changed, 1 insertions, 18 deletions

diff --git a/vm/native/dalvik_system_Zygote.cpp b/vm/native/dalvik_system_Zygote.cpp
index 9eb483ae0..3dd56fb46 100644
--- a/vm/native/dalvik_system_Zygote.cpp
+++ b/vm/native/dalvik_system_Zygote.cpp
@@ -753,27 +753,12 @@ static pid_t forkAndSpecializeCommon(const u4* args, bool isSystemServer, bool l
  *     int[] gids, int debugFlags, int[][] rlimits, int mountExternal,
  *     String seInfo, String niceName, int[] fdsToClose);
  */
-static void Dalvik_dalvik_system_Zygote_forkAndSpecialize_new(const u4* args,
-    JValue* pResult)
-{
-    pid_t pid;
-
-    pid = forkAndSpecializeCommon(args, false, false);
-
-    RETURN_INT(pid);
-}
-
-/*
- * native public static int nativeForkAndSpecialize(int uid, int gid,
- *     int[] gids, int debugFlags, int[][] rlimits, int mountExternal,
- *     String seInfo, String niceName);
- */
 static void Dalvik_dalvik_system_Zygote_forkAndSpecialize(const u4* args,
     JValue* pResult)
 {
     pid_t pid;
 
-    pid = forkAndSpecializeCommon(args, false, true);
+    pid = forkAndSpecializeCommon(args, false, false);
 
     RETURN_INT(pid);
 }
@@ -811,8 +796,6 @@ const DalvikNativeMethod dvm_dalvik_system_Zygote[] = {
     { "nativeFork", "()I",
       Dalvik_dalvik_system_Zygote_fork },
     { "nativeForkAndSpecialize", "(II[II[[IILjava/lang/String;Ljava/lang/String;[I)I",
-      Dalvik_dalvik_system_Zygote_forkAndSpecialize_new },
-    { "nativeForkAndSpecialize", "(II[II[[IILjava/lang/String;Ljava/lang/String;)I",
       Dalvik_dalvik_system_Zygote_forkAndSpecialize },
     { "nativeForkSystemServer", "(II[II[[IJJ)I",
       Dalvik_dalvik_system_Zygote_forkSystemServer },