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

Commit 4bdfa60c authored by Treehugger Robot's avatar Treehugger Robot Committed by Gerrit Code Review
Browse files

Merge "Replace BT_EIR_FLAGS_TYPE => HCI_EIR_FLAGS_TYPE"

parents 2ce48758 97d4398e

system/bta/test/bta_dm_cust_uuid_test.cc

+1 −1
Original line number Diff line number Diff line
@@ -30,7 +30,7 @@ tBTM_STATUS BTM_ReadLocalDeviceName(char** p_name) { return BTM_SUCCESS; } 
uint8_t BTM_GetEirSupportedServices(uint32_t* p_eir_uuid, uint8_t** p,

                                    uint8_t max_num_uuid16,

                                    uint8_t* p_num_uuid16) {

  return BT_EIR_FLAGS_TYPE;

  return HCI_EIR_FLAGS_TYPE;

}

tBTM_STATUS BTM_WriteEIR(BT_HDR* p_buff) { return BTM_SUCCESS; }

system/btif/src/btif_ble_scanner.cc

+1 −1
Original line number Diff line number Diff line
@@ -119,7 +119,7 @@ void bta_scan_results_cb_impl(RawAddress bd_addr, tBT_DEVICE_TYPE device_type, 


  if (p_eir_remote_name == NULL) {

    p_eir_remote_name = AdvertiseDataParser::GetFieldByType(

        value, BT_EIR_SHORTENED_LOCAL_NAME_TYPE, &remote_name_len);

        value, HCI_EIR_SHORTENED_LOCAL_NAME_TYPE, &remote_name_len);

  }



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

system/main/shim/le_scanning_manager.cc

+2 −1
Original line number Diff line number Diff line
@@ -432,7 +432,8 @@ class BleScannerInterfaceImpl : public BleScannerInterface, 


    if (p_eir_remote_name == NULL) {

      p_eir_remote_name = AdvertiseDataParser::GetFieldByType(

          advertising_data, BT_EIR_SHORTENED_LOCAL_NAME_TYPE, &remote_name_len);

          advertising_data, HCI_EIR_SHORTENED_LOCAL_NAME_TYPE,

          &remote_name_len);

    }



    // update device name