From d710fd21d186b46e8a175d6dc5727df4bbac740e Mon Sep 17 00:00:00 2001
From: Yufeng Wang <yufengwang@google.com>
Date: Tue, 14 Dec 2021 12:41:03 -0800
Subject: [PATCH] Adjust priority of Shutdown event in basic cluster (#13001)

---
 src/app/clusters/basic/basic.cpp                                | 2 +-
 .../zcl/data-model/chip/basic-information-cluster.xml           | 2 +-
 .../app-common/app-common/zap-generated/cluster-objects.h       | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/app/clusters/basic/basic.cpp b/src/app/clusters/basic/basic.cpp
index 38ccf5ecc31f96..88dcadf7de97a1 100644
--- a/src/app/clusters/basic/basic.cpp
+++ b/src/app/clusters/basic/basic.cpp
@@ -68,7 +68,7 @@ class PlatformMgrDelegate : public DeviceLayer::PlatformManagerDelegate
             Events::ShutDown::Type event;
             EventNumber eventNumber;
 
-            if (CHIP_NO_ERROR != LogEvent(event, endpoint, eventNumber))
+            if (CHIP_NO_ERROR != LogEvent(event, endpoint, eventNumber, EventOptions::Type::kUrgent))
             {
                 ChipLogError(Zcl, "PlatformMgrDelegate: Failed to record ShutDown event");
             }
diff --git a/src/app/zap-templates/zcl/data-model/chip/basic-information-cluster.xml b/src/app/zap-templates/zcl/data-model/chip/basic-information-cluster.xml
index b4b330b3795f3d..eef0cd75356543 100644
--- a/src/app/zap-templates/zcl/data-model/chip/basic-information-cluster.xml
+++ b/src/app/zap-templates/zcl/data-model/chip/basic-information-cluster.xml
@@ -48,7 +48,7 @@ limitations under the License.
       <description>The StartUp event SHALL be emitted by a Node as soon as reasonable after completing a boot or reboot process.</description>
       <field id="0" name="SoftwareVersion" type="INT32U"/>
     </event>
-    <event side="server" code="0x01" name="ShutDown" priority="info" optional="false">
+    <event side="server" code="0x01" name="ShutDown" priority="critical" optional="false">
       <description>The ShutDown event SHOULD be emitted by a Node prior to any orderly shutdown sequence on a best-effort basis.</description>
     </event>
     <event side="server" code="0x02" name="Leave" priority="info" optional="false">
diff --git a/zzz_generated/app-common/app-common/zap-generated/cluster-objects.h b/zzz_generated/app-common/app-common/zap-generated/cluster-objects.h
index b8b2a224b1dc3e..32c84506228d8b 100644
--- a/zzz_generated/app-common/app-common/zap-generated/cluster-objects.h
+++ b/zzz_generated/app-common/app-common/zap-generated/cluster-objects.h
@@ -8037,7 +8037,7 @@ struct DecodableType
 };
 } // namespace StartUp
 namespace ShutDown {
-static constexpr PriorityLevel kPriorityLevel = PriorityLevel::Info;
+static constexpr PriorityLevel kPriorityLevel = PriorityLevel::Critical;
 static constexpr EventId kEventId             = 0x00000001;
 
 enum class Fields