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

Commit 9acf0403 authored by Juffin Alex Varghese's avatar Juffin Alex Varghese
Browse files

Bluetooth-OPP: Send the share status of file once transfer is complete 

Share status of the file will be sent with MSG_SHARE_COMPLETE to
avoid sending the file again during batch transfer. Otherwise, if
DUT is sending batch containing small files transfer will be completed
immediately and status may not be updated to correct state. This will
lead to send same file again and cause transfer failure which is already
sent and removed from the hashmap of pending shares.

CRs-Fixed: 765769
Change-Id: I6d1b708be014fe454357c5082e3e43a640a6f7d7
parent c7c9a230

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

+1 −0
Original line number Diff line number Diff line
@@ -365,6 +365,7 @@ public class BluetoothOppObexClientSession implements BluetoothOppObexSession { 
            if (status == BluetoothShare.STATUS_SUCCESS) {

                Message msg = Message.obtain(mCallback);

                msg.what = BluetoothOppObexSession.MSG_SHARE_COMPLETE;

                mInfo.mStatus = status;

                msg.obj = mInfo;

                msg.sendToTarget();

            } else {

src/com/android/bluetooth/opp/BluetoothOppService.java

+1 −2
Original line number Diff line number Diff line
@@ -827,8 +827,7 @@ public class BluetoothOppService extends Service { 
        info.mConfirm = newConfirm;

        int newStatus = cursor.getInt(statusColumn);

        int oldStatus = info.mStatus;

        if (!BluetoothShare.isStatusCompleted(info.mStatus)

                && BluetoothShare.isStatusCompleted(newStatus)) {

        if (BluetoothShare.isStatusCompleted(info.mStatus)) {

            mNotifier.mNotificationMgr.cancel(info.mId);

        }