Snap for 9794482 from b4dd1a0dffd3ec9f491ecd6986ac0a416f330206 to tm-qpr3-release (072f321d) · Commits · e / os / android_packages_modules_Bluetooth

android/app/src/com/android/bluetooth/hearingaid/HearingAidService.java

+0 −6

Original line number	Diff line number	Diff line
		@@ -773,12 +773,6 @@ public class HearingAidService extends ProfileService {
		BluetoothProfile.HEARING_AID, mAdapterService.obfuscateAddress(device),
		mAdapterService.getMetricId(device));

		Intent intent = new Intent(BluetoothHearingAid.ACTION_ACTIVE_DEVICE_CHANGED);
		intent.putExtra(BluetoothDevice.EXTRA_DEVICE, device);
		intent.addFlags(Intent.FLAG_RECEIVER_REGISTERED_ONLY_BEFORE_BOOT
		\| Intent.FLAG_RECEIVER_INCLUDE_BACKGROUND);
		sendBroadcast(intent, BLUETOOTH_CONNECT, Utils.getTempAllowlistBroadcastOptions());

		boolean stopAudio = device == null
		&& (getConnectionState(mPreviousAudioDevice) != BluetoothProfile.STATE_CONNECTED);
		if (DBG) {

+3 −0

Original line number	Diff line number	Diff line
		@@ -2952,6 +2952,7 @@ public final class BluetoothAdapter {
		public @NonNull List<Integer> getSupportedProfiles() {
		final ArrayList<Integer> supportedProfiles = new ArrayList<Integer>();

		mServiceLock.readLock().lock();
		try {
		synchronized (mManagerCallback) {
		if (mService != null) {
		@@ -2974,6 +2975,8 @@ public final class BluetoothAdapter {
		}
		} catch (RemoteException \| TimeoutException e) {
		Log.e(TAG, e.toString() + "\n" + Log.getStackTraceString(new Throwable()));
		} finally {
		mServiceLock.readLock().unlock();
		}
		return supportedProfiles;
		}

+1 −0

Original line number	Diff line number	Diff line
		@@ -569,6 +569,7 @@ void bta_ag_codec_negotiate(tBTA_AG_SCB* p_scb) {
		}

		if ((p_scb->codec_updated \|\| p_scb->codec_fallback) &&
		(p_scb->features & BTA_AG_FEAT_CODEC) &&
		(p_scb->peer_features & BTA_AG_PEER_FEAT_CODEC)) {
		LOG_INFO("Starting codec negotiation");
		/* Change the power mode to Active until SCO open is completed. */

+5 −5

Original line number	Diff line number	Diff line
		@@ -734,13 +734,13 @@ void handle_rc_connect(tBTA_AV_RC_OPEN* p_rc_open) {
		do_in_jni_thread(FROM_HERE,
		base::Bind(bt_rc_ctrl_callbacks->connection_state_cb, true,
		false, p_dev->rc_addr));
		}
		/* report connection state if remote device is AVRCP target */
		handle_rc_ctrl_features(p_dev);

		/* report psm if remote device is AVRCP target */
		handle_rc_ctrl_psm(p_dev);
		}
		}

		/***************************************************************************
		* Function handle_rc_disconnect

+5 −3

Original line number	Diff line number	Diff line
		@@ -407,14 +407,14 @@ void btm_acl_created(const RawAddress& bda, uint16_t hci_handle,
		p_acl->transport = transport;
		p_acl->switch_role_failed_attempts = 0;
		p_acl->reset_switch_role();
		BTM_PM_OnConnected(hci_handle, bda);

		LOG_DEBUG(
		"Created new ACL connection peer:%s role:%s handle:0x%04x transport:%s",
		PRIVATE_ADDRESS(bda), RoleText(p_acl->link_role).c_str(), hci_handle,
		bt_transport_text(transport).c_str());

		if (transport == BT_TRANSPORT_BR_EDR) {
		if (p_acl->is_transport_br_edr()) {
		BTM_PM_OnConnected(hci_handle, bda);
		btm_set_link_policy(p_acl, btm_cb.acl_cb_.DefaultLinkPolicy());
		}

		@@ -480,9 +480,11 @@ void btm_acl_removed(uint16_t handle) {
		}
		p_acl->in_use = false;
		NotifyAclLinkDown(*p_acl);
		p_acl->Reset();
		if (p_acl->is_transport_br_edr()) {
		BTM_PM_OnDisconnected(handle);
		}
		p_acl->Reset();
		}

		/*******************************************************************************
		*