openharmony/window_window_manager
1
0
Fork 0
mirror of https://gitee.com/openharmony/window_window_manager synced 2025-03-04 21:57:43 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

delete window scene config

Browse Source 
Signed-off-by: hukai86 <mail.hk@163.com>
This commit is contained in:
hukai86 2023-07-26 20:43:10 +08:00
parent a65144cee6
commit 797f130d8a
4 changed files with 1 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
extension/window_extension/src/window_extension_stub_impl.cpp
View File

@ -50,8 +50,7 @@ sptr<Window> 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 {

3
window_scene/interfaces/innerkits/include/scene_board_judgement.h
View File

@ -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);

11
window_scene/interfaces/innerkits/src/scene_board_judgement.cpp
View File

@ -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);

10
wm/test/unittest/window_test.cpp
View File

@ -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