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

Commit c020f0b6 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "OPP: Interrup Obex Client thread while sending ABORT" into pi-dev

parents ecf9e419 5542d052
Loading
Loading
Loading
Loading
+7 −6
Original line number Diff line number Diff line
@@ -505,6 +505,13 @@ public class BluetoothOppTransfer implements BluetoothOppBatch.BluetoothOppBatch
        if (V) {
            Log.v(TAG, "stop");
        }
        if (mSession != null) {
            if (V) {
                Log.v(TAG, "Stop mSession");
            }
            mSession.stop();
        }

        cleanUp();
        if (mConnectThread != null) {
            try {
@@ -520,12 +527,6 @@ public class BluetoothOppTransfer implements BluetoothOppBatch.BluetoothOppBatch
            }
            mConnectThread = null;
        }
        if (mSession != null) {
            if (V) {
                Log.v(TAG, "Stop mSession");
            }
            mSession.stop();
        }
        // Prevent concurrent access
        synchronized (this) {
            if (mHandlerThread != null) {