diff options
author | Christian Wailes <chriswailes@google.com> | 2019-09-04 23:35:54 +0000 |
---|---|---|
committer | Christian Wailes <chriswailes@google.com> | 2019-09-04 23:37:32 +0000 |
commit | 4fd500310f8738adfb2d7dd6e32b576ab7b00ab8 (patch) | |
tree | 94ff69ee766eef44584623631e389b8775adc7f3 /framework/java/android/bluetooth/BluetoothSocket.java | |
parent | 3d30e625e338d452c2a9e91dc2ad477e8500e5eb (diff) |
Revert "Revert "Remove a misleading "flush" function.""
This reverts commit 3d30e625e338d452c2a9e91dc2ad477e8500e5eb.
Reason for revert: Fixed the test broken by the original commit
Bug: 139192244
Bug: 140336855
Test: m -> flash -> boot
Test: atest CtsJvmtiAttachingHostTestCases
Change-Id: I4c67ad8709652c4710ef24564e0240f74f817f8c
Diffstat (limited to 'framework/java/android/bluetooth/BluetoothSocket.java')
-rw-r--r-- | framework/java/android/bluetooth/BluetoothSocket.java | 14 |
1 files changed, 0 insertions, 14 deletions
diff --git a/framework/java/android/bluetooth/BluetoothSocket.java b/framework/java/android/bluetooth/BluetoothSocket.java index a6e3153d6a..760166bfcc 100644 --- a/framework/java/android/bluetooth/BluetoothSocket.java +++ b/framework/java/android/bluetooth/BluetoothSocket.java @@ -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); |