diff --git a/state_manager/service/native/src/display_power_mgr_service.cpp b/state_manager/service/native/src/display_power_mgr_service.cpp
index 7b4d929c601bcbc6a479b09728c6d2232c3d1b5d..fa9207856e968e1406342b310827505288da08a8 100644
--- a/state_manager/service/native/src/display_power_mgr_service.cpp
+++ b/state_manager/service/native/src/display_power_mgr_service.cpp
@@ -438,7 +438,7 @@ bool DisplayPowerMgrService::IsSupportLightSensor(void)
     return BrightnessManager::Get().IsSupportLightSensor();
 }
 
-bool DisplayPowerMgrService::IsAutoAdjustBrightnessInner()
+bool DisplayPowerMgrService::IsAutoAdjustBrightnessInner(void)
 {
     return BrightnessManager::Get().IsAutoAdjustBrightness();
 }
diff --git a/state_manager/service/native/src/display_system_ability.cpp b/state_manager/service/native/src/display_system_ability.cpp
index b0046e9493af5fa15cc194bedad0d513ec580f62..f3f3c0aa3939778c87c908e00a14662004de44f0 100644
--- a/state_manager/service/native/src/display_system_ability.cpp
+++ b/state_manager/service/native/src/display_system_ability.cpp
@@ -47,8 +47,8 @@ void DisplaySystemAbility::OnAddSystemAbility(int32_t systemAbilityId, const std
         if (!Publish(service)) {
             DISPLAY_HILOGE(COMP_SVC, "Failed to publish service");
         }
-        if (commonEventManager_ != nullptr && commonEventManager_->CheckIfSettingsDataReady()
-            && commonEventManager_->SetKvDataReady()) {
+        if (commonEventManager_ != nullptr && commonEventManager_->CheckIfSettingsDataReady() &&
+            commonEventManager_->SetKvDataReady()) {
             commonEventManager_->HandleBootBrightness();
         }
         isReady = true;
@@ -80,8 +80,8 @@ void DisplaySystemAbility::OnStop()
     DISPLAY_HILOGW(COMP_SVC, "Stop service");
     auto service = DelayedSpSingleton<DisplayPowerMgrService>::GetInstance();
     service->Deinit();
-    RemoveSystemAbilityListener(DISPLAY_MANAGER_SERVICE_SA_ID);
     isReady = false;
+    RemoveSystemAbilityListener(DISPLAY_MANAGER_SERVICE_SA_ID);
 }
 } // OHOS
 } // DisplayPowerMgr
diff --git a/state_manager/test/unittest/BUILD.gn b/state_manager/test/unittest/BUILD.gn
index abd962fbca3b57b67fe5a44cdc65559ddbbc743f..bf890c463c77f39e759f2d9fda8e9530706f0084 100644
--- a/state_manager/test/unittest/BUILD.gn
+++ b/state_manager/test/unittest/BUILD.gn
@@ -14,7 +14,7 @@
 import("//build/test.gni")
 import("../../../displaymgr.gni")
 
-module_output_path = "display_manager/display_state_manager"
+module_output_path = "display_manager/display_manager"
 
 ###############################################################################
 config("module_private_config") {
diff --git a/state_manager/test/unittest/src/mock/display_mock_parcel_test.cpp b/state_manager/test/unittest/src/mock/display_mock_parcel_test.cpp
index f6da9c537c6b585b5b45230e7b1a5b039782b11b..bfa9064b8e17612090723a9aae9574f002feb2f4 100644
--- a/state_manager/test/unittest/src/mock/display_mock_parcel_test.cpp
+++ b/state_manager/test/unittest/src/mock/display_mock_parcel_test.cpp
@@ -172,7 +172,7 @@ HWTEST_F(DisplayMockParcelTest, DisplayMockParcelTest_002, TestSize.Level0)
     bool result = false;
     EXPECT_NE(sptrDisplayProxy->RegisterCallback(callbackPtr, result), ERR_OK);
     EXPECT_FALSE(result);
-    DISPLAY_HILOGI(LABEL_TEST, "DisplayMockParcelTest_002 function is end");
+    DISPLAY_HILOGI(LABEL_TEST, "DisplayMockParcelTest_002 function end!");
 }
 
 /**
@@ -189,7 +189,7 @@ HWTEST_F(DisplayMockParcelTest, DisplayMockParcelTest_003, TestSize.Level0)
     bool result = false;
     EXPECT_NE(sptrDisplayProxy->RegisterCallback(callbackPtr, result), ERR_OK);
     EXPECT_FALSE(result);
-    DISPLAY_HILOGI(LABEL_TEST, "DisplayMockParcelTest_003 function end");
+    DISPLAY_HILOGI(LABEL_TEST, "DisplayMockParcelTest_003 function end!");
 }
 
 /**
@@ -214,7 +214,7 @@ HWTEST_F(DisplayMockParcelTest, DisplayMockParcelTest_004, TestSize.Level0)
     bool result = false;
     EXPECT_NE(sptrDisplayProxy->RegisterCallback(callbackPtr, result), ERR_OK);
     EXPECT_FALSE(result);
-    DISPLAY_HILOGI(LABEL_TEST, "DisplayMockParcelTest_004 function end");
+    DISPLAY_HILOGI(LABEL_TEST, "DisplayMockParcelTest_004 function end!");
 }
 
 /**