diff options
| author | Robert Greenwalt <rgreenwalt@google.com> | 2013-12-06 22:15:49 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2013-12-06 22:15:49 +0000 |
| commit | 5436b0cfe3d73d4d24908f2051ce2cd923fd7c9c (patch) | |
| tree | c9744cd781e183fa636f5d1e18abea79b6e7559e | |
| parent | 36be65f56bf6b77eb6ae0d252d2653d236d945ca (diff) | |
| parent | 3e7305c6bf6062b5cb1e2ddcec6c6d30b4a8bc0d (diff) | |
| download | frameworks_base-5436b0cfe3d73d4d24908f2051ce2cd923fd7c9c.zip frameworks_base-5436b0cfe3d73d4d24908f2051ce2cd923fd7c9c.tar.gz frameworks_base-5436b0cfe3d73d4d24908f2051ce2cd923fd7c9c.tar.bz2 | |
Merge "Fix descriptor leak after accepting connections"
| -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(); } } - |