commit 1b5bc6f8f96fc30b651679411a4da00d3fbebaa7
author Dave Platt <dplatt@google.com> Tue Jan 07 19:55:43 2014 +0000
committer Android Git Automerger <android-git-automerger@android.com> Tue Jan 07 19:55:43 2014 +0000
tree 77146ae484aa484ec3a05e8b2f21f27ab5491d82
parent 105b545ec0ad5ea4f723f8d8b06de37f68c2f6c3
parent bd9acc2218fcf3cd6605554a45db2251753ddd7b

am bd9acc22: am e966e577: am 02f042dd: Fix socket descriptor leak from Zygote to child app

* commit 'bd9acc2218fcf3cd6605554a45db2251753ddd7b':
  Fix socket descriptor leak from Zygote to child app

core/java/com/android/internal/os/ZygoteInit.java

diff --git a/core/java/com/android/internal/os/ZygoteInit.java b/core/java/com/android/internal/os/ZygoteInit.java
index 25118e8..55d5513 100644
--- a/core/java/com/android/internal/os/ZygoteInit.java
+++ b/core/java/com/android/internal/os/ZygoteInit.java
@@ -192,10 +192,16 @@
     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;