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

Commit 2208e652 authored by Zhihai Xu's avatar Zhihai Xu Committed by Android (Google) Code Review
Browse files

Merge "NPE in BluetoothSocket.write()"

parents d218a92c 610770d7

core/java/android/bluetooth/BluetoothSocket.java

+14 −13
Original line number Diff line number Diff line
@@ -412,12 +412,13 @@ public final class BluetoothSocket implements Closeable { 
     *             if an i/o error occurs.

     */

    /*package*/ void flush() throws IOException {

        if (mSocketOS == null) throw new IOException("flush is called on null OutputStream");

        if (VDBG) Log.d(TAG, "flush: " + mSocketOS);

        mSocketOS.flush();

    }



    /*package*/ int read(byte[] b, int offset, int length) throws IOException {



        if (mSocketIS == null) throw new IOException("read is called on null InputStream");

        if (VDBG) Log.d(TAG, "read in:  " + mSocketIS + " len: " + length);

        int ret = mSocketIS.read(b, offset, length);

        if(ret < 0)
@@ -427,7 +428,7 @@ public final class BluetoothSocket implements Closeable { 
    }



    /*package*/ int write(byte[] b, int offset, int length) throws IOException {



        if (mSocketOS == null) throw new IOException("write is called on null OutputStream");

        if (VDBG) Log.d(TAG, "write: " + mSocketOS + " length: " + length);

        mSocketOS.write(b, offset, length);

        // There is no good way to confirm since the entire process is asynchronous anyway