Bluetooth: Avoiding ANR, while rejecting SAP authorization request

- A case, where SAP has rejected remote device authorization
  request, DUT start RFCOMM Listener thread & does not update
  authorization status(isWaitingAuthorization is true), then
  ACTION_ACL_DISCONNECTED is received. As isWaitingAuthorization
  is true, So DUT try to start RFCOMM Listener thread again, which
  is running. So ANR due to longer OBJECT wait in main thread.
  Updating the correct authorization status while rejecting remote
  SAP authorization request to solve the issue.

- Avoiding the resource leak by closing RFCOMM Socket, if
  Sapd client socket is not successfully initialized.

Change-Id: I2820d5b04502b344f43c22af08c173a526c30834
CRs-Fixed: 647175

1 files changed, 5 insertions, 0 deletions

diff --git a/src/org/codeaurora/bluetooth/sap/BluetoothSapService.java b/src/org/codeaurora/bluetooth/sap/BluetoothSapService.java
index 22bad56..adefc32 100644
--- a/src/org/codeaurora/bluetooth/sap/BluetoothSapService.java
+++ b/src/org/codeaurora/bluetooth/sap/BluetoothSapService.java
@@ -527,6 +527,9 @@ public class BluetoothSapService extends Service {
 
         } else if (action.equals(SAP_ACCESS_DISALLOWED_ACTION)) {
             /* close the rfcomm socket and restart the listener thread */
+            Log.d(TAG,"SAP_ACCESS_DISALLOWED_ACTION:" + mIsWaitingAuthorization);
+
+            mIsWaitingAuthorization = false;
             sendErrorConnResp();
             closeRfcommSocket();
             startRfcommListenerThread();
@@ -967,6 +970,8 @@ public class BluetoothSapService extends Service {
         public void run() {
             if (mSapdSocket == null) {
                 if (!initSapdClientSocket()) {
+                    /* close the rfcomm socket to avoid resource leakage */
+                    closeRfcommSocket();
                     /*restart the listener thread */
                     mSapHandler.sendMessage(mSapHandler.obtainMessage(MESSAGE_START_LISTENER));
                     return;