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

Commit 21dcb493 authored Sep 14, 2023 by William Escande Committed by Automerger Merge Worker Sep 14, 2023

Merge "Headset: RemoveActive prior to hold the lock" into main am: 8cc9bf9a am: e602c341

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

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

parents 33032739 e602c341

android/app/src/com/android/bluetooth/btservice/ActiveDeviceManager.java

+6 −5

Original line number	Diff line number	Diff line
		@@ -884,12 +884,13 @@ public class ActiveDeviceManager implements AdapterService.BluetoothStateCallbac
		Log.d(TAG, "setHearingAidActiveDevice(" + device + ")"
		+ (device == null ? " hasFallbackDevice=" + hasFallbackDevice : ""));
		}
		synchronized (mLock) {

		final HearingAidService hearingAidService = mFactory.getHearingAidService();
		if (hearingAidService == null) {
		return false;
		}

		synchronized (mLock) {
		if (device == null) {
		if (!hearingAidService.removeActiveDevice(!hasFallbackDevice)) {
		return false;

android/app/src/com/android/bluetooth/hfp/HeadsetService.java

+4 −4

Original line number	Diff line number	Diff line
		@@ -1382,11 +1382,11 @@ public class HeadsetService extends ProfileService {
		@RequiresPermission(android.Manifest.permission.MODIFY_PHONE_STATE)
		public boolean setActiveDevice(BluetoothDevice device) {
		Log.i(TAG, "setActiveDevice: device=" + device + ", " + Utils.getUidPidString());
		synchronized (mStateMachines) {
		if (device == null) {
		removeActiveDevice();
		return true;
		}
		synchronized (mStateMachines) {
		if (device.equals(mActiveDevice)) {
		Log.i(TAG, "setActiveDevice: device " + device + " is already active");
		return true;