From 89d62c144a63edc2295411c7b44298f74d4bb9cb Mon Sep 17 00:00:00 2001 From: Jake Wharton Date: Wed, 20 Sep 2017 12:23:14 -0400 Subject: [PATCH] Implement Closeable on LocalServerSocket. Bug: 37013067 Test: existing ones still pass Change-Id: I78402ebb19a592fc3960eb6200cb5ad436a7b344 --- api/current.txt | 2 +- api/system-current.txt | 2 +- api/test-current.txt | 2 +- core/java/android/net/LocalServerSocket.java | 7 ++++--- 4 files changed, 7 insertions(+), 6 deletions(-) diff --git a/api/current.txt b/api/current.txt index f6410834f2578..2368231508b6d 100644 --- a/api/current.txt +++ b/api/current.txt @@ -25661,7 +25661,7 @@ package android.net { field public static final android.os.Parcelable.Creator 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.io.FileDescriptor) throws java.io.IOException; method public android.net.LocalSocket accept() throws java.io.IOException; diff --git a/api/system-current.txt b/api/system-current.txt index eee24dea55dca..cdd28b826179a 100644 --- a/api/system-current.txt +++ b/api/system-current.txt @@ -27896,7 +27896,7 @@ package android.net { field public static final android.os.Parcelable.Creator 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.io.FileDescriptor) throws java.io.IOException; method public android.net.LocalSocket accept() throws java.io.IOException; diff --git a/api/test-current.txt b/api/test-current.txt index 2d7f67fe1650d..0310f95937a77 100644 --- a/api/test-current.txt +++ b/api/test-current.txt @@ -25857,7 +25857,7 @@ package android.net { field public static final android.os.Parcelable.Creator 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.io.FileDescriptor) throws java.io.IOException; method public android.net.LocalSocket accept() throws java.io.IOException; diff --git a/core/java/android/net/LocalServerSocket.java b/core/java/android/net/LocalServerSocket.java index 3fcde33071e97..d1f49d2082f5b 100644 --- a/core/java/android/net/LocalServerSocket.java +++ b/core/java/android/net/LocalServerSocket.java @@ -16,14 +16,15 @@ package android.net; -import java.io.IOException; +import java.io.Closeable; import java.io.FileDescriptor; +import java.io.IOException; /** * Non-standard class for creating an inbound UNIX-domain socket * in the Linux abstract namespace. */ -public class LocalServerSocket { +public class LocalServerSocket implements Closeable { private final LocalSocketImpl impl; private final LocalSocketAddress localAddress; @@ -106,7 +107,7 @@ public class LocalServerSocket { * * @throws IOException */ - public void close() throws IOException + @Override public void close() throws IOException { impl.close(); }