SocketImpl#getFileDescriptor shouldn't be public

It's protected, as it was before openJdk switch. Added
hidden public method getFD$ for tests.

Bug: 26689841
Change-Id: I18f53356a108c1f7e0525c6f2f8130eac173e81e
(cherry picked from commit ce41c4ee22dbf4d53c2ba5a21a63a0a3081bd732)

diff --git a/api/current.txt b/api/current.txt
index 6107169..7dd26e0 100644 (file)
--- a/api/current.txt
+++ b/api/current.txt
@@ -52428,7 +52428,7 @@ package java.net {
     method protected abstract void connect(java.net.InetAddress, int) throws java.io.IOException;
     method protected abstract void connect(java.net.SocketAddress, int) throws java.io.IOException;
     method protected abstract void create(boolean) throws java.io.IOException;
-    method public java.io.FileDescriptor getFileDescriptor();
+    method protected java.io.FileDescriptor getFileDescriptor();
     method protected java.net.InetAddress getInetAddress();
     method protected abstract java.io.InputStream getInputStream() throws java.io.IOException;
     method protected int getLocalPort();

diff --git a/api/system-current.txt b/api/system-current.txt
index b2f9675..d28261e 100644 (file)
--- a/api/system-current.txt
+++ b/api/system-current.txt
@@ -55516,7 +55516,7 @@ package java.net {
     method protected abstract void connect(java.net.InetAddress, int) throws java.io.IOException;
     method protected abstract void connect(java.net.SocketAddress, int) throws java.io.IOException;
     method protected abstract void create(boolean) throws java.io.IOException;
-    method public java.io.FileDescriptor getFileDescriptor();
+    method protected java.io.FileDescriptor getFileDescriptor();
     method protected java.net.InetAddress getInetAddress();
     method protected abstract java.io.InputStream getInputStream() throws java.io.IOException;
     method protected int getLocalPort();

diff --git a/api/test-current.txt b/api/test-current.txt
index 1f64b5e..9ec1e96 100644 (file)
--- a/api/test-current.txt
+++ b/api/test-current.txt
@@ -52445,7 +52445,7 @@ package java.net {
     method protected abstract void connect(java.net.InetAddress, int) throws java.io.IOException;
     method protected abstract void connect(java.net.SocketAddress, int) throws java.io.IOException;
     method protected abstract void create(boolean) throws java.io.IOException;
-    method public java.io.FileDescriptor getFileDescriptor();
+    method protected java.io.FileDescriptor getFileDescriptor();
     method protected java.net.InetAddress getInetAddress();
     method protected abstract java.io.InputStream getInputStream() throws java.io.IOException;
     method protected int getLocalPort();