Merge "Merge "Revert "Remove a misleading "flush" function."" am: 9fcf8b7cae am: 783313acbf am: 013c618a41 am: b2a36aefa9" into qt-qpr1-dev-plus-aosp

1 files changed, 14 insertions, 0 deletions

diff --git a/core/java/android/bluetooth/BluetoothSocket.java b/core/java/android/bluetooth/BluetoothSocket.java
index 760166bfcc5d..a6e3153d6af7 100644
--- a/core/java/android/bluetooth/BluetoothSocket.java
+++ b/core/java/android/bluetooth/BluetoothSocket.java
@@ -515,6 +515,20 @@ 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);