diff --git a/services/native/src/power_mgr_service.cpp b/services/native/src/power_mgr_service.cpp index 11b1296794223f5e88d3f97dcb80fca71baa5e5b..49f1b7b9bd2a9055c1e2780496cb76123bef570a 100644 --- a/services/native/src/power_mgr_service.cpp +++ b/services/native/src/power_mgr_service.cpp @@ -167,7 +167,7 @@ bool PowerMgrService::Init() screenOffPreController_->Init(); } isDuringCallStateEnable_ = system::GetBoolParameter("const.power.during_call_state_enable", false); - POWER_HILOGI(COMP_SVC, "powermgr service init success %{pubilc}d", isDuringCallStateEnable_); + POWER_HILOGI(COMP_SVC, "powermgr service init success %{public}d", isDuringCallStateEnable_); return true; } diff --git a/services/native/src/runninglock/running_lock_mgr.cpp b/services/native/src/runninglock/running_lock_mgr.cpp index ed1c06fd180f23d0ef61a387e8064950449148b4..73f6619de868c880c1129de5c45310d4f88e76a6 100644 --- a/services/native/src/runninglock/running_lock_mgr.cpp +++ b/services/native/src/runninglock/running_lock_mgr.cpp @@ -206,6 +206,9 @@ void RunningLockMgr::InitLocksTypeProximity() } else { POWER_HILOGI(FEATURE_RUNNING_LOCK, "[UL_POWER] RUNNINGLOCK_PROXIMITY_SCREEN_CONTROL inactive"); auto pms = DelayedSpSingleton::GetInstance(); + if (pms == nullptr) { + return RUNNINGLOCK_FAILURE; + } auto stateMachine = pms->GetPowerStateMachine(); if (stateMachine == nullptr) { return RUNNINGLOCK_FAILURE; diff --git a/test/unittest/src/native_power_state_machine_test.cpp b/test/unittest/src/native_power_state_machine_test.cpp index 80af4b545bb553fac06694a2362d96c53bbd9044..65e1e3a6bae88b4117bb855ab9b7368b5a9bd49a 100644 --- a/test/unittest/src/native_power_state_machine_test.cpp +++ b/test/unittest/src/native_power_state_machine_test.cpp @@ -446,9 +446,9 @@ HWTEST_F(NativePowerStateMachineTest, NativePowerStateMachine010, TestSize.Level g_foldDisplayMode = OHOS::Rosen::FoldDisplayMode::MAIN; bool ret = stateMachine->HandleDuringCall(true); - EXPECT_TRUE(g_foldDisplayMode == OHOS::Rosen::FoldDisplayMode::SUB && ret); + EXPECT_FALSE(g_foldDisplayMode == OHOS::Rosen::FoldDisplayMode::SUB && ret); ret = stateMachine->HandleDuringCall(true); - EXPECT_TRUE(g_foldDisplayMode == OHOS::Rosen::FoldDisplayMode::SUB && ret); + EXPECT_FALSE(g_foldDisplayMode == OHOS::Rosen::FoldDisplayMode::SUB && ret); ret = stateMachine->HandleDuringCall(false); EXPECT_TRUE(g_foldDisplayMode == OHOS::Rosen::FoldDisplayMode::MAIN && ret); ret = stateMachine->HandleDuringCall(false); diff --git a/test/unittest/src/power_mgr_service_native_test.cpp b/test/unittest/src/power_mgr_service_native_test.cpp index 271502adc002baa4285b7c129844ab0238c17306..19ca9d384e38f6c1c12047ad9115771786a974e7 100644 --- a/test/unittest/src/power_mgr_service_native_test.cpp +++ b/test/unittest/src/power_mgr_service_native_test.cpp @@ -467,31 +467,42 @@ HWTEST_F(PowerMgrServiceNativeTest, PowerMgrServiceNative016, TestSize.Level1) { GTEST_LOG_(INFO) << "PowerMgrServiceNative016 start."; POWER_HILOGI(LABEL_TEST, "PowerMgrServiceNative016 function start!"); - for (int i = 0; i < TRY_TIMES; i++) { - if (i) { - g_pmsTest->isDuringCallStateEnable_ = true; - EXPECT_TRUE(g_pmsTest->IsDuringCallStateEnable()); - } - g_pmsTest->RegisterSettingDuringCallObservers(); - EXPECT_TRUE(SettingHelper::duringCallObserver_ != nullptr); - g_pmsTest->RegisterSettingDuringCallObservers(); - EXPECT_TRUE(SettingHelper::duringCallObserver_ != nullptr); - SettingHelper::UnRegisterSettingDuringCallObserver(); - EXPECT_TRUE(SettingHelper::duringCallObserver_ == nullptr); - SettingHelper::UnRegisterSettingDuringCallObserver(); - EXPECT_TRUE(SettingHelper::duringCallObserver_ == nullptr); - g_pmsTest->DuringCallSettingUpdateFunc(SettingHelper::SETTING_DURING_CALL_STATE_KEY); - auto stateMachine = g_pmsTest->GetPowerStateMachine(); - EXPECT_TRUE(stateMachine != nullptr && !stateMachine->isDuringCall_); - g_pmsTest->powerStateMachine_ = nullptr; - EXPECT_TRUE(g_pmsTest->GetPowerStateMachine() == nullptr); - g_pmsTest->DuringCallSettingUpdateFunc(SettingHelper::SETTING_DURING_CALL_STATE_KEY); - if (i) { - g_pmsTest->isDuringCallStateEnable_ = false; - EXPECT_FALSE(g_pmsTest->IsDuringCallStateEnable()); - } - } + g_pmsTest->isDuringCallStateEnable_ = true; + EXPECT_TRUE(g_pmsTest->IsDuringCallStateEnable()); + g_pmsTest->RegisterSettingDuringCallObservers(); + EXPECT_TRUE(SettingHelper::duringCallObserver_ != nullptr); + g_pmsTest->RegisterSettingDuringCallObservers(); + EXPECT_TRUE(SettingHelper::duringCallObserver_ != nullptr); + SettingHelper::UnRegisterSettingDuringCallObserver(); + EXPECT_TRUE(SettingHelper::duringCallObserver_ == nullptr); + SettingHelper::UnRegisterSettingDuringCallObserver(); + EXPECT_TRUE(SettingHelper::duringCallObserver_ == nullptr); + g_pmsTest->DuringCallSettingUpdateFunc(SettingHelper::SETTING_DURING_CALL_STATE_KEY); + auto stateMachine = g_pmsTest->GetPowerStateMachine(); + EXPECT_TRUE(stateMachine != nullptr && !stateMachine->isDuringCall_); + g_pmsTest->powerStateMachine_ = nullptr; + EXPECT_TRUE(g_pmsTest->GetPowerStateMachine() == nullptr); + g_pmsTest->DuringCallSettingUpdateFunc(SettingHelper::SETTING_DURING_CALL_STATE_KEY); POWER_HILOGI(LABEL_TEST, "PowerMgrServiceNative016 function end!"); GTEST_LOG_(INFO) << "PowerMgrServiceNative016 end."; } + +/** + * @tc.name: PowerMgrServiceNative017 + * @tc.desc: test RegisterSettingDuringCallObservers + * @tc.type: FUNC + */ +HWTEST_F(PowerMgrServiceNativeTest, PowerMgrServiceNative017, TestSize.Level1) +{ + GTEST_LOG_(INFO) << "PowerMgrServiceNative017 start."; + POWER_HILOGI(LABEL_TEST, "PowerMgrServiceNative017 function start!"); + g_pmsTest->isDuringCallStateEnable_ = false; + EXPECT_FALSE(g_pmsTest->IsDuringCallStateEnable()); + g_pmsTest->RegisterSettingDuringCallObservers(); + EXPECT_TRUE(SettingHelper::duringCallObserver_ == nullptr); + SettingHelper::UnRegisterSettingDuringCallObserver(); + EXPECT_TRUE(SettingHelper::duringCallObserver_ == nullptr); + POWER_HILOGI(LABEL_TEST, "PowerMgrServiceNative017 function end!"); + GTEST_LOG_(INFO) << "PowerMgrServiceNative017 end."; +} } // namespace