Commit 25b694bf authored Jan 11, 2018 by Arthur Hsu

Correctly handle GATT as only profile supported.

If GATT is the only profile enabled in config.xml, then AdapterService
will hang indefinitely since setProfileServiceState ignores GATT. This
is okay generally since GATT comes up with BLE, not with BREDR. But since
GATT is already running at this point, AdapterService will never know
that we can consider BREDR started.

Fix this by shortcutting to BREDR_STARTED in the case that we're trying
to start core services and GATT is the only supported profile.

Bug: 62415118 69965109
Test: Build ok
Change-Id: I47f7d0c21bb21773d5317fb264aa9adce8f5823e

parent 86ddcab0

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

+3 −1

Original line number	Diff line number	Diff line
		@@ -575,7 +575,9 @@ public class AdapterService extends Service {
		Class[] supportedProfileServices = Config.getSupportedProfiles();

		//Start profile services
		if (!mProfilesStarted && supportedProfileServices.length > 0) {
		if (!mProfilesStarted && supportedProfileServices.length > 0
		&& !(supportedProfileServices.length == 1
		&& supportedProfileServices[0] == GattService.class)) {
		//Startup all profile services
		setProfileServiceState(supportedProfileServices, BluetoothAdapter.STATE_ON);
		} else {