Replace createDatagramSocket and createStreamSocket with one call.

(Continuing our policy of having native methods' names correspond to the
underlying syscall, this one sadly gets the ugly name of "socket".)

Change-Id: Icf08e4e0637ee3ae9eab673d350860181f547250

1 files changed, 2 insertions, 6 deletions

diff --git a/dalvik/src/main/java/dalvik/system/BlockGuard.java b/dalvik/src/main/java/dalvik/system/BlockGuard.java
index 0cf8a8a..0e8c892 100644
--- a/dalvik/src/main/java/dalvik/system/BlockGuard.java
+++ b/dalvik/src/main/java/dalvik/system/BlockGuard.java
@@ -332,8 +332,8 @@ public final class BlockGuard {
             mNetwork.disconnectDatagram(aFD);
         }
 
-        public void createDatagramSocket(FileDescriptor aFD) throws SocketException {
-            mNetwork.createDatagramSocket(aFD);
+        public void socket(FileDescriptor aFD, boolean stream) throws SocketException {
+            mNetwork.socket(aFD, stream);
         }
 
         public void shutdownInput(FileDescriptor descriptor) throws IOException {
@@ -348,10 +348,6 @@ public final class BlockGuard {
             mNetwork.sendUrgentData(fd, value);
         }
 
-        public void createStreamSocket(FileDescriptor aFD) throws SocketException {
-            mNetwork.createStreamSocket(aFD);
-        }
-
         public void listen(FileDescriptor aFD, int backlog) throws SocketException {
             mNetwork.listen(aFD, backlog);
         }