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

Commit d422e42c authored by William Escande's avatar William Escande Committed by Automerger Merge Worker
Browse files

Merge changes from topics "bluetooth-localsocket-from-filedescriptor",... 

Merge changes from topics "bluetooth-localsocket-from-filedescriptor", "localsocket-from-filedescriptor" am: 63c3c1f3 am: 35dda704 am: ca3d9920 am: 89826ba1

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

Change-Id: I8f981549f0a4bdcf04332fc1f05d1e12a6b1893f
parents a9a140e2 89826ba1

core/java/android/net/LocalSocket.java

+0 −13
Original line number Diff line number Diff line
@@ -108,19 +108,6 @@ public class LocalSocket implements Closeable { 
        checkConnected();

    }



    /**

     * 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()

     */