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

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

Merge "eatt: Make command queue available since channel is pending" am:... 

Merge "eatt: Make command queue available since channel is pending" am: 51dfc991 am: b63993f1 am: e7173f3b

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



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

system/stack/eatt/eatt.h

+3 −2
Original line number Diff line number Diff line
@@ -64,7 +64,9 @@ class EattChannel { 
        state_(EattChannelState::EATT_CHANNEL_PENDING),

        indicate_handle_(0),

        ind_ack_timer_(NULL),

        ind_confirmation_timer_(NULL) {}

        ind_confirmation_timer_(NULL) {

    cl_cmd_q_ = std::deque<tGATT_CMD_Q>();

  }



  ~EattChannel() {

    if (ind_ack_timer_ != NULL) {
@@ -79,7 +81,6 @@ class EattChannel { 
  void EattChannelSetState(EattChannelState state) {

    if (state_ == EattChannelState::EATT_CHANNEL_PENDING) {

      if (state == EattChannelState::EATT_CHANNEL_OPENED) {

        cl_cmd_q_ = std::deque<tGATT_CMD_Q>();

        memset(&server_outstanding_cmd_, 0, sizeof(tGATT_SR_CMD));

        char name[64];

        sprintf(name, "eatt_ind_ack_timer_%s_cid_0x%04x",