Bluetooth : NPE issue fix while stopping transfer files.

In some rare conditions handler thread instance going to be null when
ends NFC transfer at server side so put HandlerThread.interrupt()
block in Synchronization to (prevent concurrent access) avoid force
close.

Change-Id: I2db8fbb0e9debdfc6f281c6a252f0fe7d30dbb50

1 files changed, 7 insertions, 4 deletions

diff --git a/src/com/android/bluetooth/opp/BluetoothOppTransfer.java b/src/com/android/bluetooth/opp/BluetoothOppTransfer.java
index e96c5367e..5d11fbc55 100755
--- a/src/com/android/bluetooth/opp/BluetoothOppTransfer.java
+++ b/src/com/android/bluetooth/opp/BluetoothOppTransfer.java
@@ -414,10 +414,13 @@ public class BluetoothOppTransfer implements BluetoothOppBatch.BluetoothOppBatch
             if (V) Log.v(TAG, "Stop mSession");
             mSession.stop();
         }
-        if (mHandlerThread != null) {
-            mHandlerThread.getLooper().quit();
-            mHandlerThread.interrupt();
-            mHandlerThread = null;
+        // Prevent concurrent access
+        synchronized (this) {
+            if (mHandlerThread != null) {
+                mHandlerThread.quit();
+                mHandlerThread.interrupt();
+                mHandlerThread = null;
+            }
         }
     }