commit 21afe342ef29aa6b07538fd0c20fa32f5fc57bdb
author Linux Build Service Account <lnxbuild@localhost> Wed Mar 26 20:15:27 2014 -0700
committer Gerrit - the friendly Code Review server <code-review@localhost> Wed Mar 26 20:15:27 2014 -0700
tree 8e02fd42eb8d8dec5f3e4bbd8f457f7f036d8c5a
parent 12ca1a7780bb4654a88b362ccc40e49c12de0347
parent 4664164c80a87d0a91392ba4d7e216f0d9d77e09

Merge "Bluetooth: Avoiding ANR, while rejecting DUN authorization request"

src/org/codeaurora/bluetooth/dun/BluetoothDunService.java

diff --git a/src/org/codeaurora/bluetooth/dun/BluetoothDunService.java b/src/org/codeaurora/bluetooth/dun/BluetoothDunService.java
index d1c8986..39c4eb4 100644
--- a/src/org/codeaurora/bluetooth/dun/BluetoothDunService.java
+++ b/src/org/codeaurora/bluetooth/dun/BluetoothDunService.java
@@ -504,6 +504,9 @@
 
         } else if (action.equals(DUN_ACCESS_DISALLOWED_ACTION)) {
             /* close the rfcomm socket and restart the listener thread */
+            Log.d(TAG,"DUN_ACCESS_DISALLOWED_ACTION:" + mIsWaitingAuthorization);
+
+            mIsWaitingAuthorization = false;
             closeRfcommSocket();
             startRfcommListenerThread();
         } else if ( BluetoothDevice.ACTION_BOND_STATE_CHANGED.equals(action)) {
@@ -925,6 +928,8 @@
         public void run() {
             if (mDundSocket == null) {
                 if (!initDundClientSocket()) {
+                    /* close the rfcomm socket to avoid resource leakage */
+                    closeRfcommSocket();
                     /*restart the listener thread */
                     mDunHandler.sendMessage(mDunHandler.obtainMessage(MESSAGE_START_LISTENER));
                     return;