diff --git a/interfaces/kits/native/appkit/app/watchdog.h b/interfaces/kits/native/appkit/app/watchdog.h index 38fb4b7bd4..8b34b7e4c9 100644 --- a/interfaces/kits/native/appkit/app/watchdog.h +++ b/interfaces/kits/native/appkit/app/watchdog.h @@ -99,7 +99,7 @@ private: std::atomic_bool stopWatchdog_ = false; std::atomic_bool needReport_ = true; std::atomic_bool isSixSecondEvent_ = false; - std::atomic_bool isInBackground_ = false; + std::atomic_bool isInBackground_ = true; std::shared_ptr applicationInfo_ = nullptr; std::mutex cvMutex_; std::condition_variable cvWatchdog_; diff --git a/test/unittest/frameworks_kits_appkit_native_test/watchdog_test.cpp b/test/unittest/frameworks_kits_appkit_native_test/watchdog_test.cpp index 9a83f4b59c..5d53128bb1 100644 --- a/test/unittest/frameworks_kits_appkit_native_test/watchdog_test.cpp +++ b/test/unittest/frameworks_kits_appkit_native_test/watchdog_test.cpp @@ -236,10 +236,10 @@ HWTEST_F(WatchdogTest, WatchdogTest_SetAppMainThreadState_001, TestSize.Level1) HWTEST_F(WatchdogTest, WatchdogTest_SetBackgroundStatus_001, TestSize.Level1) { GTEST_LOG_(INFO) << "WatchdogTest_SetBackgroundStatus_001 start"; - bool isInBackground = true; - EXPECT_FALSE(watchdog_->isInBackground_); - watchdog_->SetBackgroundStatus(isInBackground); + bool isInBackground = false; EXPECT_TRUE(watchdog_->isInBackground_); + watchdog_->SetBackgroundStatus(isInBackground); + EXPECT_FALSE(watchdog_->isInBackground_); GTEST_LOG_(INFO) << "WatchdogTest_SetBackgroundStatus_001 end"; } @@ -323,7 +323,7 @@ HWTEST_F(WatchdogTest, WatchdogTest_Timer_002, TestSize.Level1) { GTEST_LOG_(INFO) << "WatchdogTest_Timer_002 start"; bool isInBackground = true; - EXPECT_FALSE(watchdog_->isInBackground_); + EXPECT_TRUE(watchdog_->isInBackground_); watchdog_->SetBackgroundStatus(isInBackground); watchdog_->Timer(); EXPECT_TRUE(watchdog_->appMainThreadIsAlive_); @@ -341,6 +341,8 @@ HWTEST_F(WatchdogTest, WatchdogTest_Timer_003, TestSize.Level1) bool appMainThreadState = true; EXPECT_FALSE(watchdog_->appMainThreadIsAlive_); watchdog_->SetAppMainThreadState(appMainThreadState); + bool isInBackground = false; + watchdog_->SetBackgroundStatus(isInBackground); watchdog_->Timer(); EXPECT_TRUE(watchdog_->needReport_); EXPECT_FALSE(watchdog_->isInBackground_); @@ -359,6 +361,8 @@ HWTEST_F(WatchdogTest, WatchdogTest_Timer_004, TestSize.Level1) bool appMainThreadState = true; EXPECT_FALSE(watchdog_->appMainThreadIsAlive_); watchdog_->SetAppMainThreadState(appMainThreadState); + bool isInBackground = false; + watchdog_->SetBackgroundStatus(isInBackground); watchdog_->appMainHandler_ = std::make_shared(); watchdog_->Timer(); EXPECT_TRUE(watchdog_->needReport_);