fix incorrect parameter check in periodic advertising

paul-szczepanek-arm · paul-szczepanek-arm · commit 9e509f435bb9 · 2020-10-27T15:09:30.000Z
diff --git a/connectivity/FEATURE_BLE/source/generic/GapImpl.cpp b/connectivity/FEATURE_BLE/source/generic/GapImpl.cpp
@@ -3219,9 +3219,8 @@ ble_error_t Gap::addDeviceToPeriodicAdvertiserList(
         return BLE_ERROR_NOT_IMPLEMENTED;
     }
 
-    if (peerAddressType != peer_address_type_t::PUBLIC ||
-        peerAddressType != peer_address_type_t::RANDOM
-        ) {
+    if ((peerAddressType != peer_address_type_t::PUBLIC) &&
+        (peerAddressType != peer_address_type_t::RANDOM)) {
         return BLE_ERROR_INVALID_PARAM;
     }
 
@@ -3251,9 +3250,8 @@ ble_error_t Gap::removeDeviceFromPeriodicAdvertiserList(
         return BLE_ERROR_NOT_IMPLEMENTED;
     }
 
-    if (peerAddressType != peer_address_type_t::PUBLIC ||
-        peerAddressType != peer_address_type_t::RANDOM
-        ) {
+    if ((peerAddressType != peer_address_type_t::PUBLIC) &&
+        (peerAddressType != peer_address_type_t::RANDOM)) {
         return BLE_ERROR_INVALID_PARAM;
     }
 

Original file line number	Diff line number	Diff line change
`@@ -3219,9 +3219,8 @@ ble_error_t Gap::addDeviceToPeriodicAdvertiserList(`
`3219`	`3219`	`return BLE_ERROR_NOT_IMPLEMENTED;`
`3220`	`3220`	`}`
`3221`	`3221`
`3222`		`- if (peerAddressType != peer_address_type_t::PUBLIC \|\|`
`3223`		`- peerAddressType != peer_address_type_t::RANDOM`
`3224`		`- ) {`
	`3222`	`+ if ((peerAddressType != peer_address_type_t::PUBLIC) &&`
	`3223`	`+ (peerAddressType != peer_address_type_t::RANDOM)) {`
`3225`	`3224`	`return BLE_ERROR_INVALID_PARAM;`
`3226`	`3225`	`}`
`3227`	`3226`
`@@ -3251,9 +3250,8 @@ ble_error_t Gap::removeDeviceFromPeriodicAdvertiserList(`
`3251`	`3250`	`return BLE_ERROR_NOT_IMPLEMENTED;`
`3252`	`3251`	`}`
`3253`	`3252`
`3254`		`- if (peerAddressType != peer_address_type_t::PUBLIC \|\|`
`3255`		`- peerAddressType != peer_address_type_t::RANDOM`
`3256`		`- ) {`
	`3253`	`+ if ((peerAddressType != peer_address_type_t::PUBLIC) &&`
	`3254`	`+ (peerAddressType != peer_address_type_t::RANDOM)) {`
`3257`	`3255`	`return BLE_ERROR_INVALID_PARAM;`
`3258`	`3256`	`}`
`3259`	`3257`