diff options
| author | Nick Kralevich <nnk@google.com> | 2014-02-28 13:04:42 -0800 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-02-28 13:04:42 -0800 |
| commit | 787d81453ce1e5451bd2c289c8b53cfeda2eab29 (patch) | |
| tree | 59da6c734de22ac551e2f9569633f4a5c122d1bd /core/java/android | |
| parent | 8fb22ae772fc62a10db6a06f283140d9233e8704 (diff) | |
| parent | 4a79484648262d5d0dc9e72c3d9cf36c77cca599 (diff) | |
am 4a794846: Merge "Fix descriptor leak after accepting connections"
* commit '4a79484648262d5d0dc9e72c3d9cf36c77cca599':
Fix descriptor leak after accepting connections
Diffstat (limited to 'core/java/android')
| -rw-r--r-- | core/java/android/net/LocalSocketImpl.java | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/core/java/android/net/LocalSocketImpl.java b/core/java/android/net/LocalSocketImpl.java index b2ee50afc608..119e5330f127 100644 --- 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(); } } - |