commit f5d88a7b8659bb9ce49edc4faea6bf56f2158572
author Kausik Sinnaswamy <kausik@broadcom.com> Mon Sep 10 17:11:14 2012 +0530
committer Matthew Xie <mattx@google.com> Mon Sep 10 12:17:06 2012 -0700
tree 7ee0ef4d974cbebb449ca226e0021c54e01fe016
parent 3237754f492015699fc91508d76c2e123d6f3c42

Terminate PBAP service cleanly during BT off

PBAP service runs in a loop of 10 trials to create the RFCOMM listener
thread; this loop is not getting interrupted during BT off, due to which
we end up delaying PBAP stop by 3 seconds (10 * 300ms). The fix is to
check for BT state after RFCOMM listener failure and break out of the
loop if BT is being turned off.
bug 7134544

Change-Id: I35db2221be30980bec973253cdd888e0ce8cc36b

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 80cd8ee..21714c8 100755
--- a/src/com/android/bluetooth/pbap/BluetoothPbapService.java
+++ b/src/com/android/bluetooth/pbap/BluetoothPbapService.java
@@ -347,6 +347,14 @@
                 initSocketOK = false;
             }
             if (!initSocketOK) {
+                // Need to break out of this loop if BT is being turned off.
+                if (mAdapter == null) break;
+                int state = mAdapter.getState();
+                if ((mAdapter.getState() != BluetoothAdapter.STATE_TURNING_ON) &&
+                     (mAdapter.getState() != BluetoothAdapter.STATE_ON)) {
+                    Log.w(TAG, "initServerSocket failed as BT is (being) turned off");
+                    break;
+                }
                 synchronized (this) {
                     try {
                         if (VERBOSE) Log.v(TAG, "wait 300 ms");