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

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

Merge "Stop using LocalSocket.createConnectedLocalSocket." am: 8ec289e0 am:... 

Merge "Stop using LocalSocket.createConnectedLocalSocket." am: 8ec289e0 am: f4c4bb86 am: 1a5c04f1

Original change: https://android-review.googlesource.com/c/platform/packages/modules/Bluetooth/+/1958881

Change-Id: I2f51aab670c083134229abf65beffb0dde21b1d0
parents 9f0e560d 1a5c04f1

framework/java/android/bluetooth/BluetoothSocket.java

+3 −3
Original line number Diff line number Diff line
@@ -266,7 +266,7 @@ public final class BluetoothSocket implements Closeable { 
        }



        as.mPfd = ParcelFileDescriptor.dup(fds[0]);

        as.mSocket = LocalSocket.createConnectedLocalSocket(fds[0]);

        as.mSocket = new LocalSocket(fds[0]);

        as.mSocketIS = as.mSocket.getInputStream();

        as.mSocketOS = as.mSocket.getOutputStream();

        as.mAddress = remoteAddr;
@@ -407,7 +407,7 @@ public final class BluetoothSocket implements Closeable { 
                if (mSocketState == SocketState.CLOSED) throw new IOException("socket closed");

                if (mPfd == null) throw new IOException("bt socket connect failed");

                FileDescriptor fd = mPfd.getFileDescriptor();

                mSocket = LocalSocket.createConnectedLocalSocket(fd);

                mSocket = new LocalSocket(fd);

                mSocketIS = mSocket.getInputStream();

                mSocketOS = mSocket.getOutputStream();

            }
@@ -466,7 +466,7 @@ public final class BluetoothSocket implements Closeable { 
                }



                if (DBG) Log.d(TAG, "bindListen(), Create LocalSocket");

                mSocket = LocalSocket.createConnectedLocalSocket(fd);

                mSocket = new LocalSocket(fd);

                if (DBG) Log.d(TAG, "bindListen(), new LocalSocket.getInputStream()");

                mSocketIS = mSocket.getInputStream();

                mSocketOS = mSocket.getOutputStream();