commit 26cc9779273f7ad2a4c0345256da1e2da930145f
author Treehugger Robot <treehugger-gerrit@google.com> Fri Mar 17 13:43:58 2017 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Fri Mar 17 13:43:59 2017 +0000
tree cd64e187cb001a23f8f2f99a629bd26ebce7ef42
parent 9ecc1618bac71c236808f332816ee0dc10121ad9
parent 62098900d7201b01db7905a8ff1debea4b639a30

Merge "Add getFileDescriptor$() method for testing"

ojluni/src/main/java/java/net/DatagramSocket.java

diff --git a/ojluni/src/main/java/java/net/DatagramSocket.java b/ojluni/src/main/java/java/net/DatagramSocket.java
index cdb8ef7..34f3a2d 100755
--- a/ojluni/src/main/java/java/net/DatagramSocket.java
+++ b/ojluni/src/main/java/java/net/DatagramSocket.java
@@ -1347,12 +1347,17 @@
         factory = fac;
     }
 
-    /** @hide */
+    /**
+     * Android-added: for testing and internal use.
+     *
+     * @hide internal use only
+     */
     public FileDescriptor getFileDescriptor$() {
         return impl.fd;
     }
 
     /**
+     * Android-added:
      * Sets the network interface used by this socket.  Any packets sent
      * via this socket are transmitted via the specified interface.  Any
      * packets received by this socket will come from the specified

ojluni/src/main/java/java/net/ServerSocket.java

diff --git a/ojluni/src/main/java/java/net/ServerSocket.java b/ojluni/src/main/java/java/net/ServerSocket.java
index ccf88f8..670acf2 100644
--- a/ojluni/src/main/java/java/net/ServerSocket.java
+++ b/ojluni/src/main/java/java/net/ServerSocket.java
@@ -922,4 +922,12 @@
         /* Not implemented yet */
     }
 
+    /**
+     * Android-added: for testing and internal use.
+     *
+     * @hide internal use only
+     */
+    public FileDescriptor getFileDescriptor$() {
+        return impl.getFileDescriptor();
+    }
 }

ojluni/src/main/java/java/net/Socket.java

diff --git a/ojluni/src/main/java/java/net/Socket.java b/ojluni/src/main/java/java/net/Socket.java
index ed18b48..9d566b1 100644
--- a/ojluni/src/main/java/java/net/Socket.java
+++ b/ojluni/src/main/java/java/net/Socket.java
@@ -1769,6 +1769,8 @@
     }
 
     /**
+     * Android-added: for testing and internal use.
+     *
      * @hide internal use only
      */
     public FileDescriptor getFileDescriptor$() {

ojluni/src/main/java/sun/nio/ch/DatagramSocketAdaptor.java

diff --git a/ojluni/src/main/java/sun/nio/ch/DatagramSocketAdaptor.java b/ojluni/src/main/java/sun/nio/ch/DatagramSocketAdaptor.java
index 3158215..762df01 100644
--- a/ojluni/src/main/java/sun/nio/ch/DatagramSocketAdaptor.java
+++ b/ojluni/src/main/java/sun/nio/ch/DatagramSocketAdaptor.java
@@ -361,7 +361,9 @@
         return dc;
     }
 
-    /** @hide */
+    /*
+     * Android-added: for testing and internal use.
+     */
     @Override
     public final FileDescriptor getFileDescriptor$() {
         return dc.fd;

ojluni/src/main/java/sun/nio/ch/SocketAdaptor.java

diff --git a/ojluni/src/main/java/sun/nio/ch/SocketAdaptor.java b/ojluni/src/main/java/sun/nio/ch/SocketAdaptor.java
index 10f6b25..aa6d834 100644
--- a/ojluni/src/main/java/sun/nio/ch/SocketAdaptor.java
+++ b/ojluni/src/main/java/sun/nio/ch/SocketAdaptor.java
@@ -453,6 +453,9 @@
         return !sc.isOutputOpen();
     }
 
+    /*
+     * Android-added: for testing and internal use.
+     */
     @Override
     public FileDescriptor getFileDescriptor$() {
         return sc.getFD();