Snap for 5401728 from 498af920032519fe9683866884cf0c9509fa48ee to qt-release

Change-Id: Ice68ddc8ba7fc2c182cc4fe7fc698576ed7d7f6a
diff --git a/Common/src/com/googlecode/android_scripting/facade/net/SocketFacade.java b/Common/src/com/googlecode/android_scripting/facade/net/SocketFacade.java
index 762690c..eb35448 100644
--- a/Common/src/com/googlecode/android_scripting/facade/net/SocketFacade.java
+++ b/Common/src/com/googlecode/android_scripting/facade/net/SocketFacade.java
@@ -232,6 +232,24 @@
     }
 
     /**
+     * Get the local port on which the ServerSocket is listening. Useful when the server socket
+     * is initialized with 0 port (i.e. selects an available port)
+     *
+     * @param id : Hash key of ServerSocket (returned by
+     * {@link #openTcpServerSocket(String, Integer)}.
+     * @return An integer - the port number (0 in case of an error).
+     */
+    @Rpc(description = "Get the TCP Server socket port number")
+    public Integer getTcpServerSocketPort(String id) {
+        ServerSocket socket = sServerSocketHashMap.get(id);
+        if (socket == null) {
+            Log.e("Socket: Server socket does not exist for the requested id");
+            return 0;
+        }
+        return socket.getLocalPort();
+    }
+
+    /**
      * Accept TCP connection
      * @param id : Hash key of ServerSocket
      * @return Hash key of Socket returned by accept()