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

Commit 3a119a49 authored May 03, 2022 by William Escande Committed by Automerger Merge Worker May 03, 2022

Merge "Do not autoconnect hfp if hfp is disallowed but a2dp is" into tm-dev am: f764060b

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

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

parents ab2b2aa0 f764060b

android/app/src/com/android/bluetooth/a2dp/A2dpService.java

+3 −2

Original line number	Diff line number	Diff line
		@@ -413,9 +413,10 @@ public class A2dpService extends ProfileService {
		if (!isOutgoingRequest) {
		HeadsetService headsetService = HeadsetService.getHeadsetService();
		if (headsetService != null && headsetService.okToAcceptConnection(device, true)) {
		Log.d(TAG, "okToConnect: Fallback connection to allowed HFP profile");
		Log.d(TAG, "okToConnect: return false,"
		+ " Fallback connection to allowed HFP profile");
		headsetService.connect(device);
		return true;
		return false;
		}
		}
		// Otherwise, reject the connection if connectionPolicy is not valid.

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

+2 −2

Original line number	Diff line number	Diff line
		@@ -2070,10 +2070,10 @@ public class HeadsetService extends ProfileService {
		if (!isOutgoingRequest) {
		A2dpService a2dpService = A2dpService.getA2dpService();
		if (a2dpService != null && a2dpService.okToConnect(device, true)) {
		Log.d(TAG, "okToAcceptConnection: return temporary true,"
		Log.d(TAG, "okToAcceptConnection: return false,"
		+ " Fallback connection to allowed A2DP profile");
		a2dpService.connect(device);
		return true;
		return false;
		}
		}
		Log.w(TAG, "okToAcceptConnection: return false, connectionPolicy=" + connectionPolicy);