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

Commit ce7b22a9 authored by Christian Wailes's avatar Christian Wailes Committed by android-build-merger
Browse files

Merge "Remove a misleading "flush" function." am: a85aec22 am: eab16a0a... 

Merge "Remove a misleading "flush" function." am: a85aec22 am: eab16a0a am: ceeadec8d9 am: 8e28ae41
am: c664f2f8

Change-Id: I64182cb9abd3ae64a906b406168024e8cfb566e9
parents dd4d2005 c664f2f8

framework/java/android/bluetooth/BluetoothOutputStream.java

+0 −12
Original line number Original line Diff line number Diff line
@@ -75,16 +75,4 @@ import java.io.OutputStream; 
        }

        }

        mSocket.write(b, offset, count);

        mSocket.write(b, offset, count);

    }

    }



    /**

     * Wait until the data in sending queue is emptied. A polling version

     * for flush implementation. Use it to ensure the writing data afterwards will

     * be packed in the new RFCOMM frame.

     *

     * @throws IOException if an i/o error occurs.

     * @since Android 4.2.3

     */

    public void flush() throws IOException {

        mSocket.flush();

    }

}
 
}

framework/java/android/bluetooth/BluetoothSocket.java

+0 −14
Original line number Original line Diff line number Diff line
@@ -515,20 +515,6 @@ public final class BluetoothSocket implements Closeable { 
        return mSocketIS.available();

        return mSocketIS.available();

    }

    }





    /**

     * Wait until the data in sending queue is emptied. A polling version

     * for flush implementation. Used to ensure the writing data afterwards will

     * be packed in new RFCOMM frame.

     *

     * @throws IOException if an i/o error occurs.

     */

    @UnsupportedAppUsage

    /*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 {

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

        int ret = 0;

        int ret = 0;

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

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