commit 3bbf7e6aa5a9eda1cc4b1c57da832ebee3bb5dd8
author Dave Platt <dplatt@google.com> Tue Jan 07 11:53:12 2014 -0800
committer Android Git Automerger <android-git-automerger@android.com> Tue Jan 07 11:53:12 2014 -0800
tree 53755e7763b3cb751db8dfb08e40a4687d45520d
parent bd9acc2218fcf3cd6605554a45db2251753ddd7b
parent 62bac75d677de5398b48487e758dcbdf7bc9d834

am 62bac75d: am 76e5ca81: Fix descriptor leak after accepting connections

* commit '62bac75d677de5398b48487e758dcbdf7bc9d834':
  Fix descriptor leak after accepting connections

core/java/android/net/LocalSocketImpl.java

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();
     }
 }
-