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

Commit 76117c10 authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "csis: Fix notification of device available on startup" into main am:... 

Merge "csis: Fix notification of device available on startup" into main am: afe6d0e6 am: 3d415d18

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



Change-Id: Ie94bdf1020a87cd9a323e065ca317df3a181be21
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 5750eecb 3d415d18

system/bta/csis/csis_client.cc

+4 −6
Original line number Diff line number Diff line
@@ -233,16 +233,14 @@ class CsisClientImpl : public CsisClient { 
      csis_group->SetUuid(uuid);

    }



    int rank = bluetooth::csis::CSIS_RANK_INVALID;

    auto csis_instance = device->GetCsisInstanceByGroupId(group_id);

    if (!csis_instance) {

      LOG_ERROR(" device: %s, does not have the rank info for group (id: %d )",

                ADDRESS_TO_LOGGABLE_CSTR(address), group_id);

      return;

    if (csis_instance) {

      rank = csis_instance->GetRank();

    }



    callbacks_->OnDeviceAvailable(device->addr, csis_group->GetGroupId(),

                                  csis_group->GetDesiredSize(),

                                  csis_instance->GetRank(), uuid);

                                  csis_group->GetDesiredSize(), rank, uuid);

  }



  void Connect(const RawAddress& address) override {