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

Commit 8ec289e0 authored by William Escande's avatar William Escande Committed by Gerrit Code Review
Browse files

Merge "Stop using LocalSocket.createConnectedLocalSocket."

parents 4e2cb320 aa149023

framework/java/android/bluetooth/BluetoothSocket.java

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

        }





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

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

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

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

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

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

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

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

        as.mAddress = remoteAddr;

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

                if (mSocketState == SocketState.CLOSED) throw new IOException("socket closed");

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

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

                FileDescriptor fd = mPfd.getFileDescriptor();

                FileDescriptor fd = mPfd.getFileDescriptor();

                mSocket = LocalSocket.createConnectedLocalSocket(fd);

                mSocket = new LocalSocket(fd);

                mSocketIS = mSocket.getInputStream();

                mSocketIS = mSocket.getInputStream();

                mSocketOS = mSocket.getOutputStream();

                mSocketOS = mSocket.getOutputStream();

            }

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

                }





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

                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()");

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

                mSocketIS = mSocket.getInputStream();

                mSocketIS = mSocket.getInputStream();

                mSocketOS = mSocket.getOutputStream();

                mSocketOS = mSocket.getOutputStream();