Merge "Set isConnected, isBound, implCreated on server-side LocalSockets"

core/java/android/net/LocalServerSocket.java

@@ -89,7 +89,7 @@ public class LocalServerSocket {
 
         impl.accept(acceptedImpl);
 
-        return new LocalSocket(acceptedImpl, LocalSocket.SOCKET_UNKNOWN);
+        return LocalSocket.createLocalSocketForAccept(acceptedImpl, LocalSocket.SOCKET_UNKNOWN);
     }
 
     /**

core/java/android/net/LocalSocket.java

@@ -75,17 +75,24 @@ public class LocalSocket implements Closeable {
         isConnected = true;
     }
 
-    /**
+    private LocalSocket(LocalSocketImpl impl, int sockType) {
-     * for use with AndroidServerSocket
-     * @param impl a SocketImpl
-     */
-    /*package*/ LocalSocket(LocalSocketImpl impl, int sockType) {
         this.impl = impl;
         this.sockType = sockType;
         this.isConnected = false;
         this.isBound = false;
     }
 
+    /**
+     * for use with LocalServerSocket.accept()
+     */
+    static LocalSocket createLocalSocketForAccept(LocalSocketImpl impl, int sockType) {
+        LocalSocket socket = new LocalSocket(impl, sockType);
+        socket.isConnected = true;
+        socket.isBound = true;
+        socket.implCreated = true;
+        return socket;
+    }
+
     /** {@inheritDoc} */
     @Override
     public String toString() {

core/java/android/net/LocalSocketImpl.java

@@ -235,9 +235,10 @@ class LocalSocketImpl
      * @throws IOException
      */
     public void create(int sockType) throws IOException {
-        // no error if socket already created
+        if (fd != null) {
-        // need this for LocalServerSocket.accept()
+            throw new IOException("LocalSocketImpl already has an fd");
-        if (fd == null) {
+        }
+
         int osType;
         switch (sockType) {
             case LocalSocket.SOCKET_DGRAM:
@@ -259,7 +260,6 @@ class LocalSocketImpl
             e.rethrowAsIOException();
         }
     }
-    }
 
     /**
      * Closes the socket.