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

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

Merge "csip: avoid create two group with same id" am: dee84567 am: eba6a860 am: 220f5e18 

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



Change-Id: I92bc1d0b63c2f990187686791b8eda6e5c5f668f
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 32c87025 220f5e18

system/bta/csis/csis_client.cc

+1 −5
Original line number Diff line number Diff line
@@ -142,6 +142,7 @@ class CsisClientImpl : public CsisClient { 
    if (!csis_group) {

      if (create_group_if_non_existing) {

        /* Let's create a group */

        LOG(INFO) << __func__ << ": Create a new group";

        auto g = std::make_shared<CsisGroup>(group_id, uuid);

        csis_groups_.push_back(g);

        csis_group = FindCsisGroup(group_id);
@@ -1340,11 +1341,6 @@ class CsisClientImpl : public CsisClient { 
        group_id =

            dev_groups_->AddDevice(device->addr, csis_instance->GetUuid());

        LOG_ASSERT(group_id != -1);



        /* Create new group */

        auto g =

            std::make_shared<CsisGroup>(group_id, csis_instance->GetUuid());

        csis_groups_.push_back(g);

      } else {

        dev_groups_->AddDevice(device->addr, csis_instance->GetUuid(),

                               group_id);