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

Commit caadae2e authored by Myles Watson's avatar Myles Watson Committed by Gerrit Code Review
Browse files

Merge "Fix for callback not null with check" into main

parents 0c6a9510 e1d97efb

system/bta/dm/bta_dm_disc.cc

+9 −2
Original line number Diff line number Diff line
@@ -967,8 +967,12 @@ static void bta_dm_search_result(tBTA_DM_MSG* p_data) { 
  if ((!bta_dm_search_cb.services) ||

      ((bta_dm_search_cb.services) &&

       (p_data->disc_result.result.disc_res.services))) {

    if (bta_dm_search_cb.p_search_cback) {

      bta_dm_search_cb.p_search_cback(BTA_DM_DISC_RES_EVT,

                                      &p_data->disc_result.result);

    } else {

      LOG_WARN("Received search result without valid callback");

    }

  }



  /* if searching did not initiate to create link */
@@ -1631,6 +1635,9 @@ static void bta_dm_remname_cback(const tBTM_REMOTE_DEV_NAME* p_remote_name) { 
              .hdr =

                  {

                      .event = BTA_DM_REMT_NAME_EVT,

                      .len = 0,

                      .offset = 0,

                      .layer_specific = 0,

                  },

              .bd_addr = bta_dm_search_cb.peer_bdaddr,

              .bd_name = {},

system/bta/test/bta_disc_test.cc

+1 −1
Original line number Diff line number Diff line
@@ -175,7 +175,7 @@ TEST_F(BtaDiscTest, bta_dm_read_remote_device_name) { 
      kRawAddress, BT_TRANSPORT_BR_EDR);

}



TEST_F(BtaDiscTest, DISABLED_bta_dm_search_result) {  // b/309463889

TEST_F(BtaDiscTest, bta_dm_search_result) {

  tBTA_DM_MSG msg = {

      .disc_result = {},

  };