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

Commit 5cacd3b9 authored by Łukasz Rymanowski's avatar Łukasz Rymanowski Committed by Automerger Merge Worker
Browse files

Merge "csis: Do not notify new member if group is complete" am: e5670219 am:... 

Merge "csis: Do not notify new member if group is complete" am: e5670219 am: a8c34fa0 am: ee9d96a6

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



Change-Id: Ic56ee9e4e3611696f03a74ae3ce3f88bf4e7a90b
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 5d5ed6bb ee9d96a6

system/bta/csis/csis_client.cc

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

      return;

    }

    }





    if (csis_group->GetDesiredSize() > 0 &&

        (csis_group->GetDesiredSize() == csis_group->GetCurrentSize())) {

      LOG_WARN("Group is already complete");

      return;

    }



    auto discovered_group_rsi = std::find_if(

    auto discovered_group_rsi = std::find_if(

        all_rsi.cbegin(), all_rsi.cend(), [&csis_group](const auto& rsi) {

        all_rsi.cbegin(), all_rsi.cend(), [&csis_group](const auto& rsi) {

          return csis_group->IsRsiMatching(rsi);

          return csis_group->IsRsiMatching(rsi);