am 4a794846: Merge "Fix descriptor leak after accepting connections"

* commit '4a79484648262d5d0dc9e72c3d9cf36c77cca599': Fix descriptor leak after accepting connections
2014-02-28 13:04:42 -08:00
parent 8fb22ae772 4a79484648
commit 787d81453c
1 changed files with 1 additions and 1 deletions
--- a/core/java/android/net/LocalSocketImpl.java
+++ b/core/java/android/net/LocalSocketImpl.java
@@ -326,6 +326,7 @@ class LocalSocketImpl
        }

        s.fd = accept(fd, s);
+        s.mFdCreatedInternally = true;
    }

    /**
@@ -536,4 +537,3 @@ class LocalSocketImpl
        close();
    }
 }
-