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

Commit 99cd6c0f authored by Hansong Zhang's avatar Hansong Zhang Committed by Automerger Merge Worker
Browse files

Regard L2CAP_CFG_PENDING as failure am: c8117f1b am: 6d60b854 

Original change: https://android-review.googlesource.com/c/platform/system/bt/+/1439084

Change-Id: I9aca2ee3eaa75ae8e5b855cf1c4ccadc2e9202bb
parents ca0ad120 6d60b854

system/stack/l2cap/l2c_main.cc

+1 −2
Original line number Diff line number Diff line
@@ -677,8 +677,7 @@ static void process_l2cap_cmd(tL2C_LCB* p_lcb, uint8_t* p, uint16_t pkt_len) { 
                                p_ccb->local_id, id);

            break;

          }

          if ((cfg_info.result == L2CAP_CFG_OK) ||

              (cfg_info.result == L2CAP_CFG_PENDING))

          if (cfg_info.result == L2CAP_CFG_OK)

            l2c_csm_execute(p_ccb, L2CEVT_L2CAP_CONFIG_RSP, &cfg_info);

          else

            l2c_csm_execute(p_ccb, L2CEVT_L2CAP_CONFIG_RSP_NEG, &cfg_info);