Try harder to connect to bluetooth am: 5a317fcb6b am: d6bd16a265 am: 56bb1d2d5f (ce8d0cbf) · Commits · e / os / android_packages_services_Telecomm

src/com/android/server/telecom/bluetooth/BluetoothRouteManager.java

+10 −4

Original line number	Original line	Diff line number	Diff line
	@@ -598,14 +598,20 @@ public class BluetoothRouteManager extends StateMachine {

	String actualAddress = matchingDevice.isPresent()		String actualAddress = matchingDevice.isPresent()
	? address : getActiveDeviceAddress();		? address : getActiveDeviceAddress();
			if (actualAddress == null) {
			Log.i(this, "No device specified and BT stack has no active device."
			+ " Using arbitrary device");
			if (deviceList.size() > 0) {
			actualAddress = deviceList.iterator().next().getAddress();
			} else {
			Log.i(this, "No devices available at all. Not connecting.");
			return null;
			}
			}
	if (!matchingDevice.isPresent()) {		if (!matchingDevice.isPresent()) {
	Log.i(this, "No device with address %s available. Using %s instead.",		Log.i(this, "No device with address %s available. Using %s instead.",
	address, actualAddress);		address, actualAddress);
	}		}
	if (actualAddress == null) {
	Log.i(this, "No device specified and BT stack has no active device. Not connecting.");
	return null;
	}
	if (!connectAudio(actualAddress)) {		if (!connectAudio(actualAddress)) {
	boolean shouldRetry = retryCount < MAX_CONNECTION_RETRIES;		boolean shouldRetry = retryCount < MAX_CONNECTION_RETRIES;
	Log.w(LOG_TAG, "Could not connect to %s. Will %s", actualAddress,		Log.w(LOG_TAG, "Could not connect to %s. Will %s", actualAddress,