diff --git a/dm/src/screen_manager.cpp b/dm/src/screen_manager.cpp index 1e7bda2487775bb792f1dfbeeaa7cf287520debd..a5e394d1aa339a668a77cfb5fc5dc30fcafd048a 100644 --- a/dm/src/screen_manager.cpp +++ b/dm/src/screen_manager.cpp @@ -159,7 +159,7 @@ private: { // check for invalid scene if (pImpl_->virtualScreenGroupListeners_.size() <= 0) { - WLOGFW("no virtual screnn group listeners"); + WLOGFW("no virtual screen group listeners"); return; } if (screenInfo->GetType() != ScreenType::VIRTUAL) { diff --git a/interfaces/innerkits/dm/dm_common.h b/interfaces/innerkits/dm/dm_common.h index aa986ba41032c67185892d4ec628bfa6a0fa3350..f841d3bb217c50437664aa61efeb22df71ca140b 100644 --- a/interfaces/innerkits/dm/dm_common.h +++ b/interfaces/innerkits/dm/dm_common.h @@ -216,7 +216,7 @@ enum class ScreenGroupChangeEvent : uint32_t { }; /** - * @brief Enumerates refreshrate modes. + * @brief Enumerates refresh rate modes. */ enum class RefreshRateMode : int32_t { SMART = -1, @@ -226,7 +226,7 @@ enum class RefreshRateMode : int32_t { }; /** - * @brief Enumerates refreshrates. + * @brief Enumerates refresh rates. */ enum class RefreshRate : uint32_t { NORMAL = 60, diff --git a/interfaces/innerkits/dm/screen.h b/interfaces/innerkits/dm/screen.h index a2cae2a878fc580072528ee4b4774eccff5f4367..5d44ebf71606de55a8277793b20dd14e61283959 100644 --- a/interfaces/innerkits/dm/screen.h +++ b/interfaces/innerkits/dm/screen.h @@ -238,7 +238,7 @@ public: DMError GetPixelFormat(GraphicPixelFormat& pixelFormat) const; /** - * @brief Set the color gamut of the screen. + * @brief Set the pixel format of the screen. * * @return DM_OK means set success, others means set failed. */ diff --git a/window_scene/session/screen/src/screen_session.cpp b/window_scene/session/screen/src/screen_session.cpp index a06c08d2f02f1507c6ed77fcbdcfb3216c6e4b3c..6d139af36c2132585c89086881d40f906f33deac 100644 --- a/window_scene/session/screen/src/screen_session.cpp +++ b/window_scene/session/screen/src/screen_session.cpp @@ -847,7 +847,7 @@ void ScreenSession::InitRSDisplayNode(RSDisplayNodeConfig& config, Point& startP if (displayNode_ != nullptr) { displayNode_->SetDisplayNodeMirrorConfig(config); if (screenId_ == 0 && isFold_) { - WLOGFI("Return InitRSDisplayNode flodScreen0"); + WLOGFI("Return InitRSDisplayNode foldScreen0"); return; } } else { @@ -874,7 +874,8 @@ void ScreenSession::InitRSDisplayNode(RSDisplayNodeConfig& config, Point& startP WLOGFI("virtualScreen SetSecurityDisplay success"); } // If setDisplayOffset is not valid for SetFrame/SetBounds - WLOGFI("InitRSDisplayNode screnId:%{public}" PRIu64" width:%{public}u height:%{public}u", screenId_, width, height); + WLOGFI("InitRSDisplayNode screenId:%{public}" PRIu64" width:%{public}u height:%{public}u", + screenId_, width, height); displayNode_->SetFrame(0, 0, width, height); displayNode_->SetBounds(0, 0, width, height); auto transactionProxy = RSTransactionProxy::GetInstance(); diff --git a/window_scene/session_manager/src/screen_session_manager.cpp b/window_scene/session_manager/src/screen_session_manager.cpp index e88b5c1c98a19120e5f03711ad32fc720729a69c..d423b2f99669f3c39c23092b83cc45f7d7823e76 100644 --- a/window_scene/session_manager/src/screen_session_manager.cpp +++ b/window_scene/session_manager/src/screen_session_manager.cpp @@ -69,6 +69,7 @@ const ScreenId SCREEN_ID_MAIN = 5; constexpr int32_t INVALID_UID = -1; constexpr int32_t INVALID_USERID = -1; constexpr int32_t BASE_USER_RANGE = 200000; +static bool g_foldScreenFlag = system::GetParameter("const.window.foldscreen.type", "") != ""; } // namespace // based on the bundle_util @@ -98,8 +99,7 @@ ScreenSessionManager::ScreenSessionManager() sessionDisplayPowerController_ = new SessionDisplayPowerController(mutex_, std::bind(&ScreenSessionManager::NotifyDisplayStateChange, this, std::placeholders::_1, std::placeholders::_2, std::placeholders::_3, std::placeholders::_4)); - bool foldScreenFlag = system::GetParameter("const.window.foldscreen.type", "") != ""; - if (foldScreenFlag) { + if (g_foldScreenFlag) { foldScreenController_ = new (std::nothrow) FoldScreenController(displayInfoMutex_, screenPowerTaskScheduler_); foldScreenController_->SetOnBootAnimation(true); rsInterface_.SetScreenCorrection(SCREEN_ID_FULL, ScreenRotation::ROTATION_270); @@ -174,15 +174,15 @@ void ScreenSessionManager::Init() void ScreenSessionManager::OnStart() { - WLOGFI("begin"); + WLOGFI("DMS SA OnStart"); Init(); sptr dms(this); dms->IncStrongRef(nullptr); if (!Publish(dms)) { - WLOGFE("Publish failed"); + WLOGFE("Publish DMS failed"); return; } - WLOGFI("end"); + WLOGFI("DMS SA OnStart end"); } DMError ScreenSessionManager::RegisterDisplayManagerAgent( @@ -237,7 +237,7 @@ void ScreenSessionManager::ConfigureScreenScene() auto stringConfig = ScreenSceneConfig::GetStringConfig(); if (numbersConfig.count("dpi") != 0) { uint32_t densityDpi = static_cast(numbersConfig["dpi"][0]); - WLOGFD("densityDpi = %u", densityDpi); + WLOGFI("densityDpi = %u", densityDpi); if (densityDpi >= DOT_PER_INCH_MINIMUM_VALUE && densityDpi <= DOT_PER_INCH_MAXIMUM_VALUE) { isDensityDpiLoad_ = true; defaultDpi = densityDpi; @@ -419,7 +419,7 @@ void ScreenSessionManager::OnHgmRefreshRateModeChange(int32_t refreshRateMode) } else { WLOGFE("Get default screen session failed."); } - return ; + return; } sptr ScreenSessionManager::GetScreenSession(ScreenId screenId) const @@ -2920,6 +2920,9 @@ ScreenProperty ScreenSessionManager::GetPhyScreenProperty(ScreenId screenId) void ScreenSessionManager::SetFoldDisplayMode(const FoldDisplayMode displayMode) { + if (!g_foldScreenFlag) { + return; + } if (foldScreenController_ == nullptr) { WLOGFI("SetFoldDisplayMode foldScreenController_ is null"); return; @@ -2933,6 +2936,9 @@ void ScreenSessionManager::SetFoldDisplayMode(const FoldDisplayMode displayMode) void ScreenSessionManager::SetFoldStatusLocked(bool locked) { + if (!g_foldScreenFlag) { + return; + } if (foldScreenController_ == nullptr) { WLOGFI("SetFoldStatusLocked foldScreenController_ is null"); return; @@ -2946,6 +2952,9 @@ void ScreenSessionManager::SetFoldStatusLocked(bool locked) FoldDisplayMode ScreenSessionManager::GetFoldDisplayMode() { + if (!g_foldScreenFlag) { + return FoldDisplayMode::UNKNOWN; + } if (foldScreenController_ == nullptr) { WLOGFI("GetFoldDisplayMode foldScreenController_ is null"); return FoldDisplayMode::UNKNOWN; @@ -2955,6 +2964,9 @@ FoldDisplayMode ScreenSessionManager::GetFoldDisplayMode() bool ScreenSessionManager::IsFoldable() { + if (!g_foldScreenFlag) { + return false; + } if (foldScreenController_ == nullptr) { WLOGFI("foldScreenController_ is null"); return false; @@ -2969,6 +2981,9 @@ bool ScreenSessionManager::IsMultiScreenCollaboration() FoldStatus ScreenSessionManager::GetFoldStatus() { + if (!g_foldScreenFlag) { + return FoldStatus::UNKNOWN; + } if (foldScreenController_ == nullptr) { WLOGFI("foldScreenController_ is null"); return FoldStatus::UNKNOWN; @@ -2978,6 +2993,9 @@ FoldStatus ScreenSessionManager::GetFoldStatus() sptr ScreenSessionManager::GetCurrentFoldCreaseRegion() { + if (!g_foldScreenFlag) { + return nullptr; + } if (foldScreenController_ == nullptr) { WLOGFI("foldScreenController_ is null"); return nullptr; diff --git a/window_scene/session_manager/src/zidl/screen_session_manager_proxy.cpp b/window_scene/session_manager/src/zidl/screen_session_manager_proxy.cpp index cc2e33ded4cc12e27e0016e3bd97fda300fc2c1a..0d5711ead9e732e1d0a54e11ffaafb1ceb93b092 100644 --- a/window_scene/session_manager/src/zidl/screen_session_manager_proxy.cpp +++ b/window_scene/session_manager/src/zidl/screen_session_manager_proxy.cpp @@ -2072,7 +2072,7 @@ void ScreenSessionManagerProxy::UpdateAvailableArea(ScreenId screenId, DMRect ar MessageParcel data; if (!data.WriteInterfaceToken(GetDescriptor())) { WLOGFE("WriteInterfaceToken failed"); - return ; + return; } if (!data.WriteUint64(screenId)) { WLOGFE("Write screenId failed");