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

Commit fe14f7bc authored by android-build-team Robot's avatar android-build-team Robot
Browse files

Snap for 7020202 from 785ab68c to sc-release 

Change-Id: Ibbe34b9372955c75e6c955c741e7c1cca73af9a5
parents bf9c8fb7 785ab68c

system/bta/ag/bta_ag_sdp.cc

+7 −0
Original line number Diff line number Diff line
@@ -34,6 +34,7 @@ 
#include "bta_sys.h"

#include "btif_config.h"

#include "btm_api.h"

#include "osi/include/log.h"

#include "osi/include/osi.h"

#include "sdp_api.h"

#include "stack/btm/btm_sec.h"
@@ -479,6 +480,12 @@ void bta_ag_do_disc(tBTA_AG_SCB* p_scb, tBTA_SERVICE_MASK service) { 
    }

  }



  if (p_scb->p_disc_db != nullptr) {

    android_errorWriteLog(0x534e4554, "174052148");

    LOG_ERROR("Discovery already in progress... returning.");

    return;

  }



  /* allocate buffer for sdp database */

  p_scb->p_disc_db = (tSDP_DISCOVERY_DB*)osi_malloc(BTA_AG_DISC_BUF_SIZE);

  /* set up service discovery database; attr happens to be attr_list len */

system/main/shim/acl.cc

+3 −0
Original line number Diff line number Diff line
@@ -523,9 +523,12 @@ bluetooth::shim::legacy::Acl::Acl(os::Handler* handler, 
  GetAclManager()->RegisterLeCallbacks(this, handler_);

  GetController()->RegisterCompletedMonitorAclPacketsCallback(

      handler->BindOn(this, &Acl::on_incoming_acl_credits));

  bluetooth::shim::RegisterDumpsysFunction(static_cast<void*>(this),

                                           [this](int fd) { Dump(fd); });

}



bluetooth::shim::legacy::Acl::~Acl() {

  bluetooth::shim::UnregisterDumpsysFunction(static_cast<void*>(this));

  GetController()->UnregisterCompletedMonitorAclPacketsCallback();

}