OPP: Fix NPE issue while turn off BT

Use Case:
1. Pair remote with DUT.
2. From gallery send a file to remote
3. Turn off BT
4. Check the file transfer should fail

Failure:
BT crash seen when we turn off BT during file transfer.

Root Cause:
In Some conditions Bt Socket instance is remains null
because of turn off BT.

Fix:
Before closing connection check BT Socket instance
Value to avoid NPE.

Change-Id: Idcd90c31a179247055a155678d11d8e76ec90aca

1 files changed, 5 insertions, 1 deletions

diff --git a/src/com/android/bluetooth/opp/BluetoothOppTransfer.java b/src/com/android/bluetooth/opp/BluetoothOppTransfer.java
index 293cbfe5e..dd2e354f4 100644
--- a/src/com/android/bluetooth/opp/BluetoothOppTransfer.java
+++ b/src/com/android/bluetooth/opp/BluetoothOppTransfer.java
@@ -658,6 +658,7 @@ public class BluetoothOppTransfer implements BluetoothOppBatch.BluetoothOppBatch
 
         private void connectRfcommSocket() {
 
+            if (V) Log.v(TAG, "connectRfcommSocket");
             try {
                 btSocket = device.createInsecureRfcommSocketToServiceRecord(BluetoothUuid.ObexObjectPush.getUuid());
             } catch (IOException e1) {
@@ -823,8 +824,11 @@ public class BluetoothOppTransfer implements BluetoothOppBatch.BluetoothOppBatch
         }
 
         private void markConnectionFailed(BluetoothSocket s) {
+            if (V) Log.v(TAG, "markConnectionFailed " + s);
             try {
-                s.close();
+                if (s != null) {
+                    s.close();
+                }
             } catch (IOException e) {
                 if (V) Log.e(TAG, "Error when close socket");
             }