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

Commit 500ab176 authored by Łukasz Rymanowski's avatar Łukasz Rymanowski Committed by Android (Google) Code Review
Browse files

Merge "leaudio: Fix characteristic subscribtion on reconnection" into tm-d1-dev

parents 77084e1f d664b8fa
Loading
Loading
Loading
Loading
+4 −4
Original line number Diff line number Diff line
@@ -1304,10 +1304,6 @@ class LeAudioClientImpl : public LeAudioClient {
      BtaGattQueue::ConfigureMtu(leAudioDevice->conn_id_, 240);
    }

    /* If we know services, register for notifications */
    if (leAudioDevice->known_service_handles_)
      RegisterKnownNotifications(leAudioDevice);

    if (BTM_SecIsSecurityPending(address)) {
      /* if security collision happened, wait for encryption done
       * (BTA_GATTC_ENC_CMPL_CB_EVT) */
@@ -1401,6 +1397,10 @@ class LeAudioClientImpl : public LeAudioClient {
      return;
    }

    /* If we know services, register for notifications */
    if (leAudioDevice->known_service_handles_)
      RegisterKnownNotifications(leAudioDevice);

    if (leAudioDevice->encrypted_) {
      LOG(INFO) << __func__ << " link already encrypted, nothing to do";
      return;