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

Commit 4238e6e4 authored by android-build-team Robot's avatar android-build-team Robot
Browse files

Merge cherrypicks of [2539196, 2539197, 2539262, 2539198, 2539199, 2539263,... 

Merge cherrypicks of [2539196, 2539197, 2539262, 2539198, 2539199, 2539263, 2539200, 2539264, 2539341, 2539201, 2539202, 2539265, 2539203, 2539342, 2539266, 2539204, 2539343] into oc-dr1-release

Change-Id: I039a94ab7ed828f6e64bd0f7fc6c46b456f00c14
parents 902417b1 350cdf71

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;