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

Commit 91bef35b authored by William Escande's avatar William Escande
Browse files

BTA_GATTC_SRVC_DISC_DONE_EVT: use proper field 

Follow-up of aosp/3185960 to expend fix to all applicable cases

Bug: 328846967
Test: m com.android.btservices
Flag: EXEMPT, minor bugfix
Change-Id: If900fb427f06b299af06d852ef59191db8c1db84
parent 093e6a86

system/bta/csis/csis_client.cc

+1 −1
Original line number Original line Diff line number Diff line
@@ -1857,7 +1857,7 @@ private: 
        break;

        break;





      case BTA_GATTC_SRVC_DISC_DONE_EVT:

      case BTA_GATTC_SRVC_DISC_DONE_EVT:

        OnGattServiceDiscoveryDoneEvent(p_data->remote_bda);

        OnGattServiceDiscoveryDoneEvent(p_data->service_discovery_done.remote_bda);

        break;

        break;





      default:

      default:

system/bta/gatt/bta_gattc_act.cc

+3 −2
Original line number Original line Diff line number Diff line
@@ -944,8 +944,9 @@ void bta_gattc_disc_cmpl(tBTA_GATTC_CLCB* p_clcb, const tBTA_GATTC_DATA* /* p_da 
  }

  }





  if (p_clcb->p_rcb->p_cback) {

  if (p_clcb->p_rcb->p_cback) {

    tBTA_GATTC bta_gattc;

    tBTA_GATTC bta_gattc = {

    bta_gattc.remote_bda = p_clcb->p_srcb->server_bda;

            .service_discovery_done.remote_bda = p_clcb->p_srcb->server_bda,

    };

    (*p_clcb->p_rcb->p_cback)(BTA_GATTC_SRVC_DISC_DONE_EVT, &bta_gattc);

    (*p_clcb->p_rcb->p_cback)(BTA_GATTC_SRVC_DISC_DONE_EVT, &bta_gattc);

  }

  }

}

}

system/bta/has/has_client.cc

+1 −1
Original line number Original line Diff line number Diff line
@@ -1815,7 +1815,7 @@ private: 
        break;

        break;





      case BTA_GATTC_SRVC_DISC_DONE_EVT:

      case BTA_GATTC_SRVC_DISC_DONE_EVT:

        OnGattServiceDiscoveryDoneEvent(p_data->remote_bda);

        OnGattServiceDiscoveryDoneEvent(p_data->service_discovery_done.remote_bda);

        break;

        break;





      default:

      default:

system/bta/hearing_aid/hearing_aid.cc

+1 −1
Original line number Original line Diff line number Diff line
@@ -2064,7 +2064,7 @@ static void hearingaid_gattc_callback(tBTA_GATTC_EVT event, tBTA_GATTC* p_data) 
      if (!instance) {

      if (!instance) {

        return;

        return;

      }

      }

      instance->OnServiceDiscDoneEvent(p_data->remote_bda);

      instance->OnServiceDiscDoneEvent(p_data->service_discovery_done.remote_bda);

      break;

      break;

    case BTA_GATTC_PHY_UPDATE_EVT: {

    case BTA_GATTC_PHY_UPDATE_EVT: {

      if (!instance) {

      if (!instance) {

system/bta/hh/bta_hh_le.cc

+1 −1
Original line number Original line Diff line number Diff line
@@ -2222,7 +2222,7 @@ static void bta_hh_gattc_callback(tBTA_GATTC_EVT event, tBTA_GATTC* p_data) { 
      break;

      break;





    case BTA_GATTC_SRVC_DISC_DONE_EVT:

    case BTA_GATTC_SRVC_DISC_DONE_EVT:

      link_spec.addrt.bda = p_data->remote_bda;

      link_spec.addrt.bda = p_data->service_discovery_done.remote_bda;

      bta_hh_le_service_discovery_done(link_spec);

      bta_hh_le_service_discovery_done(link_spec);

      break;

      break;