Merge pull request #14202 from paul-szczepanek-arm/fix-stop-advert

0xc0170 · web-flow · commit 5e1d13886ce0 · 2021-02-03T09:31:24.000Z
BLE: return OK when stopping advertising set that is not active
diff --git a/connectivity/FEATURE_BLE/source/generic/GapImpl.cpp b/connectivity/FEATURE_BLE/source/generic/GapImpl.cpp
@@ -2120,10 +2120,14 @@ ble_error_t Gap::stopAdvertising(advertising_handle_t handle)
     }
 #endif // BLE_FEATURE_EXTENDED_ADVERTISING
 
-    if (!_active_sets.get(handle) || _pending_sets.get(handle)) {
+    if (_pending_sets.get(handle)) {
         return BLE_STACK_BUSY;
     }
 
+    if (!_active_sets.get(handle)) {
+        return BLE_ERROR_NONE;
+    }
+
 #if BLE_FEATURE_EXTENDED_ADVERTISING
     if (is_extended_advertising_available()) {
         status = _pal_gap.extended_advertising_enable(

Original file line number	Diff line number	Diff line change
`@@ -2120,10 +2120,14 @@ ble_error_t Gap::stopAdvertising(advertising_handle_t handle)`
`2120`	`2120`	`}`
`2121`	`2121`	`#endif // BLE_FEATURE_EXTENDED_ADVERTISING`
`2122`	`2122`
`2123`		`- if (!_active_sets.get(handle) \|\| _pending_sets.get(handle)) {`
	`2123`	`+ if (_pending_sets.get(handle)) {`
`2124`	`2124`	`return BLE_STACK_BUSY;`
`2125`	`2125`	`}`
`2126`	`2126`
	`2127`	`+ if (!_active_sets.get(handle)) {`
	`2128`	`+ return BLE_ERROR_NONE;`
	`2129`	`+ }`
	`2130`	`+`
`2127`	`2131`	`#if BLE_FEATURE_EXTENDED_ADVERTISING`
`2128`	`2132`	`if (is_extended_advertising_available()) {`
`2129`	`2133`	`status = _pal_gap.extended_advertising_enable(`