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

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

Snap for 7069213 from 69ed8d0c to rvc-qpr3-release 

Change-Id: Ia3e85307bb764fd7fa35620ba161e77b71235cb6
parents 5d7b91af 69ed8d0c

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/include/btu.h"
@@ -477,6 +478,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");

    APPL_TRACE_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/stack/btm/btm_sec.cc

+7 −0
Original line number Diff line number Diff line
@@ -4674,6 +4674,13 @@ void btm_sec_pin_code_request(const RawAddress& p_bda) { 
  VLOG(2) << __func__ << " BDA: " << p_bda

          << " state: " << btm_pair_state_descr(btm_cb.pairing_state);



  RawAddress local_bd_addr = *controller_get_interface()->get_address();

  if (p_bda == local_bd_addr) {

    android_errorWriteLog(0x534e4554, "174626251");

    btsnd_hcic_pin_code_neg_reply(p_bda);

    return;

  }



  if (btm_cb.pairing_state != BTM_PAIR_STATE_IDLE) {

    if ((p_bda == btm_cb.pairing_bda) &&

        (btm_cb.pairing_state == BTM_PAIR_STATE_WAIT_AUTH_COMPLETE)) {