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

Commit 2157782f authored by yunhanw's avatar yunhanw Committed by Jakub Pawlowski
Browse files

Re-enable LE advertising after disconnect, on controllers not supporting advertising when connected 

Bug: 112451773
Test: compiled and local device test

Change-Id: Ia39f46b3b9667cba34465e3ff310df85a765c3e1
parent 8f391ea8

system/stack/btm/btm_sec.cc

+9 −0
Original line number Original line Diff line number Diff line
@@ -49,6 +49,9 @@ 
bool(APPL_AUTH_WRITE_EXCEPTION)(const RawAddress& bd_addr);

bool(APPL_AUTH_WRITE_EXCEPTION)(const RawAddress& bd_addr);

#endif

#endif





extern void btm_ble_advertiser_notify_terminated_legacy(

    uint8_t status, uint16_t connection_handle);



/*******************************************************************************

/*******************************************************************************

 *             L O C A L    F U N C T I O N     P R O T O T Y P E S            *

 *             L O C A L    F U N C T I O N     P R O T O T Y P E S            *

 ******************************************************************************/

 ******************************************************************************/
@@ -4514,6 +4517,12 @@ void btm_sec_disconnected(uint16_t handle, uint8_t reason) { 
    p_dev_rec->ble_hci_handle = BTM_SEC_INVALID_HANDLE;

    p_dev_rec->ble_hci_handle = BTM_SEC_INVALID_HANDLE;

    p_dev_rec->sec_flags &= ~(BTM_SEC_LE_AUTHENTICATED | BTM_SEC_LE_ENCRYPTED);

    p_dev_rec->sec_flags &= ~(BTM_SEC_LE_AUTHENTICATED | BTM_SEC_LE_ENCRYPTED);

    p_dev_rec->enc_key_size = 0;

    p_dev_rec->enc_key_size = 0;



    // This is for chips that don't support being in connected and advertising

    // state at same time.

    if (!p_dev_rec->is_originator) {

      btm_ble_advertiser_notify_terminated_legacy(HCI_SUCCESS, handle);

    }

  } else {

  } else {

    p_dev_rec->hci_handle = BTM_SEC_INVALID_HANDLE;

    p_dev_rec->hci_handle = BTM_SEC_INVALID_HANDLE;

    p_dev_rec->sec_flags &=

    p_dev_rec->sec_flags &=