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

Commit 86f8b2fe authored by Nishith Khanna's avatar Nishith Khanna
Browse files

Merge tag 'android-security-13.0.0_r33' into 3862-t-december 

Android security 13.0.0 release 33
parents d22bd7e2 b4c5952d

system/bta/Android.bp

+5 −3
Original line number Diff line number Diff line
@@ -167,6 +167,7 @@ cc_test { 
    test_suites: ["device-tests"],

    srcs: [

        ":TestMockStackBtm",

        ":TestMockStackSdp",

        ":TestCommonMockFunctions",

        "test/bta_hf_client_test.cc",

        "test/bta_dm_cust_uuid_test.cc",
@@ -234,6 +235,7 @@ cc_test { 
        "libbt-common",

    ],

}



cc_test {

    name: "bt_host_test_bta",

    defaults: [

system/bta/hf_client/bta_hf_client_main.cc

+8 −0
Original line number Diff line number Diff line
@@ -305,6 +305,14 @@ void bta_hf_client_cb_init(tBTA_HF_CLIENT_CB* client_cb, uint16_t handle) { 
  client_cb->enabled_hf_indicators.clear();

  client_cb->peer_hf_indicators.clear();



  if (client_cb->p_disc_db) {

    if (!SDP_CancelServiceSearch(client_cb->p_disc_db)) {

      APPL_TRACE_WARNING("Unable to cancel SDP service discovery peer: %s",

                         client_cb->peer_addr.ToString().c_str());

    }

    osi_free_and_reset((void**)&client_cb->p_disc_db);

  }



  // Memset the rest of the block

  // memset(client_cb, 0, sizeof(tBTA_HF_CLIENT_CB));

  *client_cb = {};

system/bta/test/bta_dip_test.cc

+0 −1
Original line number Diff line number Diff line
@@ -20,7 +20,6 @@ 


#include "bta/sdp/bta_sdp_act.cc"

#include "main/shim/metrics_api.h"

#include "stack/sdp/sdp_api.cc"

#include "types/bluetooth/uuid.h"

#include "types/raw_address.h"

system/stack/smp/smp_act.cc

+2 −1
Original line number Diff line number Diff line
@@ -1106,6 +1106,8 @@ void smp_proc_srk_info(tSMP_CB* p_cb, tSMP_INT_DATA* p_data) { 


  smp_update_key_mask(p_cb, SMP_SEC_KEY_TYPE_CSRK, true);



  smp_key_distribution_by_transport(p_cb, NULL);



  /* save CSRK to security record */

  tBTM_LE_KEY_VALUE le_key = {

      .pcsrk_key =
@@ -1124,7 +1126,6 @@ void smp_proc_srk_info(tSMP_CB* p_cb, tSMP_INT_DATA* p_data) { 
  if ((p_cb->peer_auth_req & SMP_AUTH_BOND) &&

      (p_cb->loc_auth_req & SMP_AUTH_BOND))

    btm_sec_save_le_key(p_cb->pairing_bda, BTM_LE_KEY_PCSRK, &le_key, true);

  smp_key_distribution_by_transport(p_cb, NULL);

}



/*******************************************************************************