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

Commit 95bbc9b0 authored by Andre Eisenbach's avatar Andre Eisenbach Committed by android-build-merger
Browse files

Merge "Stop profile services when Bluetooth enable times out" am: 6a3053d9 

am: 67e6286e

* commit '67e6286e':
  Stop profile services when Bluetooth enable times out

Change-Id: I14cc19c3fc1b0a09f446f05669b84e6b3b34722e
parents fd26b37c 67e6286e

android/app/src/com/android/bluetooth/btservice/AdapterState.java

+3 −0
Original line number Diff line number Diff line
@@ -437,6 +437,7 @@ final class AdapterState extends StateMachine { 
                case BREDR_START_TIMEOUT:

                    errorLog("Error enabling Bluetooth (start timeout)");

                    mPendingCommandState.setTurningOn(false);

                    adapterService.stopProfileServices();

                    transitionTo(mBleOnState);

                    notifyAdapterStateChange(BluetoothAdapter.STATE_BLE_ON);

                    break;
@@ -445,6 +446,8 @@ final class AdapterState extends StateMachine { 
                    errorLog("Error enabling Bluetooth (enable timeout)");

                    mPendingCommandState.setBleTurningOn(false);

                    transitionTo(mOffState);

                    adapterService.stopProfileServices();

                    adapterService.stopGattProfileService();

                    notifyAdapterStateChange(BluetoothAdapter.STATE_OFF);

                    break;