| commit | 4a79484648262d5d0dc9e72c3d9cf36c77cca599 | [log] [tgz] |
|---|---|---|
| author | Nick Kralevich <nnk@google.com> | Fri Feb 28 21:02:20 2014 +0000 |
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | Fri Feb 28 21:02:21 2014 +0000 |
| tree | 5737451b3d41f56ab398505ca445f51e2da95a0e | |
| parent | eee2c72f96cd4e6228c50c8b461b4dd84a9f4538 [diff] | |
| parent | d75932b521bc23fee304c3bf9e023762cf3fbb82 [diff] |
Merge "Fix descriptor leak after accepting connections"
diff --git a/core/java/android/net/LocalSocketImpl.java b/core/java/android/net/LocalSocketImpl.java index b2ee50a..119e533 100644 --- a/core/java/android/net/LocalSocketImpl.java +++ b/core/java/android/net/LocalSocketImpl.java
@@ -326,6 +326,7 @@ } s.fd = accept(fd, s); + s.mFdCreatedInternally = true; } /** @@ -536,4 +537,3 @@ close(); } } -