Merge "Remove a misleading "flush" function." (eab16a0a) · Commits · e / os / android_packages_modules_Bluetooth

framework/java/android/bluetooth/BluetoothOutputStream.java

+0 −12

Original line number	Diff line number	Diff line
		@@ -75,16 +75,4 @@ import java.io.OutputStream;
		}
		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();
		}
		}

+0 −14

Original line number	Diff line number	Diff line
		@@ -515,20 +515,6 @@ public final class BluetoothSocket implements Closeable {
		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 {
		int ret = 0;
		if (VDBG) Log.d(TAG, "read in: " + mSocketIS + " len: " + length);