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

Commit 78c4578a authored by android-build-team Robot's avatar android-build-team Robot
Browse files

Merge cherrypicks of [3716234, 3716235, 3715523] into pi-release 

Change-Id: I10e36c25beb919c259fe35f1dfbf757ab91c5c8a
parents bbac6691 600b93a3

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

+2 −0
Original line number Diff line number Diff line
@@ -273,6 +273,7 @@ public class AdapterService extends Service { 
                        enableNativeWithGuestFlag();

                    } else if (mRegisteredProfiles.size() == Config.getSupportedProfiles().length

                            && mRegisteredProfiles.size() == mRunningProfiles.size()) {

                        mAdapterProperties.onBluetoothReady();

                        updateUuids();

                        setBluetoothClassFromConfig();

                        mAdapterStateMachine.sendMessage(AdapterState.BREDR_STARTED);
@@ -556,6 +557,7 @@ public class AdapterService extends Service { 
        Class[] supportedProfileServices = Config.getSupportedProfiles();

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

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

            mAdapterProperties.onBluetoothReady();

            updateUuids();

            setBluetoothClassFromConfig();

            mAdapterStateMachine.sendMessage(AdapterState.BREDR_STARTED);