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

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

Merge "csip: Fix handling error on locking." am: d30fc198 am: f7beec89 am: 24c1c715 

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



Change-Id: Ic59143ceaedc4411362210ee5ec04a4b3d3d7417
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 1340c6d0 24c1c715

system/bta/csis/csis_client.cc

+3 −3
Original line number Diff line number Diff line
@@ -292,14 +292,14 @@ class CsisClientImpl : public CsisClient { 
    csis_group->SetTargetLockState(CsisLockState::CSIS_STATE_UNSET);



    int group_id = csis_group->GetGroupId();

    CsisLockState current_lock_state = csis_group->GetCurrentLockState();

    /* Send unlock to previous devices. It shall be done in reverse order. */

    auto prev_dev = csis_group->GetPrevDevice(csis_device);

    while (prev_dev) {

      if (prev_dev->IsConnected()) {

        auto prev_csis_instance = prev_dev->GetCsisInstanceByGroupId(group_id);

        LOG_ASSERT(prev_csis_instance) << " prev_csis_instance does not exist!";

        SetLock(prev_dev, prev_csis_instance, current_lock_state);

        SetLock(prev_dev, prev_csis_instance,

                CsisLockState::CSIS_STATE_UNLOCKED);

      }

      prev_dev = csis_group->GetPrevDevice(prev_dev);

    }
@@ -381,7 +381,7 @@ class CsisClientImpl : public CsisClient { 
          /* Somebody else managed to lock it.

           * Unlock previous devices

           */

          HandleCsisLockProcedureError(csis_group, device);

          HandleCsisLockProcedureError(csis_group, next_dev);

          return;

        }

        SetLock(next_dev, next_csis_inst, CsisLockState::CSIS_STATE_LOCKED);