Snap for 5130385 from 3f75c5b732e8cc200f3a5d7255ca06cf46e01108 to pi-qpr2-release (5980327b) · Commits · e / os / android_packages_services_Telecomm

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

+10 −4

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

		String actualAddress = matchingDevice.isPresent()
		? 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()) {
		Log.i(this, "No device with address %s available. Using %s instead.",
		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)) {
		boolean shouldRetry = retryCount < MAX_CONNECTION_RETRIES;
		Log.w(LOG_TAG, "Could not connect to %s. Will %s", actualAddress,