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

Commit 5435a83f authored by Łukasz Rymanowski's avatar Łukasz Rymanowski Committed by Gerrit Code Review
Browse files

Merge "csis: Do not verify SIRK for device which is not joining any group" into main

parents 257a1641 b84f13ec

system/bta/csis/csis_client.cc

+12 −0
Original line number Original line Diff line number Diff line
@@ -2282,6 +2282,18 @@ class CsisClientImpl : public CsisClient { 
      return;

      return;

    }

    }





    auto group_id_to_join = device->GetExpectedGroupIdMember();

    if (group_id_to_join == bluetooth::groups::kGroupUnknown) {

      LOG_WARN(

          "Device %s (conn_id=0x%04x) is already known to CSIS (# of "

          "instances=%d) but it is "

          "not scheduled to join any group.",

          ADDRESS_TO_LOGGABLE_CSTR(address), device->conn_id,

          device->GetNumberOfCsisInstances());

      BTA_DmSirkConfirmDeviceReply(address, true);

      return;

    }



    if (!gatt_cl_read_sirk_req(

    if (!gatt_cl_read_sirk_req(

            address,

            address,

            base::BindOnce(&CsisClientImpl::SirkValueReadCompleteDuringPairing,

            base::BindOnce(&CsisClientImpl::SirkValueReadCompleteDuringPairing,