diff options
| author | Dave Platt <dplatt@google.com> | 2014-01-07 11:53:12 -0800 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-01-07 11:53:12 -0800 |
| commit | 3bbf7e6aa5a9eda1cc4b1c57da832ebee3bb5dd8 (patch) | |
| tree | 53755e7763b3cb751db8dfb08e40a4687d45520d /core | |
| parent | bd9acc2218fcf3cd6605554a45db2251753ddd7b (diff) | |
| parent | 62bac75d677de5398b48487e758dcbdf7bc9d834 (diff) | |
| download | frameworks_base-3bbf7e6aa5a9eda1cc4b1c57da832ebee3bb5dd8.zip frameworks_base-3bbf7e6aa5a9eda1cc4b1c57da832ebee3bb5dd8.tar.gz frameworks_base-3bbf7e6aa5a9eda1cc4b1c57da832ebee3bb5dd8.tar.bz2 | |
am 62bac75d: am 76e5ca81: Fix descriptor leak after accepting connections
* commit '62bac75d677de5398b48487e758dcbdf7bc9d834':
Fix descriptor leak after accepting connections
Diffstat (limited to 'core')
| -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 b2ee50a..119e533 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(); } } - |