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

Commit 61217c95 authored by Łukasz Rymanowski's avatar Łukasz Rymanowski
Browse files

leaudio: Fix characteristic subscribtion on reconnection 

When remote device is bonded it should keep CCC state, however Android
assures that every connection.

With this patch, CCC registration will happen after encryption is
enabled to avoid Write rejection.

Bug: 235190324
Test: atest BluetoothInstrumentationTests
Tag: #feature
Change-Id: Idda5dc54a9332ae35b8995d26a4441a50a13f67c
parent 2c0ce6f8

system/bta/le_audio/client.cc

+4 −4
Original line number Diff line number Diff line
@@ -1296,10 +1296,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) */
@@ -1387,6 +1383,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;