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

Commit 3bfbbec7 authored by Andre Eisenbach's avatar Andre Eisenbach Committed by Android (Google) Code Review
Browse files

Merge "LE: Remove general/limited discoverability bits for non-connectable adv" into lmp-dev

parents 356b06ae e9e559f5

system/btif/include/btif_gatt_multi_adv_util.h

+2 −2
Original line number Diff line number Diff line
@@ -30,8 +30,8 @@ 
#define STD_ADV_INSTID 0



/* Default ADV flags for general and limited discoverability */

#define ADV_FLAGS_LIMITED 0x01

#define ADV_FLAGS_GENERAL 0x02

#define ADV_FLAGS_LIMITED BTA_DM_LIMITED_DISC

#define ADV_FLAGS_GENERAL BTA_DM_GENERAL_DISC



typedef struct

{

system/btif/src/btif_gatt_multi_adv_util.c

+5 −0
Original line number Diff line number Diff line
@@ -273,6 +273,11 @@ BOOLEAN btif_gattc_copy_datacb(int cbindex, btif_adv_data_t *p_adv_data, BOOLEAN 
         p_multi_adv_data_cb->inst_cb[cbindex].data.flag = ADV_FLAGS_GENERAL;

         if (p_multi_adv_data_cb->inst_cb[cbindex].timeout_s)

             p_multi_adv_data_cb->inst_cb[cbindex].data.flag = ADV_FLAGS_LIMITED;

         if (p_multi_adv_data_cb->inst_cb[cbindex].param.adv_type == BTA_BLE_NON_CONNECT_EVT)

             p_multi_adv_data_cb->inst_cb[cbindex].data.flag &=

                    ~(BTA_DM_LIMITED_DISC | BTA_DM_GENERAL_DISC);

         if (p_multi_adv_data_cb->inst_cb[cbindex].data.flag == 0)

            p_multi_adv_data_cb->inst_cb[cbindex].mask = 0;

    }



    if (p_adv_data->include_name)