Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit bdb42e66 authored by Jake Wharton's avatar Jake Wharton Committed by Android (Google) Code Review
Browse files

Merge "Implement Closeable on LocalServerSocket."

parents 5d6cb0f8 89d62c14

api/current.txt

+1 −1
Original line number Original line Diff line number Diff line
@@ -25661,7 +25661,7 @@ package android.net { 
    field public static final android.os.Parcelable.Creator<android.net.LinkProperties> CREATOR;

    field public static final android.os.Parcelable.Creator<android.net.LinkProperties> CREATOR;

  }

  }

















  public class LocalServerSocket {







  public class LocalServerSocket implements java.io.Closeable {











    ctor public LocalServerSocket(java.lang.String) throws java.io.IOException;







    ctor public LocalServerSocket(java.lang.String) throws java.io.IOException;











    ctor public LocalServerSocket(java.io.FileDescriptor) throws java.io.IOException;







    ctor public LocalServerSocket(java.io.FileDescriptor) throws java.io.IOException;











    method public android.net.LocalSocket accept() throws java.io.IOException;







    method public android.net.LocalSocket accept() throws java.io.IOException;

























api/system-current.txt



+1
−1






























Original line number
Original line
Diff line number
Diff line








@@ -27896,7 +27896,7 @@ package android.net {









    field public static final android.os.Parcelable.Creator<android.net.LinkProperties> CREATOR;







    field public static final android.os.Parcelable.Creator<android.net.LinkProperties> CREATOR;











  }







  }



























  public class LocalServerSocket {







  public class LocalServerSocket implements java.io.Closeable {











    ctor public LocalServerSocket(java.lang.String) throws java.io.IOException;







    ctor public LocalServerSocket(java.lang.String) throws java.io.IOException;











    ctor public LocalServerSocket(java.io.FileDescriptor) throws java.io.IOException;







    ctor public LocalServerSocket(java.io.FileDescriptor) throws java.io.IOException;











    method public android.net.LocalSocket accept() throws java.io.IOException;







    method public android.net.LocalSocket accept() throws java.io.IOException;

























api/test-current.txt



+1
−1






























Original line number
Original line
Diff line number
Diff line








@@ -25858,7 +25858,7 @@ package android.net {









    field public static final android.os.Parcelable.Creator<android.net.LinkProperties> CREATOR;







    field public static final android.os.Parcelable.Creator<android.net.LinkProperties> CREATOR;











  }







  }



























  public class LocalServerSocket {







  public class LocalServerSocket implements java.io.Closeable {











    ctor public LocalServerSocket(java.lang.String) throws java.io.IOException;







    ctor public LocalServerSocket(java.lang.String) throws java.io.IOException;











    ctor public LocalServerSocket(java.io.FileDescriptor) throws java.io.IOException;







    ctor public LocalServerSocket(java.io.FileDescriptor) throws java.io.IOException;











    method public android.net.LocalSocket accept() throws java.io.IOException;







    method public android.net.LocalSocket accept() throws java.io.IOException;

























core/java/android/net/LocalServerSocket.java



+4
−3






























Original line number
Original line
Diff line number
Diff line








@@ -16,14 +16,15 @@





























package android.net;







package android.net;































import java.io.IOException;







import java.io.Closeable;











import java.io.FileDescriptor;







import java.io.FileDescriptor;














import java.io.IOException;































/**







/**











 * Non-standard class for creating an inbound UNIX-domain socket







 * Non-standard class for creating an inbound UNIX-domain socket











 * in the Linux abstract namespace.







 * in the Linux abstract namespace.











 */







 */











public class LocalServerSocket {







public class LocalServerSocket implements Closeable {











    private final LocalSocketImpl impl;







    private final LocalSocketImpl impl;











    private final LocalSocketAddress localAddress;







    private final LocalSocketAddress localAddress;






























@@ -106,7 +107,7 @@ public class LocalServerSocket {









     * 







     * 











     * @throws IOException







     * @throws IOException











     */







     */











    public void close() throws IOException







    @Override public void close() throws IOException











    {







    {











        impl.close();







        impl.close();











    }







    }