Close output stream before getting response

If the output stream is still open after finishing the sending of
a file, a CONTINUE response code is received instead of an OK code.

Bug: 29583227
Change-Id: I1b2515e8fe5eec208bbbe1df17f96cc20c5ea884

1 files changed, 4 insertions, 3 deletions

diff --git a/src/com/android/bluetooth/opp/BluetoothOppObexClientSession.java b/src/com/android/bluetooth/opp/BluetoothOppObexClientSession.java
index 49ec6dcba..1688c7063 100644
--- a/src/com/android/bluetooth/opp/BluetoothOppObexClientSession.java
+++ b/src/com/android/bluetooth/opp/BluetoothOppObexClientSession.java
@@ -496,6 +496,10 @@ public class BluetoothOppObexClientSession implements BluetoothOppObexSession {
                 handleSendException(e.toString());
             } finally {
                 try {
+                    if (outputStream != null) {
+                      outputStream.close();
+                    }
+
                     // Close InputStream and remove SendFileInfo from map
                     BluetoothOppUtility.closeSendFileInfo(mInfo.mUri);
                     if (!error) {
@@ -524,9 +528,6 @@ public class BluetoothOppObexClientSession implements BluetoothOppObexSession {
                     if (inputStream != null) {
                         inputStream.close();
                     }
-                    if (outputStream != null) {
-                        outputStream.close();
-                    }
                     if (putOperation != null) {
                         putOperation.close();
                     }