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

Commit 85d7781f authored by Md Shahriar Hossain Sajib's avatar Md Shahriar Hossain Sajib Committed by Automerger Merge Worker
Browse files

Merge changes from topic "mainline_b2" am: a0ff0533 am: 40a32429 

Original change: https://android-review.googlesource.com/c/platform/packages/modules/Bluetooth/+/1892220

Change-Id: Icf32fb8d7578732dfaa193f9586330717c1e1646
parents 125b0cf8 40a32429

system/btif/src/btif_sock_rfc.cc

+2 −1
Original line number Diff line number Diff line
@@ -129,7 +129,6 @@ bt_status_t btsock_rfc_init(int poll_thread_handle, uid_set_t* set) { 


void btsock_rfc_cleanup(void) {

  pth = -1;

  uid_set = NULL;



  BTA_JvDisable();
@@ -139,6 +138,8 @@ void btsock_rfc_cleanup(void) { 
    list_free(rfc_slots[i].incoming_queue);

    rfc_slots[i].incoming_queue = NULL;

  }



  uid_set = NULL;

}



static rfc_slot_t* find_free_slot(void) {

system/stack/btm/btm_ble.cc

+0 −1
Original line number Diff line number Diff line
@@ -91,7 +91,6 @@ void BTM_SecAddBleDevice(const RawAddress& bd_addr, tBT_DEVICE_TYPE dev_type, 
  p_dev_rec->device_type |= dev_type;

  p_dev_rec->ble.ble_addr_type = addr_type;



  p_dev_rec->ble.pseudo_addr = bd_addr;

  /* sync up with the Inq Data base*/

  tBTM_INQ_INFO* p_info = BTM_InqDbRead(bd_addr);

  if (p_info) {

system/stack/btm/btm_ble_gap.cc

+3 −1
Original line number Diff line number Diff line
@@ -701,7 +701,7 @@ void BTM_BleReadControllerFeatures( 
bool BTM_BleConfigPrivacy(bool privacy_mode) {

  tBTM_BLE_CB* p_cb = &btm_cb.ble_ctr_cb;



  BTM_TRACE_EVENT("%s", __func__);

  BTM_TRACE_WARNING("%s %d", __func__, (int)privacy_mode);



  /* if LE is not supported, return error */

  if (!controller_get_interface()->supports_ble()) return false;
@@ -727,6 +727,8 @@ bool BTM_BleConfigPrivacy(bool privacy_mode) { 
    } else /* 4.1/4.0 controller */

      p_cb->privacy_mode = BTM_PRIVACY_1_1;

  }

  VLOG(2) << __func__ << " privacy_mode: " << p_cb->privacy_mode

          << " own_addr_type: " << p_cb->addr_mgnt_cb.own_addr_type;



  GAP_BleAttrDBUpdate(GATT_UUID_GAP_CENTRAL_ADDR_RESOL, &gap_ble_attr_value);