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

Commit 2fee275a authored by Jakub Pawłowski's avatar Jakub Pawłowski Committed by Automerger Merge Worker
Browse files

Merge "leaudio: Fix characteristic subscribtion on reconnection" am:... 

Merge "leaudio: Fix characteristic subscribtion on reconnection" am: b9f885d3 am: c89a7796 am: f5e9f71e

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



Change-Id: I1428667d94bef34409b66dff475709009dd4da34
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 8bc7c3bd f5e9f71e

system/bta/le_audio/client.cc

+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;