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

Commit eec03007 authored by Chris Manton's avatar Chris Manton Committed by Automerger Merge Worker
Browse files

Remove useless #def indirection bta/dm/bta_dm_act am: a3243810 

Original change: https://android-review.googlesource.com/c/platform/system/bt/+/1568971

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I659c3ba38731558e8315e33534d3dbb3ece32ab6
parents 6b8d355a a3243810

system/bta/dm/bta_dm_act.cc

+1 −1
Original line number Original line Diff line number Diff line
@@ -2941,7 +2941,7 @@ static void bta_dm_set_eir(char* local_name) { 
    p_length = p;

    p_length = p;





    UINT8_TO_STREAM(p, p_bta_dm_eir_cfg->bta_dm_eir_manufac_spec_len + 1);

    UINT8_TO_STREAM(p, p_bta_dm_eir_cfg->bta_dm_eir_manufac_spec_len + 1);

    UINT8_TO_STREAM(p, BTM_EIR_MANUFACTURER_SPECIFIC_TYPE);

    UINT8_TO_STREAM(p, HCI_EIR_MANUFACTURER_SPECIFIC_TYPE);

    memcpy(p, p_bta_dm_eir_cfg->bta_dm_eir_manufac_spec,

    memcpy(p, p_bta_dm_eir_cfg->bta_dm_eir_manufac_spec,

           p_bta_dm_eir_cfg->bta_dm_eir_manufac_spec_len);

           p_bta_dm_eir_cfg->bta_dm_eir_manufac_spec_len);

    p += p_bta_dm_eir_cfg->bta_dm_eir_manufac_spec_len;

    p += p_bta_dm_eir_cfg->bta_dm_eir_manufac_spec_len;

system/stack/include/btm_api_types.h

+0 −2
Original line number Original line Diff line number Diff line
@@ -269,8 +269,6 @@ typedef uint8_t tBTM_EIR_SEARCH_RESULT; 
#define BTM_EIR_COMPLETE_LOCAL_NAME_TYPE HCI_EIR_COMPLETE_LOCAL_NAME_TYPE

#define BTM_EIR_COMPLETE_LOCAL_NAME_TYPE HCI_EIR_COMPLETE_LOCAL_NAME_TYPE

/* 0x0A */

/* 0x0A */

#define BTM_EIR_TX_POWER_LEVEL_TYPE HCI_EIR_TX_POWER_LEVEL_TYPE

#define BTM_EIR_TX_POWER_LEVEL_TYPE HCI_EIR_TX_POWER_LEVEL_TYPE

/* 0xFF */

#define BTM_EIR_MANUFACTURER_SPECIFIC_TYPE HCI_EIR_MANUFACTURER_SPECIFIC_TYPE





#define BTM_BLE_SEC_NONE 0

#define BTM_BLE_SEC_NONE 0

/* encrypt the link using current key */

/* encrypt the link using current key */