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

Commit 4951d83b authored by Automerger Merge Worker's avatar Automerger Merge Worker Committed by Android (Google) Code Review
Browse files

Merge "Merge "Fix upper (framework) can not get RC's name or other properties"... 

Merge "Merge "Fix upper (framework) can not get RC's name or other properties" am: 460b8a66 am: 15add121 am: 00a493d1 am: b8675b2a am: 07a68ed4"
parents 39cce34d 0ce46f6c

system/btif/src/btif_ble_scanner.cc

+1 −1
Original line number Diff line number Diff line
@@ -124,7 +124,7 @@ void bta_scan_results_cb_impl(RawAddress bd_addr, tBT_DEVICE_TYPE device_type, 
        value, HCI_EIR_SHORTENED_LOCAL_NAME_TYPE, &remote_name_len);

  }



  if ((addr_type != BLE_ADDR_RANDOM) || (p_eir_remote_name)) {

  if (p_eir_remote_name) {

    if (!btif_address_cache_find(bd_addr)) {

      btif_address_cache_add(bd_addr, addr_type);

system/main/shim/le_scanning_manager.cc

+1 −1
Original line number Diff line number Diff line
@@ -758,7 +758,7 @@ void BleScannerInterfaceImpl::handle_remote_properties( 
  }



  // update device name

  if ((addr_type != BLE_ADDR_RANDOM) || (p_eir_remote_name)) {

  if (p_eir_remote_name) {

    if (!address_cache_.find(bd_addr)) {

      address_cache_.add(bd_addr);