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

Commit f8dc82ca 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: 13b03994 am: b5574a80

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

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

parents 9668f4d9 b5574a80

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);
		}
		}
		}