diff options
| author | Dave Platt <dplatt@google.com> | 2014-01-07 19:59:21 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-01-07 19:59:21 +0000 |
| commit | 5dd0be293694706e016d6ff431668de2d318f3aa (patch) | |
| tree | b09c0660e921065ad01ecd916bca953c0c620dd4 /core | |
| parent | d5d0ab5ba9203804dea82be9bd13770428455e5f (diff) | |
| parent | 07290a7be312c5da63857903dc6931cea5a2f2ea (diff) | |
| download | frameworks_base-5dd0be293694706e016d6ff431668de2d318f3aa.zip frameworks_base-5dd0be293694706e016d6ff431668de2d318f3aa.tar.gz frameworks_base-5dd0be293694706e016d6ff431668de2d318f3aa.tar.bz2 | |
am 07290a7b: am 3bbf7e6a: am 62bac75d: am 76e5ca81: Fix descriptor leak after accepting connections
* commit '07290a7be312c5da63857903dc6931cea5a2f2ea':
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(); } } - |