From b321bf1f64f937b998bcabd5be93bd3dd28083b9 Mon Sep 17 00:00:00 2001
From: Li Cao <irvingcl@google.com>
Date: Wed, 5 Mar 2025 00:04:08 +0800
Subject: [PATCH] [border-agent] fix meshcop service update issue (#11320)

This commit fixes an issue in BorderAgent when handling Notifier
events.

If the events contain 'Epskc' and BA is not running, then the meshcop
service update will be skipped.
---
 src/core/meshcop/border_agent.cpp | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/core/meshcop/border_agent.cpp b/src/core/meshcop/border_agent.cpp
index 571862d43..9f039248a 100644
--- a/src/core/meshcop/border_agent.cpp
+++ b/src/core/meshcop/border_agent.cpp
@@ -172,6 +172,12 @@ void BorderAgent::HandleNotifierEvents(Events aEvents)
         }
     }
 
+    if (aEvents.ContainsAny(kEventThreadRoleChanged | kEventThreadExtPanIdChanged | kEventThreadNetworkNameChanged |
+                            kEventThreadBackboneRouterStateChanged | kEventActiveDatasetChanged))
+    {
+        PostNotifyMeshCoPServiceChangedTask();
+    }
+
     if (aEvents.ContainsAny(kEventPskcChanged))
     {
         Pskc pskc;
@@ -186,12 +192,6 @@ void BorderAgent::HandleNotifierEvents(Events aEvents)
         pskc.Clear();
     }
 
-    if (aEvents.ContainsAny(kEventThreadRoleChanged | kEventThreadExtPanIdChanged | kEventThreadNetworkNameChanged |
-                            kEventThreadBackboneRouterStateChanged | kEventActiveDatasetChanged))
-    {
-        PostNotifyMeshCoPServiceChangedTask();
-    }
-
 exit:
     return;
 }