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

Commit 40301e3d authored by Android Build Coastguard Worker's avatar Android Build Coastguard Worker
Browse files

Snap for 9435245 from 0db97b88 to tm-qpr2-release

Change-Id: Ia2e9fc7bfeb0b41960a9c46837f6bb61aa3959a3
parents 17b8f8bd 0db97b88
Loading
Loading
Loading
Loading
+3 −0
Original line number Diff line number Diff line
@@ -2545,6 +2545,9 @@ static void bta_dm_acl_down(const RawAddress& bd_addr,
      memset(&bta_dm_cb.device_list.peer_device[clear_index], 0,
             sizeof(bta_dm_cb.device_list.peer_device[clear_index]));
    }

    device->conn_state = BTA_DM_NOT_CONNECTED;

    break;
  }
  if (bta_dm_cb.device_list.count) bta_dm_cb.device_list.count--;
+10 −1
Original line number Diff line number Diff line
@@ -1107,8 +1107,17 @@ class LeAudioClientImpl : public LeAudioClient {
    LeAudioDevice* leAudioDevice = leAudioDevices_.FindByAddress(address);
    if (!leAudioDevice) {
      leAudioDevices_.Add(address, DeviceConnectState::CONNECTING_BY_USER);

    } else {
      if (leAudioDevice->GetConnectionState() !=
          DeviceConnectState::DISCONNECTED) {
        LOG_ERROR(
            "Device %s is in invalid state: %s",
            leAudioDevice->address_.ToString().c_str(),
            bluetooth::common::ToString(leAudioDevice->GetConnectionState())
                .c_str());

        return;
      }
      leAudioDevice->SetConnectionState(DeviceConnectState::CONNECTING_BY_USER);

      le_audio::MetricsCollector::Get()->OnConnectionStateChanged(