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

Commit 885d38d7 authored by Sal Savage's avatar Sal Savage Committed by Automerger Merge Worker
Browse files

Merge "Allow the Bluetooth stack to get into STATE_ON with no profiles... 

Merge "Allow the Bluetooth stack to get into STATE_ON with no profiles enabled" into tm-dev am: c0a112d4 am: d9a1e649

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/modules/Bluetooth/+/17664954



Change-Id: I3b81f349b6b14bf9d32e5db1e3fde6dbf0ecb532
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents fad970fe d9a1e649

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

+8 −4
Original line number Diff line number Diff line
@@ -683,8 +683,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();
@@ -700,8 +702,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 {