From 9e5f76c5dd948d545b4355b15fc61a3f14f5a4ab Mon Sep 17 00:00:00 2001 From: Jacky Cheung Date: Mon, 17 Apr 2017 13:38:39 -0700 Subject: [PATCH] Do not GATT_ERROR on MTU change Bug: 37305498 Test: manual on MSM8909 Change-Id: I07389620efc914d0ece52262edc2c35b498d5564 (cherry picked from commit f271c9109e5608acb393c9bef0bca9d2b0177f5d) --- bta/gatt/bta_gattc_act.cc | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/bta/gatt/bta_gattc_act.cc b/bta/gatt/bta_gattc_act.cc index ef283b8d0..3ff645719 100644 --- a/bta/gatt/bta_gattc_act.cc +++ b/bta/gatt/bta_gattc_act.cc @@ -1206,10 +1206,10 @@ void bta_gattc_op_cmpl(tBTA_GATTC_CLCB* p_clcb, tBTA_GATTC_DATA* p_data) { return; } - /* discard responses if service change indication is received before - * operation completed */ + /* Except for MTU configuration, discard responses if service change + * indication is received before operation completed */ if (p_clcb->auto_update == BTA_GATTC_DISC_WAITING && - p_clcb->p_srcb->srvc_hdl_chg) { + p_clcb->p_srcb->srvc_hdl_chg && op != GATTC_OPTYPE_CONFIG) { APPL_TRACE_DEBUG( "Discard all responses when service change indication is received."); p_data->op_cmpl.status = GATT_ERROR; -- 2.11.0