diff --git a/extension/window_extension/src/window_extension_stub_impl.cpp b/extension/window_extension/src/window_extension_stub_impl.cpp index 1d8f3c6c8c..809d18c482 100644 --- a/extension/window_extension/src/window_extension_stub_impl.cpp +++ b/extension/window_extension/src/window_extension_stub_impl.cpp @@ -50,8 +50,7 @@ sptr WindowExtensionStubImpl::CreateWindow( option->SetParentId(parentWindowId); option->SetWindowName(windowName_); option->SetWindowSessionType(WindowSessionType::EXTENSION_SESSION); - if (Rosen::SceneBoardJudgement::IsWindowSessionEnabled() - || Rosen::SceneBoardJudgement::IsSceneBoardEnabled()) { + if (Rosen::SceneBoardJudgement::IsSceneBoardEnabled()) { WLOGI("Window::Create with session."); window_ = Window::Create(option, context, iSession); } else { diff --git a/window_scene/interfaces/innerkits/include/scene_board_judgement.h b/window_scene/interfaces/innerkits/include/scene_board_judgement.h index 563b0639bb..d99fc0e274 100644 --- a/window_scene/interfaces/innerkits/include/scene_board_judgement.h +++ b/window_scene/interfaces/innerkits/include/scene_board_judgement.h @@ -25,9 +25,6 @@ public: // Judge whether SceneBoard is enabled. static bool IsSceneBoardEnabled(); - // Judge whether WindowSession is enabled. - static bool IsWindowSessionEnabled(); - private: // Dealing with Windows type end of line "\r\n". static std::ifstream& SafeGetLine(std::ifstream& configFile, std::string& line); diff --git a/window_scene/interfaces/innerkits/src/scene_board_judgement.cpp b/window_scene/interfaces/innerkits/src/scene_board_judgement.cpp index 2cc0ce75c5..0a2c8b53ae 100644 --- a/window_scene/interfaces/innerkits/src/scene_board_judgement.cpp +++ b/window_scene/interfaces/innerkits/src/scene_board_judgement.cpp @@ -28,17 +28,6 @@ bool SceneBoardJudgement::IsSceneBoardEnabled() return isSceneBoardEnabled; } -bool SceneBoardJudgement::IsWindowSessionEnabled() -{ - static bool isWindowSessionEnabled = false; - static bool windowSessionInitialized = false; - if (!windowSessionInitialized) { - InitWithConfigFile("/etc/windowsession.config", isWindowSessionEnabled); - windowSessionInitialized = true; - } - return isWindowSessionEnabled; -} - std::ifstream& SceneBoardJudgement::SafeGetLine(std::ifstream& configFile, std::string& line) { std::getline(configFile, line); diff --git a/wm/test/unittest/window_test.cpp b/wm/test/unittest/window_test.cpp index a7ccd15772..823db39ba8 100644 --- a/wm/test/unittest/window_test.cpp +++ b/wm/test/unittest/window_test.cpp @@ -2002,16 +2002,6 @@ HWTEST_F(WindowTest, IDispatchInputEventListener, Function | SmallTest | Level3) ASSERT_EQ(true, ret); ASSERT_EQ(WMError::WM_OK, window->Destroy()); } - -/** - * @tc.name: IsWindowSessionEnabled - * @tc.desc: IsWindowSessionEnabled fun - * @tc.type: FUNC - */ -HWTEST_F(WindowTest, IsWindowSessionEnabled, Function | SmallTest | Level3) -{ - ASSERT_EQ(false, Rosen::SceneBoardJudgement::IsWindowSessionEnabled()); -} } } // namespace Rosen } // namespace OHOS