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

Commit 6bd76c3e authored by Stanley Tng's avatar Stanley Tng Committed by android-build-merger
Browse files

Merge "Fix assert when freeing L2CAP flow control credit packets" 

am: 1abb0870

Change-Id: I2845cd484f4a734732578fe69a2498e0e8ad494b
parents 3152b838 1abb0870

system/stack/l2cap/l2c_csm.cc

+0 −15
Original line number Diff line number Diff line
@@ -279,11 +279,6 @@ static void l2c_csm_closed(tL2C_CCB* p_ccb, uint16_t event, void* p_data) { 
    case L2CEVT_L2CA_DISCONNECT_REQ: /* Upper wants to disconnect */

      l2cu_release_ccb(p_ccb);

      break;



    case L2CEVT_L2CA_SEND_FLOW_CONTROL_CREDIT:

    case L2CEVT_L2CAP_RECV_FLOW_CONTROL_CREDIT:

      osi_free(p_data);

      break;

  }

}
@@ -604,11 +599,6 @@ static void l2c_csm_w4_l2cap_connect_rsp(tL2C_CCB* p_ccb, uint16_t event, 
        l2cu_send_peer_connect_req(p_ccb); /* Start Connection     */

      }

      break;



    case L2CEVT_L2CA_SEND_FLOW_CONTROL_CREDIT:

    case L2CEVT_L2CAP_RECV_FLOW_CONTROL_CREDIT:

      osi_free(p_data);

      break;

  }

}
@@ -1182,11 +1172,6 @@ static void l2c_csm_w4_l2cap_disconnect_rsp(tL2C_CCB* p_ccb, uint16_t event, 
    case L2CEVT_L2CA_DATA_WRITE: /* Upper layer data to send */

      osi_free(p_data);

      break;



    case L2CEVT_L2CA_SEND_FLOW_CONTROL_CREDIT:

    case L2CEVT_L2CAP_RECV_FLOW_CONTROL_CREDIT:

      osi_free(p_data);

      break;

  }

}