Merge "Fix socket descriptor leak from Zygote to child app"

2013-12-13 00:35:41 +00:00
parent 833a9e58ce 70ef29b04e
commit 285fc7a7cd
1 changed files with 6 additions and 0 deletions
--- a/core/java/com/android/internal/os/ZygoteInit.java
+++ b/core/java/com/android/internal/os/ZygoteInit.java
@@ -192,10 +192,16 @@ public class ZygoteInit {
    static void closeServerSocket() {
        try {
            if (sServerSocket != null) {
+                FileDescriptor fd = sServerSocket.getFileDescriptor();
                sServerSocket.close();
+                if (fd != null) {
+                    Libcore.os.close(fd);
+                }
            }
        } catch (IOException ex) {
            Log.e(TAG, "Zygote:  error closing sockets", ex);
+        } catch (libcore.io.ErrnoException ex) {
+            Log.e(TAG, "Zygote:  error closing descriptor", ex);
        }

        sServerSocket = null;