call advertising end even if stopped by us

pull/9058/head
paul-szczepanek-arm 2018-12-13 17:33:36 +00:00
parent 13a10f3efa
commit 50d1818d72
1 changed files with 2 additions and 11 deletions

View File

@ -2387,9 +2387,6 @@ ble_error_t GenericGap::stopAdvertising(advertising_handle_t handle)
ble_error_t status; ble_error_t status;
if (is_extended_advertising_available()) { if (is_extended_advertising_available()) {
_active_sets.clear(handle);
status = _pal_gap.extended_advertising_enable( status = _pal_gap.extended_advertising_enable(
/*enable ? */ false, /*enable ? */ false,
/* number of advertising sets */ 1, /* number of advertising sets */ 1,
@ -2399,7 +2396,6 @@ ble_error_t GenericGap::stopAdvertising(advertising_handle_t handle)
); );
if (status) { if (status) {
_active_sets.set(handle);
return status; return status;
} }
} else { } else {
@ -2407,18 +2403,17 @@ ble_error_t GenericGap::stopAdvertising(advertising_handle_t handle)
return BLE_ERROR_INVALID_PARAM; return BLE_ERROR_INVALID_PARAM;
} }
_active_sets.clear(handle);
status = _pal_gap.advertising_enable(false); status = _pal_gap.advertising_enable(false);
if (status) { if (status) {
_active_sets.set(handle);
return status; return status;
} }
_advertising_timeout.detach(); _advertising_timeout.detach();
} }
_active_sets.clear(handle);
return status; return status;
} }
@ -2746,10 +2741,6 @@ void GenericGap::on_advertising_set_terminated(
uint8_t number_of_completed_extended_advertising_events uint8_t number_of_completed_extended_advertising_events
) )
{ {
if (!_active_sets.get(advertising_handle)) {
return;
}
_active_sets.clear(advertising_handle); _active_sets.clear(advertising_handle);
if (!_eventHandler) { if (!_eventHandler) {