commit 00a6750d37d899f7f7ae9210c82e2fdd875df7dd
author Przemyslaw Szczepaniak <pszczepaniak@google.com> Thu Feb 11 10:23:38 2016 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Thu Feb 11 10:23:39 2016 +0000
tree 7b3a2aeab1ae2fc2ce74df87d7c8423b30362606
parent c343177bbac2f751b0e7708087924174034bf460
parent 8d4242c85d06fac67b46f0b9cb3462e0411e313c

Merge "SocketImpl#getFileDescriptor shouldn't be public" into nyc-dev

api/current.txt

diff --git a/api/current.txt b/api/current.txt
index 6066dc2..7156800 100644
--- a/api/current.txt
+++ b/api/current.txt
@@ -52427,7 +52427,7 @@
     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();

api/system-current.txt

diff --git a/api/system-current.txt b/api/system-current.txt
index 7f6af33..1c89672 100644
--- a/api/system-current.txt
+++ b/api/system-current.txt
@@ -55515,7 +55515,7 @@
     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();

api/test-current.txt

diff --git a/api/test-current.txt b/api/test-current.txt
index 06cb23a..929b7cb 100644
--- a/api/test-current.txt
+++ b/api/test-current.txt
@@ -52444,7 +52444,7 @@
     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();