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

Commit 35cdae95 authored Jun 04, 2022 by TreeHugger Robot Committed by Automerger Merge Worker Jun 04, 2022

Merge "Handle disconnection and connection for LE Audio devices" into tm-dev...

Merge "Handle disconnection and connection for LE Audio devices" into tm-dev am: c0252c3d am: 528db681

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/services/Telecomm/+/18557448

Change-Id: I4776ab3f8888aae85ba70d303a1be260bdb9bb93
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

parents a8a67699 528db681

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

+2 −0

Original line number	Diff line number	Diff line
		@@ -429,6 +429,7 @@ public class BluetoothDeviceManager {
		if (mAudioManager.getCommunicationDevice() != null
		&& mAudioManager.getCommunicationDevice().getType()
		== AudioDeviceInfo.TYPE_BLE_HEADSET) {
		mBluetoothRouteManager.onAudioLost(mAudioManager.getCommunicationDevice().getAddress());
		mAudioManager.clearCommunicationDevice();
		mLeAudioSetAsCommunicationDevice = false;
		}
		@@ -493,6 +494,7 @@ public class BluetoothDeviceManager {
		Log.w(this, " Could not set bleHeadset device");
		} else {
		Log.i(this, " bleHeadset device set");
		mBluetoothRouteManager.onAudioOn(bleHeadset.getAddress());
		mLeAudioSetAsCommunicationDevice = true;
		}
		return result;

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

+2 −1

Original line number	Diff line number	Diff line
		@@ -196,9 +196,10 @@ public class BluetoothStateReceiver extends BroadcastReceiver {
		Log.w(LOG_TAG,
		"Device %s cannot be use as hearing aid communication device.",
		device);
		} else {
		mBluetoothRouteManager.sendMessage(BT_AUDIO_IS_ON, args);
		}
		}
		mBluetoothRouteManager.sendMessage(BT_AUDIO_IS_ON, args);
		}
		}
		}