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

Commit fa99828a authored by Matthew Xie's avatar Matthew Xie Committed by Android (Google) Code Review
Browse files

Revert "Terminate PBAP service cleanly during BT off" 

This reverts commit c0befa34

Change-Id: I67a4950831dce7392d63edad6f693abcc69d2ffe
parent c0befa34

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");