Merge changes from topics "bluetooth-localsocket-from-filedescriptor", "localsocket-from-filedescriptor" am: 63c3c1f3d4

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1959006

Change-Id: Ie6b65152b4ca222749a869349af848c12510c3c3

1 files changed, 0 insertions, 13 deletions

diff --git a/core/java/android/net/LocalSocket.java b/core/java/android/net/LocalSocket.java
index e9b3f4bc6db2..b69410cf7d73 100644
--- a/core/java/android/net/LocalSocket.java
+++ b/core/java/android/net/LocalSocket.java
@@ -109,19 +109,6 @@ public class LocalSocket implements Closeable {
     }
 
     /**
-     * Creates a LocalSocket instances using the FileDescriptor for an already-connected
-     * AF_LOCAL/UNIX domain stream socket. Note: the FileDescriptor must be closed by the caller:
-     * closing the LocalSocket will not close it.
-     *
-     * TODO: delete this method when Bluetooth is no longer using it.
-     *
-     * @hide
-     */
-    public static LocalSocket createConnectedLocalSocket(FileDescriptor fd) {
-        return new LocalSocket(fd);
-    }
-
-    /**
      * for use with LocalServerSocket.accept()
      */
     static LocalSocket createLocalSocketForAccept(LocalSocketImpl impl) {