am e966e577: am 02f042dd: Fix socket descriptor leak from Zygote to child app (bd9acc22) · Commits · e / os / android_frameworks_base

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

+6 −0

Original line number	Diff line number	Diff line
		@@ -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;