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

Commit 020c9b8b authored by Sal Savage's avatar Sal Savage
Browse files

Allow the Bluetooth stack to get into STATE_ON with no profiles enabled 

Tag: #refactor
Bug: 228336035
Test: atest BluetoothInstrumentationTests
Change-Id: I85b606427b0e619febc4f6de39c4cdba5f8f3bfc
parent c893b207

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

+8 −4
Original line number Diff line number Diff line
@@ -703,8 +703,10 @@ public class AdapterService extends Service { 
    void startProfileServices() {

        debugLog("startCoreServices()");

        Class[] supportedProfileServices = Config.getSupportedProfiles();

        if (supportedProfileServices.length == 1 && GattService.class.getSimpleName()

                .equals(supportedProfileServices[0].getSimpleName())) {

        // If we support no profiles, or we only support GATT/BLE, just move on to BREDR_STARTED

        if (supportedProfileServices.length == 0

                || (supportedProfileServices.length == 1 && GattService.class.getSimpleName()

                .equals(supportedProfileServices[0].getSimpleName()))) {

            mAdapterProperties.onBluetoothReady();

            updateUuids();

            setBluetoothClassFromConfig();
@@ -720,8 +722,10 @@ public class AdapterService extends Service { 
        mAdapterProperties.setScanMode(AbstractionLayer.BT_SCAN_MODE_NONE);



        Class[] supportedProfileServices = Config.getSupportedProfiles();

        if (supportedProfileServices.length == 1 && (mRunningProfiles.size() == 1

                && GattService.class.getSimpleName().equals(mRunningProfiles.get(0).getName()))) {

        // If we support no profiles, or we only support GATT/BLE, just move on to BREDR_STOPPED

        if (supportedProfileServices.length == 0

                || (supportedProfileServices.length == 1 && (mRunningProfiles.size() == 1

                && GattService.class.getSimpleName().equals(mRunningProfiles.get(0).getName())))) {

            debugLog("stopProfileServices() - No profiles services to stop or already stopped.");

            mAdapterStateMachine.sendMessage(AdapterState.BREDR_STOPPED);

        } else {