Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit ac03bb4d authored by koh.changseok's avatar koh.changseok Committed by android-build-merger
Browse files

Merge "OPP: Have OBEX add 'End of Body' for a small file" am: c748717c 

am: 995426f6

Change-Id: Iabfef923573ca20cc1a06ed8a64fccc4009132d4
parents ed47f59d 995426f6

android/app/src/com/android/bluetooth/opp/BluetoothOppObexClientSession.java

+3 −2
Original line number Diff line number Diff line
@@ -415,8 +415,6 @@ public class BluetoothOppObexClientSession implements BluetoothOppObexSession { 
                        outputStream.write(buffer, 0, readLength);



                        position += readLength;

                        /* check remote accept or reject */

                        responseCode = putOperation.getResponseCode();



                        if (position == fileInfo.mLength) {

                            // if file length is smaller than buffer size, only one packet
@@ -425,6 +423,9 @@ public class BluetoothOppObexClientSession implements BluetoothOppObexSession { 
                            outputStream = null;

                        }



                        /* check remote accept or reject */

                        responseCode = putOperation.getResponseCode();



                        mCallback.removeMessages(BluetoothOppObexSession.MSG_CONNECT_TIMEOUT);

                        synchronized (this) {

                            mWaitingForRemote = false;