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

Commit 0c4b5191 authored Mar 31, 2022 by Treehugger Robot Committed by Automerger Merge Worker Mar 31, 2022

Merge changes Icfdd82ab,Ie554422b am: 599f65df am: c784ac21

Original change: https://android-review.googlesource.com/c/platform/packages/modules/Bluetooth/+/2047443

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

parents 22229df7 c784ac21

android/leaudio/.settings/org.eclipse.buildship.core.prefs

deleted100644 → 0

+0 −13

Original line number	Original line	Diff line number	Diff line
	arguments=
	auto.sync=false
	build.scans.enabled=false
	connection.gradle.distribution=GRADLE_DISTRIBUTION(WRAPPER)
	connection.project.dir=
	eclipse.preferences.version=1
	gradle.user.home=
	java.home=/usr/lib/jvm/java-11-openjdk-amd64
	jvm.arguments=
	offline.mode=false
	override.workspace.settings=true
	show.console.view=true
	show.executions.view=true

android/leaudio/app/src/main/java/com/android/bluetooth/leaudio/BluetoothProxy.java

+2 −0

Original line number	Original line	Diff line number	Diff line
	@@ -998,6 +998,7 @@ public class BluetoothProxy {
	}		}

	private void initLeAudioBroadcastProxy() {		private void initLeAudioBroadcastProxy() {
			if (!isLeAudioBroadcastSourceSupported()) return;
	if (mBluetoothLeBroadcast == null) {		if (mBluetoothLeBroadcast == null) {
	bluetoothAdapter.getProfileProxy(this.application, profileListener,		bluetoothAdapter.getProfileProxy(this.application, profileListener,
	BluetoothProfile.LE_AUDIO_BROADCAST);		BluetoothProfile.LE_AUDIO_BROADCAST);
	@@ -1005,6 +1006,7 @@ public class BluetoothProxy {
	}		}

	private void cleanupLeAudioBroadcastProxy() {		private void cleanupLeAudioBroadcastProxy() {
			if (!isLeAudioBroadcastSourceSupported()) return;
	if (mBluetoothLeBroadcast != null) {		if (mBluetoothLeBroadcast != null) {
	bluetoothAdapter.closeProfileProxy(BluetoothProfile.LE_AUDIO_BROADCAST,		bluetoothAdapter.closeProfileProxy(BluetoothProfile.LE_AUDIO_BROADCAST,
	mBluetoothLeBroadcast);		mBluetoothLeBroadcast);