commit 69d4a880af51125f4703dfb4da920f7b66ec238d
author Treehugger Robot <treehugger-gerrit@google.com> Wed Oct 04 17:34:35 2017 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Wed Oct 04 17:34:35 2017 +0000
tree eeb8a135f2d0c170d946f92f6f4c134b5f326cf1
parent 88f9f6b84e1403f7214a46bd9624424f8966f716
parent 328d1b6933d978e68389165d601818bd152a8635

Merge "PBAP: Set Pbap connection state to DISCONNECTED on ACL_DISCONNECT."

src/com/android/bluetooth/pbap/BluetoothPbapService.java

diff --git a/src/com/android/bluetooth/pbap/BluetoothPbapService.java b/src/com/android/bluetooth/pbap/BluetoothPbapService.java
index 363e08d..cc2dd25 100644
--- a/src/com/android/bluetooth/pbap/BluetoothPbapService.java
+++ b/src/com/android/bluetooth/pbap/BluetoothPbapService.java
@@ -266,15 +266,16 @@
             return;
         }
 
-        if (action.equals(BluetoothDevice.ACTION_ACL_DISCONNECTED) && mIsWaitingAuthorization) {
+        if (action.equals(BluetoothDevice.ACTION_ACL_DISCONNECTED)) {
             BluetoothDevice device = intent.getParcelableExtra(BluetoothDevice.EXTRA_DEVICE);
 
             if (mRemoteDevice == null) return;
             if (DEBUG) Log.d(TAG,"ACL disconnected for "+ device);
-            if (mRemoteDevice.equals(device)) {
+            if (mIsWaitingAuthorization && mRemoteDevice.equals(device)) {
                 mSessionStatusHandler.removeMessages(USER_TIMEOUT);
                 mSessionStatusHandler.obtainMessage(USER_TIMEOUT).sendToTarget();
             }
+            mSessionStatusHandler.obtainMessage(MSG_SERVERSESSION_CLOSE).sendToTarget();
             return;
         }
 
@@ -305,7 +306,7 @@
                     if (mConnSocket != null) {
                         startObexServerSession();
                     } else {
-                        stopObexServerSession();
+                        mSessionStatusHandler.obtainMessage(MSG_SERVERSESSION_CLOSE).sendToTarget();
                     }
                 } catch (IOException ex) {
                     Log.e(TAG, "Caught the error: " + ex.toString());
@@ -318,7 +319,7 @@
                         Log.v(TAG, "setPhonebookAccessPermission(ACCESS_REJECTED)=" + result);
                     }
                 }
-                stopObexServerSession();
+                mSessionStatusHandler.obtainMessage(MSG_SERVERSESSION_CLOSE).sendToTarget();
             }
             return;
         }