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

Commit 58f6035b authored by Hemant Gupta's avatar Hemant Gupta Committed by android-build-merger
Browse files

Merge "OPP: Update batch status when sdp failed" am: 0110293b 

am: 92940f4f

Change-Id: Id5dfca63374af1a5bae44aa9ba467ba454a38f9f
parents a850b30d 92940f4f

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

+14 −15
Original line number Diff line number Diff line
@@ -160,6 +160,7 @@ public class BluetoothOppTransfer implements BluetoothOppBatch.BluetoothOppBatch 
                            intent.getParcelableExtra(BluetoothDevice.EXTRA_SDP_RECORD);

                    if (record == null) {

                        Log.w(TAG, " Invalid SDP , ignoring !!");

                        markConnectionFailed(null);

                        return;

                    }

                    mConnectThread =
@@ -827,6 +828,7 @@ public class BluetoothOppTransfer implements BluetoothOppBatch.BluetoothOppBatch 
                return;

            }

        }

    };



    private void markConnectionFailed(BluetoothSocket s) {

        if (V) {
@@ -844,9 +846,6 @@ public class BluetoothOppTransfer implements BluetoothOppBatch.BluetoothOppBatch 
        mSessionHandler.obtainMessage(TRANSPORT_ERROR).sendToTarget();

        return;

    }

    }



    ;



    /* update a trivial field of a share to notify Provider the batch status change */

    private void tickShareStatus(BluetoothOppShareInfo share) {