Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 9682faad authored by Kausik Sinnaswamy's avatar Kausik Sinnaswamy Committed by Android Git Automerger
Browse files

am 7cab294b: Terminate PBAP service cleanly during BT off 

* commit '7cab294b':
  Terminate PBAP service cleanly during BT off
parents b4d5f4a6 7cab294b

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

+8 −0
Original line number Diff line number Diff line
@@ -347,6 +347,14 @@ public class BluetoothPbapService extends Service { 
                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 ((state != BluetoothAdapter.STATE_TURNING_ON) &&

                    (state != 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");