4 files changed, 7 insertions, 6 deletions
diff --git a/api/current.txt b/api/current.txt
index f6410834f257..2368231508b6 100644
--- a/api/current.txt
+++ b/api/current.txt
@@ -25661,7 +25661,7 @@ package android.net {
     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.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 eee24dea55dc..cdd28b826179 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<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.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 a62bffca7f64..76c1f6c3d7f0 100644
--- a/api/test-current.txt
+++ b/api/test-current.txt
@@ -25858,7 +25858,7 @@ package android.net {
     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.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 3fcde33071e9..d1f49d2082f5 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();
     }