Merge "Fix socket descriptor leak from Zygote to child app" (285fc7a7) · Commits · e / os / android_frameworks_base

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

+6 −0

Original line number	Original line	Diff line number	Diff line
	@@ -192,10 +192,16 @@ public class ZygoteInit {
	static void closeServerSocket() {		static void closeServerSocket() {
	try {		try {
	if (sServerSocket != null) {		if (sServerSocket != null) {
			FileDescriptor fd = sServerSocket.getFileDescriptor();
	sServerSocket.close();		sServerSocket.close();
			if (fd != null) {
			Libcore.os.close(fd);
			}
	}		}
	} catch (IOException ex) {		} catch (IOException ex) {
	Log.e(TAG, "Zygote: error closing sockets", ex);		Log.e(TAG, "Zygote: error closing sockets", ex);
			} catch (libcore.io.ErrnoException ex) {
			Log.e(TAG, "Zygote: error closing descriptor", ex);
	}		}

	sServerSocket = null;		sServerSocket = null;