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

Commit b4d5f4a6 authored by Matthew Xie's avatar Matthew Xie Committed by Android Git Automerger
Browse files

am fa99828a: Revert "Terminate PBAP service cleanly during BT off" 

* commit 'fa99828a':
  Revert "Terminate PBAP service cleanly during BT off"
parents 968cdcfd fa99828a

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

+0 −8
Original line number Diff line number Diff line
@@ -347,14 +347,6 @@ 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 ((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");