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

framework/java/android/bluetooth/BluetoothOutputStream.java

+12 −0

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

+14 −0

Original line number	Original line	Diff line number	Diff line
	@@ -515,6 +515,20 @@ 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);