From d9e6110577947200a4a743956a9783ad39f4031b Mon Sep 17 00:00:00 2001
From: "desmond.chen" <desmond.chen@arm.com>
Date: Mon, 21 Oct 2019 15:57:09 +0800
Subject: [PATCH] Handle legacy process event first on connection complete

---
 .../FEATURE_BLE/source/generic/GenericGap.tpp | 26 +++++++++----------
 1 file changed, 13 insertions(+), 13 deletions(-)

diff --git a/features/FEATURE_BLE/source/generic/GenericGap.tpp b/features/FEATURE_BLE/source/generic/GenericGap.tpp
index b5bc9826ba..1d22d59035 100644
--- a/features/FEATURE_BLE/source/generic/GenericGap.tpp
+++ b/features/FEATURE_BLE/source/generic/GenericGap.tpp
@@ -1887,6 +1887,19 @@ void GenericGap<PalGapImpl, PalSecurityManager, ConnectionEventMonitorEventHandl
         address = _pal_gap.get_random_address();
     }
 
+    // legacy process event
+    processConnectionEvent(
+        e.connection_handle,
+        e.role.value() == e.role.CENTRAL ? LegacyGap::CENTRAL : LegacyGap::PERIPHERAL,
+        e.peer_address_type,
+        e.peer_address.data(),
+        _address_type,
+        address.data(),
+        &connection_params,
+        e.local_resolvable_private_address.data(),
+        e.peer_resolvable_private_address.data()
+    );
+
     // new process event
     if (_eventHandler) {
         _eventHandler->onConnectionComplete(
@@ -1906,19 +1919,6 @@ void GenericGap<PalGapImpl, PalSecurityManager, ConnectionEventMonitorEventHandl
         );
     }
 
-    // legacy process event
-    processConnectionEvent(
-        e.connection_handle,
-        e.role.value() == e.role.CENTRAL ? LegacyGap::CENTRAL : LegacyGap::PERIPHERAL,
-        e.peer_address_type,
-        e.peer_address.data(),
-        _address_type,
-        address.data(),
-        &connection_params,
-        e.local_resolvable_private_address.data(),
-        e.peer_resolvable_private_address.data()
-    );
-
 #if BLE_FEATURE_SECURITY
     // Now starts pairing or authentication procedures if required
     if (needs_pairing) {