Merge "Fix call audio switch issue for BT LE to speaker and back to BT switch" into tm-qpr-dev (5c8828dd) · Commits · e / os / android_packages_services_Telecomm

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

+11 −6

Original line number	Diff line number	Diff line
		@@ -187,6 +187,7 @@ public class BluetoothDeviceManager {
		private boolean mLeAudioCallbackRegistered = false;
		private BluetoothLeAudio mBluetoothLeAudioService;
		private boolean mLeAudioSetAsCommunicationDevice = false;
		private String mLeAudioDevice;
		private boolean mHearingAidSetAsCommunicationDevice = false;
		private BluetoothDevice mBluetoothHearingAidActiveDeviceCache;
		private BluetoothAdapter mBluetoothAdapter;
		@@ -418,23 +419,26 @@ public class BluetoothDeviceManager {
		}

		public void clearLeAudioCommunicationDevice() {
		Log.i(this, "clearLeAudioCommunicationDevice: mLeAudioSetAsCommunicationDevice = " +
		mLeAudioSetAsCommunicationDevice + " device = " + mLeAudioDevice);
		if (!mLeAudioSetAsCommunicationDevice) {
		return;
		}
		mLeAudioSetAsCommunicationDevice = false;
		if (mLeAudioDevice != null) {
		mBluetoothRouteManager.onAudioLost(mLeAudioDevice);
		mLeAudioDevice = null;
		}

		if (mAudioManager == null) {
		Log.i(this, "clearLeAudioCommunicationDevice: mAudioManager is null");
		return;
		}

		AudioDeviceInfo audioDeviceInfo = mAudioManager.getCommunicationDevice();
		if (audioDeviceInfo != null && audioDeviceInfo.getType()
		if (mAudioManager.getCommunicationDevice() != null
		&& mAudioManager.getCommunicationDevice().getType()
		== AudioDeviceInfo.TYPE_BLE_HEADSET) {
		mBluetoothRouteManager.onAudioLost(audioDeviceInfo.getAddress());
		mAudioManager.clearCommunicationDevice();
		mLeAudioSetAsCommunicationDevice = false;
		}
		mLeAudioSetAsCommunicationDevice = false;
		}

		public void clearHearingAidCommunicationDevice() {
		@@ -500,6 +504,7 @@ public class BluetoothDeviceManager {
		Log.i(this, " bleHeadset device set");
		mBluetoothRouteManager.onAudioOn(bleHeadset.getAddress());
		mLeAudioSetAsCommunicationDevice = true;
		mLeAudioDevice = bleHeadset.getAddress();
		}
		return result;
		}