summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Przemyslaw Szczepaniak <pszczepaniak@google.com> 2016-02-08 16:54:35 +0000
committer Przemyslaw Szczepaniak <pszczepaniak@google.com> 2016-02-11 10:18:48 +0000
commit8d4242c85d06fac67b46f0b9cb3462e0411e313c (patch)
treeefdbae8b0380b31aa916dba5d53cc258998e72bf
parent738a2b67f16712fc36056c32eb5a652ce0c60f80 (diff)
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)
-rw-r--r--api/current.txt2
-rw-r--r--api/system-current.txt2
-rw-r--r--api/test-current.txt2
3 files changed, 3 insertions, 3 deletions
diff --git a/api/current.txt b/api/current.txt
index 6107169d8569..7dd26e04c490 100644
--- 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 b2f9675a265f..d28261eaa563 100644
--- 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 1f64b5ed8021..9ec1e9653920 100644
--- 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();