commit d288c0dac06748780916bf438b7c84482545672f
author fredc <fredc@broadcom.com> Wed Apr 25 22:43:51 2012 -0700
committer Android (Google) Code Review <android-gerrit@google.com> Mon Jul 16 22:04:22 2012 -0700
tree 2d7e3d096ddbb26fe87c2753656b0c77cca01917
parent 31ba132491053bc86d419a7d51fc04af3299c076

Backed out workaround for RFCOMM socket close issue when BT is turning off

Change-Id: I793fa2a0fa0127b6ff70aeb448c97c3cc9154d6f

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

diff --git a/src/com/android/bluetooth/opp/BluetoothOppRfcommListener.java b/src/com/android/bluetooth/opp/BluetoothOppRfcommListener.java
index ea38a3c..1c6292f 100755
--- a/src/com/android/bluetooth/opp/BluetoothOppRfcommListener.java
+++ b/src/com/android/bluetooth/opp/BluetoothOppRfcommListener.java
@@ -213,7 +213,8 @@
             try {
                 mSocketAcceptThread.interrupt();
                 if (V) Log.v(TAG, "waiting for thread to terminate");
-                mSocketAcceptThread.join(JOIN_TIMEOUT_MS);
+                //mSocketAcceptThread.join(JOIN_TIMEOUT_MS);
+                mSocketAcceptThread.join();
                 if (V) Log.v(TAG, "done waiting for thread to terminate");
                 mSocketAcceptThread = null;
                 mCallback = null;