From 8af9ad7135632be541403267c05fcb0e2194aa3a Mon Sep 17 00:00:00 2001
From: wuzhihuitmac <wuzhihui4@huawei.com>
Date: Thu, 7 Aug 2025 15:30:04 +0800
Subject: [PATCH] Modify timeout about mem service unalive

Signed-off-by: wuzhihuitmac <wuzhihui4@huawei.com>
Change-Id: I9cb34b5f2a50f89241cb228fa9abb90b8672bd40
---
 services/include/sensor_service.h |  1 +
 services/src/sensor_service.cpp   | 16 ++++++++++++++--
 2 files changed, 15 insertions(+), 2 deletions(-)

diff --git a/services/include/sensor_service.h b/services/include/sensor_service.h
index 59e002f2..2252cb27 100644
--- a/services/include/sensor_service.h
+++ b/services/include/sensor_service.h
@@ -125,6 +125,7 @@ private:
     ErrCode SaveSubscriber(const SensorDescription &sensorDesc, int64_t samplingPeriodNs, int64_t maxReportDelayNs);
     std::atomic_bool isReportActiveInfo_ = false;
     static std::atomic_bool isAccessTokenServiceActive_;
+    static std::atomic_bool isMemoryMgrServiceActive_;
     static std::atomic_bool isCritical_;
 };
 
diff --git a/services/src/sensor_service.cpp b/services/src/sensor_service.cpp
index d8d25c3f..bf4664a8 100644
--- a/services/src/sensor_service.cpp
+++ b/services/src/sensor_service.cpp
@@ -58,6 +58,7 @@ const std::set<int32_t> g_systemApiSensorCall = {
 } // namespace
 
 std::atomic_bool SensorService::isAccessTokenServiceActive_ = false;
+std::atomic_bool SensorService::isMemoryMgrServiceActive_ = false;
 std::atomic_bool SensorService::isCritical_ = false;
 
 SensorService::SensorService()
@@ -113,6 +114,7 @@ void SensorService::OnAddSystemAbility(int32_t systemAbilityId, const std::strin
     if (systemAbilityId == MEMORY_MANAGER_SA_ID) {
         Memory::MemMgrClient::GetInstance().NotifyProcessStatus(getpid(),
             PROCESS_TYPE_SA, PROCESS_STATUS_STARTED, SENSOR_SERVICE_ABILITY_ID);
+        isMemoryMgrServiceActive_ = true;
         SetCritical();
     }
 #endif // MEMMGR_ENABLE
@@ -152,6 +154,11 @@ void SensorService::OnRemoveSystemAbility(int32_t systemAbilityId, const std::st
         isAccessTokenServiceActive_ = false;
     }
 #endif // ACCESS_TOKEN_ENABLE
+#ifdef MEMMGR_ENABLE
+    if (systemAbilityId == MEMORY_MANAGER_SA_ID) {
+        isMemoryMgrServiceActive_ = false;
+    }
+#endif // MEMMGR_ENABLE
 }
 
 void SensorService::OnStart()
@@ -522,9 +529,9 @@ ErrCode SensorService::DisableSensor(const SensorDescription &sensorDesc, int32_
     clientInfo_.ClearDataQueue(sensorDesc);
     int32_t ret = sensorManager_.AfterDisableSensor(sensorDesc);
 #ifdef MEMMGR_ENABLE
-    if (!clientInfo_.IsClientSubscribe() && isCritical_) {
+    if (isMemoryMgrServiceActive_ && !clientInfo_.IsClientSubscribe() && isCritical_) {
         if (Memory::MemMgrClient::GetInstance().SetCritical(getpid(), false, SENSOR_SERVICE_ABILITY_ID) != ERR_OK) {
-            SEN_HILOGE("setCritical failed");
+            SEN_HILOGE("SetCritical failed");
             return ret;
         }
         isCritical_ = false;
@@ -1060,6 +1067,11 @@ void SensorService::ReportPlugEventCallback(const SensorPlugInfo &info)
 
 void SensorService::SetCritical()
 {
+    CALL_LOG_ENTER;
+    if (!isMemoryMgrServiceActive_) {
+        SEN_HILOGE("Memory manager service is inactive");
+        return;
+    }
 #ifdef MEMMGR_ENABLE
     if (!isCritical_) {
         if (Memory::MemMgrClient::GetInstance().SetCritical(getpid(), true, SENSOR_SERVICE_ABILITY_ID) != ERR_OK) {
-- 
Gitee