diff --git a/extension/window_extension/include/window_extension_context.h b/extension/window_extension/include/window_extension_context.h index 81ce5795e6..86e87a536d 100644 --- a/extension/window_extension/include/window_extension_context.h +++ b/extension/window_extension/include/window_extension_context.h @@ -39,7 +39,7 @@ public: * * @return errCode WM_OK on success, others on failure. */ - WMError StartAbility(const AAFwk::Want &want, const AAFwk::StartOptions &startOptions) const; + WMError StartAbility(const AAFwk::Want& want, const AAFwk::StartOptions& startOptions) const; static const size_t CONTEXT_TYPE_ID; private: diff --git a/extension/window_extension/src/js_window_extension.cpp b/extension/window_extension/src/js_window_extension.cpp index 14d94590c6..139eaaa520 100644 --- a/extension/window_extension/src/js_window_extension.cpp +++ b/extension/window_extension/src/js_window_extension.cpp @@ -51,7 +51,7 @@ public: } }; -napi_value AttachWindowExtensionContext(napi_env env, void *value, void *) +napi_value AttachWindowExtensionContext(napi_env env, void* value, void *) { WLOGI("AttachWindowExtensionContext"); if (value == nullptr) { @@ -82,7 +82,7 @@ napi_value AttachWindowExtensionContext(napi_env env, void *value, void *) return nullptr; } napi_wrap(env, contextObj, workContext, - [](napi_env, void *data, void *) { + [](napi_env, void* data, void *) { WLOGI("Finalizer for weak_ptr service extension context is called"); delete static_cast *>(data); }, nullptr, nullptr); @@ -174,7 +174,7 @@ void JsWindowExtension::BindContext(napi_env env, napi_value obj) napi_set_named_property(env, obj, "context", contextObj); napi_wrap(env, contextObj, workContext, - [](napi_env, void *data, void *) { + [](napi_env, void* data, void *) { WLOGI("Finalizer for weak_ptr extension context is called"); delete static_cast*>(data); }, nullptr, nullptr); diff --git a/extension/window_extension/src/window_extension_context.cpp b/extension/window_extension/src/window_extension_context.cpp index b2a3409786..4bacf24876 100644 --- a/extension/window_extension/src/window_extension_context.cpp +++ b/extension/window_extension/src/window_extension_context.cpp @@ -29,7 +29,7 @@ namespace { const size_t WindowExtensionContext::CONTEXT_TYPE_ID(std::hash {} ("WindowExtensionContext")); int WindowExtensionContext::ILLEGAL_REQUEST_CODE(-1); -WMError WindowExtensionContext::StartAbility(const AAFwk::Want &want, const AAFwk::StartOptions &startOptions) const +WMError WindowExtensionContext::StartAbility(const AAFwk::Want& want, const AAFwk::StartOptions& startOptions) const { WLOGFD("Start ability begin, ability:%{public}s.", want.GetElement().GetAbilityName().c_str()); ErrCode err = AAFwk::AbilityManagerClient::GetInstance()->StartAbility(want, startOptions, token_, diff --git a/interfaces/innerkits/wm/window_manager.h b/interfaces/innerkits/wm/window_manager.h index d720842741..0154d9398b 100644 --- a/interfaces/innerkits/wm/window_manager.h +++ b/interfaces/innerkits/wm/window_manager.h @@ -639,7 +639,7 @@ public: * @param infos session infos * @return WM_OK means set success, others means set failed. */ - WMError DumpSessionAll(std::vector &infos); + WMError DumpSessionAll(std::vector& infos); /** * @brief Dump session info with id @@ -647,7 +647,7 @@ public: * @param infos session infos * @return WM_OK means set success, others means set failed. */ - WMError DumpSessionWithId(int32_t persistentId, std::vector &infos); + WMError DumpSessionWithId(int32_t persistentId, std::vector& infos); /** * @brief Get uiContent remote object diff --git a/interfaces/innerkits/wm/wm_common.h b/interfaces/innerkits/wm/wm_common.h index 496e25e3d0..6f53398bbc 100644 --- a/interfaces/innerkits/wm/wm_common.h +++ b/interfaces/innerkits/wm/wm_common.h @@ -446,7 +446,7 @@ struct PointInfo { * @brief topN main window info. */ struct MainWindowInfo : public Parcelable { - virtual bool Marshalling(Parcel &parcel) const override + virtual bool Marshalling(Parcel& parcel) const override { if (!parcel.WriteInt32(pid_)) { return false; diff --git a/interfaces/kits/napi/embeddable_window_stage/embeddable_window_stage_module.cpp b/interfaces/kits/napi/embeddable_window_stage/embeddable_window_stage_module.cpp index 21945718b6..2fa056186d 100644 --- a/interfaces/kits/napi/embeddable_window_stage/embeddable_window_stage_module.cpp +++ b/interfaces/kits/napi/embeddable_window_stage/embeddable_window_stage_module.cpp @@ -31,7 +31,7 @@ extern "C" __attribute__((constructor)) void NAPI_application_embeddablewindowst } extern "C" __attribute__((visibility("default"))) -void NAPI_application_embeddablewindowstage_GetJSCode(const char **buf, int *bufLen) +void NAPI_application_embeddablewindowstage_GetJSCode(const char** buf, int* bufLen) { if (buf != nullptr) { *buf = _binary_embeddable_window_stage_js_start; @@ -44,7 +44,7 @@ void NAPI_application_embeddablewindowstage_GetJSCode(const char **buf, int *buf // embeddable_window_stage JS register extern "C" __attribute__((visibility("default"))) -void NAPI_application_embeddablewindowstage_GetABCCode(const char **buf, int *buflen) +void NAPI_application_embeddablewindowstage_GetABCCode(const char** buf, int* buflen) { if (buf != nullptr) { *buf = _binary_embeddable_window_stage_abc_start; diff --git a/interfaces/kits/napi/extension_window/extension_window_module.cpp b/interfaces/kits/napi/extension_window/extension_window_module.cpp index 35faa704c7..7d60834eb3 100644 --- a/interfaces/kits/napi/extension_window/extension_window_module.cpp +++ b/interfaces/kits/napi/extension_window/extension_window_module.cpp @@ -31,7 +31,7 @@ extern "C" __attribute__((constructor)) void NAPI_application_extensionWindow_Au } extern "C" __attribute__((visibility("default"))) -void NAPI_application_extensionWindow_GetJSCode(const char **buf, int *bufLen) +void NAPI_application_extensionWindow_GetJSCode(const char** buf, int* bufLen) { if (buf != nullptr) { *buf = _binary_extension_window_js_start; @@ -44,7 +44,7 @@ void NAPI_application_extensionWindow_GetJSCode(const char **buf, int *bufLen) // extension_window JS register extern "C" __attribute__((visibility("default"))) -void NAPI_application_extensionWindow_GetABCCode(const char **buf, int *buflen) +void NAPI_application_extensionWindow_GetABCCode(const char** buf, int* buflen) { if (buf != nullptr) { *buf = _binary_extension_window_abc_start; diff --git a/interfaces/kits/napi/extension_window/js_extension_window_listener.cpp b/interfaces/kits/napi/extension_window/js_extension_window_listener.cpp index 015167fd14..7ede0ce022 100644 --- a/interfaces/kits/napi/extension_window/js_extension_window_listener.cpp +++ b/interfaces/kits/napi/extension_window/js_extension_window_listener.cpp @@ -125,7 +125,7 @@ void JsExtensionWindowListener::OnAvoidAreaChanged(const AvoidArea avoidArea, Av TLOGI(WmsLogTag::WMS_UIEXT, "[NAPI]OnAvoidAreaChanged"); // js callback should run in js thread std::unique_ptr complete = std::make_unique ( - [self = weakRef_, avoidArea, type, eng = env_] (napi_env env, NapiAsyncTask &task, int32_t status) { + [self = weakRef_, avoidArea, type, eng = env_] (napi_env env, NapiAsyncTask& task, int32_t status) { auto thisListener = self.promote(); if (thisListener == nullptr || eng == nullptr) { TLOGE(WmsLogTag::WMS_UIEXT, "[NAPI]this listener or eng is nullptr"); diff --git a/interfaces/kits/napi/picture_in_picture_napi/js_pip_controller.cpp b/interfaces/kits/napi/picture_in_picture_napi/js_pip_controller.cpp index d27a9765c6..eacc60a12b 100644 --- a/interfaces/kits/napi/picture_in_picture_napi/js_pip_controller.cpp +++ b/interfaces/kits/napi/picture_in_picture_napi/js_pip_controller.cpp @@ -36,7 +36,7 @@ namespace { const std::string CONTROL_EVENT_CB = "controlEvent"; } -void BindFunctions(napi_env env, napi_value object, const char *moduleName) +void BindFunctions(napi_env env, napi_value object, const char* moduleName) { BindNativeFunction(env, object, "startPiP", moduleName, JsPipController::StartPictureInPicture); BindNativeFunction(env, object, "stopPiP", moduleName, JsPipController::StopPictureInPicture); diff --git a/interfaces/kits/napi/window_extension_ability/window_extension_ability_module.cpp b/interfaces/kits/napi/window_extension_ability/window_extension_ability_module.cpp index 7ae50a4ab4..5ae7e9265e 100644 --- a/interfaces/kits/napi/window_extension_ability/window_extension_ability_module.cpp +++ b/interfaces/kits/napi/window_extension_ability/window_extension_ability_module.cpp @@ -32,7 +32,7 @@ void NAPI_application_WindowExtensionAbility_AutoRegister() } extern "C" __attribute__((visibility("default"))) -void NAPI_application_WindowExtensionAbility_GetJSCode(const char **buf, int *bufLen) +void NAPI_application_WindowExtensionAbility_GetJSCode(const char** buf, int* bufLen) { if (buf != nullptr) { *buf = _binary_window_extension_ability_js_start; @@ -44,7 +44,7 @@ void NAPI_application_WindowExtensionAbility_GetJSCode(const char **buf, int *bu } extern "C" __attribute__((visibility("default"))) -void NAPI_application_WindowExtensionAbility_GetABCCode(const char **buf, int *buflen) +void NAPI_application_WindowExtensionAbility_GetABCCode(const char** buf, int* buflen) { if (buf != nullptr) { *buf = _binary_window_extension_ability_abc_start; diff --git a/interfaces/kits/napi/window_extension_context/window_extension_context_module.cpp b/interfaces/kits/napi/window_extension_context/window_extension_context_module.cpp index a25a384bfd..5eb2fd6e6c 100644 --- a/interfaces/kits/napi/window_extension_context/window_extension_context_module.cpp +++ b/interfaces/kits/napi/window_extension_context/window_extension_context_module.cpp @@ -31,7 +31,7 @@ extern "C" __attribute__((constructor)) void NAPI_application_WindowExtensionCon } extern "C" __attribute__((visibility("default"))) void NAPI_application_WindowExtensionContext_GetJSCode( - const char **buf, int *bufLen) + const char** buf, int* bufLen) { if (buf != nullptr) { *buf = _binary_window_extension_context_js_start; @@ -44,7 +44,7 @@ extern "C" __attribute__((visibility("default"))) void NAPI_application_WindowEx // window extension context JS register extern "C" __attribute__((visibility("default"))) void NAPI_application_WindowExtensionContext_GetABCCode( - const char **buf, int *buflen) + const char** buf, int* buflen) { if (buf != nullptr) { *buf = _binary_window_extension_context_abc_start; diff --git a/interfaces/kits/napi/window_runtime/window_napi/js_window.cpp b/interfaces/kits/napi/window_runtime/window_napi/js_window.cpp index 61b900bb2e..4a203e902e 100644 --- a/interfaces/kits/napi/window_runtime/window_napi/js_window.cpp +++ b/interfaces/kits/napi/window_runtime/window_napi/js_window.cpp @@ -2683,7 +2683,7 @@ napi_value JsWindow::OnDisableLandscapeMultiWindow(napi_env env, napi_callback_i wptr weakToken(windowToken_); NapiAsyncTask::CompleteCallback complete = - [weakToken, err](napi_env env, NapiAsyncTask &task, int32_t status) mutable { + [weakToken, err](napi_env env, NapiAsyncTask& task, int32_t status) mutable { auto weakWindow = weakToken.promote(); err = (weakWindow == nullptr) ? WmErrorCode::WM_ERROR_STATE_ABNORMALLY : err; if (err != WmErrorCode::WM_OK) { @@ -4120,7 +4120,7 @@ napi_value JsWindow::OnSetSingleFrameComposerEnabled(napi_env env, napi_callback return result; } -void GetSubWindowId(napi_env env, napi_value nativeVal, WmErrorCode &errCode, int32_t &subWindowId) +void GetSubWindowId(napi_env env, napi_value nativeVal, WmErrorCode& errCode, int32_t& subWindowId) { if (nativeVal == nullptr) { WLOGFE("Failed to get subWindowId"); @@ -6286,7 +6286,7 @@ napi_value JsWindow::OnStartMoving(napi_env env, napi_callback_info info) return result; } -void BindFunctions(napi_env env, napi_value object, const char *moduleName) +void BindFunctions(napi_env env, napi_value object, const char* moduleName) { BindNativeFunction(env, object, "startMoving", moduleName, JsWindow::StartMoving); BindNativeFunction(env, object, "show", moduleName, JsWindow::Show); diff --git a/interfaces/kits/napi/window_runtime/window_napi/js_window.h b/interfaces/kits/napi/window_runtime/window_napi/js_window.h index 9e6ec7f2e3..c73ad92f55 100644 --- a/interfaces/kits/napi/window_runtime/window_napi/js_window.h +++ b/interfaces/kits/napi/window_runtime/window_napi/js_window.h @@ -33,7 +33,7 @@ namespace OHOS { namespace Rosen { napi_value CreateJsWindowObject(napi_env env, sptr& window); std::shared_ptr FindJsWindowObject(const std::string& windowName); -void BindFunctions(napi_env env, napi_value object, const char *moduleName); +void BindFunctions(napi_env env, napi_value object, const char* moduleName); napi_value NapiGetUndefined(napi_env env); napi_valuetype GetType(napi_env env, napi_value value); bool NapiIsCallable(napi_env env, napi_value value); diff --git a/interfaces/kits/napi/window_runtime/window_napi/js_window_listener.cpp b/interfaces/kits/napi/window_runtime/window_napi/js_window_listener.cpp index 5bf59340f7..77778e0a65 100644 --- a/interfaces/kits/napi/window_runtime/window_napi/js_window_listener.cpp +++ b/interfaces/kits/napi/window_runtime/window_napi/js_window_listener.cpp @@ -118,7 +118,7 @@ void JsWindowListener::OnSystemBarPropertyChange(DisplayId displayId, const Syst // js callback should run in js thread std::unique_ptr complete = std::make_unique ( [self = weakRef_, displayId, tints, eng = env_] (napi_env env, - NapiAsyncTask &task, int32_t status) { + NapiAsyncTask& task, int32_t status) { auto thisListener = self.promote(); if (thisListener == nullptr || eng == nullptr) { @@ -152,7 +152,7 @@ void JsWindowListener::OnAvoidAreaChanged(const AvoidArea avoidArea, AvoidAreaTy // js callback should run in js thread std::unique_ptr complete = std::make_unique ( [self = weakRef_, avoidArea, type, eng = env_] (napi_env env, - NapiAsyncTask &task, int32_t status) { + NapiAsyncTask& task, int32_t status) { auto thisListener = self.promote(); if (thisListener == nullptr || eng == nullptr) { WLOGFE("[NAPI]this listener or eng is nullptr"); @@ -270,7 +270,7 @@ void JsWindowListener::OnSizeChange(const sptr& info, // js callback should run in js thread std::unique_ptr complete = std::make_unique ( [self = weakRef_, info, eng = env_] (napi_env env, - NapiAsyncTask &task, int32_t status) { + NapiAsyncTask& task, int32_t status) { auto thisListener = self.promote(); if (thisListener == nullptr || eng == nullptr) { WLOGFE("[NAPI]this listener or eng is nullptr"); @@ -291,7 +291,7 @@ void JsWindowListener::OnTouchOutside() const { WLOGI("CALLED"); std::unique_ptr complete = std::make_unique ( - [self = weakRef_] (napi_env env, NapiAsyncTask &task, int32_t status) { + [self = weakRef_] (napi_env env, NapiAsyncTask& task, int32_t status) { auto thisListener = self.promote(); if (thisListener == nullptr) { WLOGFE("[NAPI]this listener is nullptr"); @@ -311,7 +311,7 @@ void JsWindowListener::OnScreenshot() { WLOGI("CALLED"); std::unique_ptr complete = std::make_unique ( - [self = wptr(this)] (napi_env env, NapiAsyncTask &task, int32_t status) { + [self = wptr(this)] (napi_env env, NapiAsyncTask& task, int32_t status) { auto thisListener = self.promote(); if (thisListener == nullptr) { WLOGFE("[NAPI]this listener is nullptr"); @@ -330,7 +330,7 @@ void JsWindowListener::OnScreenshot() void JsWindowListener::OnDialogTargetTouch() const { std::unique_ptr complete = std::make_unique ( - [self = weakRef_] (napi_env env, NapiAsyncTask &task, int32_t status) { + [self = weakRef_] (napi_env env, NapiAsyncTask& task, int32_t status) { auto thisListener = self.promote(); if (thisListener == nullptr) { WLOGFE("[NAPI]this listener is nullptr"); @@ -349,7 +349,7 @@ void JsWindowListener::OnDialogTargetTouch() const void JsWindowListener::OnDialogDeathRecipient() const { std::unique_ptr complete = std::make_unique ( - [self = weakRef_] (napi_env env, NapiAsyncTask &task, int32_t status) { + [self = weakRef_] (napi_env env, NapiAsyncTask& task, int32_t status) { auto thisListener = self.promote(); if (thisListener == nullptr) { WLOGFE("[NAPI]this listener is nullptr"); @@ -368,7 +368,7 @@ void JsWindowListener::OnDialogDeathRecipient() const void JsWindowListener::OnGestureNavigationEnabledUpdate(bool enable) { std::unique_ptr complete = std::make_unique ( - [self = weakRef_, enable, eng = env_] (napi_env env, NapiAsyncTask &task, int32_t status) { + [self = weakRef_, enable, eng = env_] (napi_env env, NapiAsyncTask& task, int32_t status) { auto thisListener = self.promote(); if (thisListener == nullptr || eng == nullptr) { WLOGFE("[NAPI]this listener or eng is nullptr"); @@ -388,7 +388,7 @@ void JsWindowListener::OnGestureNavigationEnabledUpdate(bool enable) void JsWindowListener::OnWaterMarkFlagUpdate(bool showWaterMark) { std::unique_ptr complete = std::make_unique ( - [self = weakRef_, showWaterMark, eng = env_] (napi_env env, NapiAsyncTask &task, int32_t status) { + [self = weakRef_, showWaterMark, eng = env_] (napi_env env, NapiAsyncTask& task, int32_t status) { auto thisListener = self.promote(); if (thisListener == nullptr || eng == nullptr) { WLOGFE("[NAPI]this listener or eng is nullptr"); @@ -418,7 +418,7 @@ int64_t JsWindowListener::GetTimeout() const void JsWindowListener::OnWindowNoInteractionCallback() { std::unique_ptr complete = std::make_unique ( - [self = weakRef_] (napi_env env, NapiAsyncTask &task, int32_t status) { + [self = weakRef_] (napi_env env, NapiAsyncTask& task, int32_t status) { auto thisListener = self.promote(); if (thisListener == nullptr) { WLOGFE("[NAPI]this listener is nullptr"); @@ -440,7 +440,7 @@ void JsWindowListener::OnWindowStatusChange(WindowStatus windowstatus) // js callback should run in js thread std::unique_ptr complete = std::make_unique ( [self = weakRef_, windowstatus, eng = env_] (napi_env env, - NapiAsyncTask &task, int32_t status) { + NapiAsyncTask& task, int32_t status) { auto thisListener = self.promote(); if (thisListener == nullptr || eng == nullptr) { WLOGFE("[NAPI]this listener or eng is nullptr"); @@ -463,7 +463,7 @@ void JsWindowListener::OnWindowStatusChange(WindowStatus windowstatus) void JsWindowListener::OnWindowVisibilityChangedCallback(const bool isVisible) { std::unique_ptr complete = std::make_unique( - [self = weakRef_, isVisible, eng = env_] (napi_env env, NapiAsyncTask &task, int32_t status) { + [self = weakRef_, isVisible, eng = env_] (napi_env env, NapiAsyncTask& task, int32_t status) { auto thisListener = self.promote(); if (thisListener == nullptr || eng == nullptr) { WLOGFE("This listener or eng is nullptr"); @@ -485,7 +485,7 @@ void JsWindowListener::OnWindowTitleButtonRectChanged(const TitleButtonRect& tit WLOGFD("[NAPI]OnWindowTitleButtonRectChanged"); std::unique_ptr complete = std::make_unique ( [self = weakRef_, titleButtonRect, eng = env_] (napi_env env, - NapiAsyncTask &task, int32_t status) { + NapiAsyncTask& task, int32_t status) { auto thisListener = self.promote(); if (thisListener == nullptr || eng == nullptr) { WLOGFE("[NAPI]this listener or eng is nullptr"); diff --git a/interfaces/kits/napi/window_runtime/window_stage_napi/js_window_stage.cpp b/interfaces/kits/napi/window_runtime/window_stage_napi/js_window_stage.cpp index fd5fa9c2ba..79e8071f05 100644 --- a/interfaces/kits/napi/window_runtime/window_stage_napi/js_window_stage.cpp +++ b/interfaces/kits/napi/window_runtime/window_stage_napi/js_window_stage.cpp @@ -728,7 +728,7 @@ napi_value CreateJsWindowStage(napi_env env, std::shared_ptr std::unique_ptr jsWindowStage = std::make_unique(windowScene); napi_wrap(env, objValue, jsWindowStage.release(), JsWindowStage::Finalizer, nullptr, nullptr); - const char *moduleName = "JsWindowStage"; + const char* moduleName = "JsWindowStage"; BindNativeFunction(env, objValue, "setUIContent", moduleName, JsWindowStage::SetUIContent); BindNativeFunction(env, diff --git a/interfaces/kits/napi/window_runtime/window_stage_napi/window_stage_module.cpp b/interfaces/kits/napi/window_runtime/window_stage_napi/window_stage_module.cpp index cfc4be9d0b..5ff86ff130 100644 --- a/interfaces/kits/napi/window_runtime/window_stage_napi/window_stage_module.cpp +++ b/interfaces/kits/napi/window_runtime/window_stage_napi/window_stage_module.cpp @@ -31,7 +31,7 @@ extern "C" __attribute__((constructor)) void NAPI_application_WindowStage_AutoRe } extern "C" __attribute__((visibility("default"))) -void NAPI_application_WindowStage_GetJSCode(const char **buf, int *bufLen) +void NAPI_application_WindowStage_GetJSCode(const char** buf, int* bufLen) { if (buf != nullptr) { *buf = _binary_window_stage_js_start; @@ -44,7 +44,7 @@ void NAPI_application_WindowStage_GetJSCode(const char **buf, int *bufLen) // window_stage JS register extern "C" __attribute__((visibility("default"))) -void NAPI_application_WindowStage_GetABCCode(const char **buf, int *buflen) +void NAPI_application_WindowStage_GetABCCode(const char** buf, int* buflen) { if (buf != nullptr) { *buf = _binary_window_stage_abc_start; diff --git a/previewer/mock/js_window_listener.h b/previewer/mock/js_window_listener.h index beb519922a..4fb1363a26 100644 --- a/previewer/mock/js_window_listener.h +++ b/previewer/mock/js_window_listener.h @@ -39,7 +39,7 @@ public: : env_(env), jsCallBack_(callback), weakRef_(wptr(this)) {} ~JsWindowListener(); void OnAvoidAreaChanged(const AvoidArea avoidArea, AvoidAreaType type) override; - void CallJsMethod(const char* methodName, napi_value const *argv = nullptr, size_t argc = 0); + void CallJsMethod(const char* methodName, napi_value const* argv = nullptr, size_t argc = 0); void SetMainEventHandler(); private: diff --git a/setresolution/include/setresolution_utils.h b/setresolution/include/setresolution_utils.h index 1ab0a2d538..57254b9276 100644 --- a/setresolution/include/setresolution_utils.h +++ b/setresolution/include/setresolution_utils.h @@ -33,7 +33,7 @@ public: SetResolutionUtils() = default; ~SetResolutionUtils() = default; - static void PrintUsage(const std::string &cmdLine); + static void PrintUsage(const std::string& cmdLine); static bool ProcessArgs(int argc, char * const argv[], CmdArgments& cmdArgments); }; } diff --git a/setresolution/src/setresolution_utils.cpp b/setresolution/src/setresolution_utils.cpp index 71bf54e8df..0d93e5e62a 100644 --- a/setresolution/src/setresolution_utils.cpp +++ b/setresolution/src/setresolution_utils.cpp @@ -20,13 +20,13 @@ #include namespace OHOS { -void SetResolutionUtils::PrintUsage(const std::string &cmdLine) +void SetResolutionUtils::PrintUsage(const std::string& cmdLine) { std::cout << "usage: " << cmdLine.c_str() << " [-w width] [-h height] [-d dpi] [-m]" << std::endl; } -bool SetResolutionUtils::ProcessArgs(int argc, char * const argv[], CmdArgments &cmdArgments) +bool SetResolutionUtils::ProcessArgs(int argc, char * const argv[], CmdArgments& cmdArgments) { int opt = 0; const struct option longOption[] = { diff --git a/snapshot/include/snapshot_utils.h b/snapshot/include/snapshot_utils.h index f1936fb74f..66ca995bff 100644 --- a/snapshot/include/snapshot_utils.h +++ b/snapshot/include/snapshot_utils.h @@ -49,23 +49,23 @@ public: SnapShotUtils() = default; ~SnapShotUtils() = default; - static void PrintUsage(const std::string &cmdLine); - static bool CheckFileNameValid(const std::string &fileName, std::string fileType = "jpeg"); + static void PrintUsage(const std::string& cmdLine); + static bool CheckFileNameValid(const std::string& fileName, std::string fileType = "jpeg"); static std::string GenerateFileName(std::string fileType, int offset = 0); static bool CheckWidthAndHeightValid(int32_t w, int32_t h); - static bool RGBA8888ToRGB888(const uint8_t* rgba8888Buf, uint8_t *rgb888Buf, int32_t size); - static bool RGB565ToRGB888(const uint8_t* rgb565Buf, uint8_t *rgb888Buf, int32_t size); + static bool RGBA8888ToRGB888(const uint8_t* rgba8888Buf, uint8_t* rgb888Buf, int32_t size); + static bool RGB565ToRGB888(const uint8_t* rgb565Buf, uint8_t* rgb888Buf, int32_t size); static bool WriteRgb888ToJpeg(FILE* file, uint32_t width, uint32_t height, const uint8_t* data); - static bool WriteToJpeg(const std::string &fileName, const WriteToJpegParam ¶m); - static bool WriteToJpeg(int fd, const WriteToJpegParam ¶m); - static bool WriteToJpegWithPixelMap(const std::string &fileName, Media::PixelMap &pixelMap); - static bool WriteToJpegWithPixelMap(int fd, Media::PixelMap &pixelMap); + static bool WriteToJpeg(const std::string& fileName, const WriteToJpegParam& param); + static bool WriteToJpeg(int fd, const WriteToJpegParam& param); + static bool WriteToJpegWithPixelMap(const std::string& fileName, Media::PixelMap& pixelMap); + static bool WriteToJpegWithPixelMap(int fd, Media::PixelMap& pixelMap); static bool ProcessArgs(int argc, char * const argv[], CmdArguments& cmdArgments); static bool CheckWHValid(int32_t param); - static bool CheckParamValid(const WriteToJpegParam ¶m); - static bool SaveSnapShot(const std::string &filename, Media::PixelMap &pixelMap, std::string fileType = "jpeg"); + static bool CheckParamValid(const WriteToJpegParam& param); + static bool SaveSnapShot(const std::string& filename, Media::PixelMap& pixelMap, std::string fileType = "jpeg"); private: - static bool ProcessDisplayId(Rosen::DisplayId &displayId, bool isDisplayIdSet); + static bool ProcessDisplayId(Rosen::DisplayId& displayId, bool isDisplayIdSet); }; } diff --git a/snapshot/src/snapshot_utils.cpp b/snapshot/src/snapshot_utils.cpp index e9a1c72e4b..e4c27b38f5 100644 --- a/snapshot/src/snapshot_utils.cpp +++ b/snapshot/src/snapshot_utils.cpp @@ -80,7 +80,7 @@ const char *DEFAULT_SNAPSHOT_PREFIX = "/snapshot"; const char *VALID_SNAPSHOT_SUFFIX = ".jpeg"; const char *VALID_SNAPSHOT_PNG_SUFFIX = ".png"; -void SnapShotUtils::PrintUsage(const std::string &cmdLine) +void SnapShotUtils::PrintUsage(const std::string& cmdLine) { std::cout << "usage: " << cmdLine.c_str() << " [-i displayId] [-f output_file] [-w width] [-h height] [-t type] [-m]" << std::endl; @@ -108,7 +108,7 @@ std::string SnapShotUtils::GenerateFileName(std::string fileType, int offset) return fileName; } -bool SnapShotUtils::CheckFileNameValid(const std::string &fileName, std::string fileType) +bool SnapShotUtils::CheckFileNameValid(const std::string& fileName, std::string fileType) { std::cout << "fileType: " << fileType << std::endl; size_t fileMinLength = (fileType == "png") ? strlen(VALID_SNAPSHOT_PNG_SUFFIX) : strlen(VALID_SNAPSHOT_SUFFIX); @@ -156,7 +156,7 @@ bool SnapShotUtils::CheckWidthAndHeightValid(int32_t w, int32_t h) return CheckWHValid(w) && CheckWHValid(h); } -bool SnapShotUtils::CheckParamValid(const WriteToJpegParam ¶m) +bool SnapShotUtils::CheckParamValid(const WriteToJpegParam& param) { switch (param.format) { case Media::PixelFormat::RGBA_8888: @@ -188,7 +188,7 @@ bool SnapShotUtils::CheckParamValid(const WriteToJpegParam ¶m) return true; } -bool SnapShotUtils::RGBA8888ToRGB888(const uint8_t* rgba8888Buf, uint8_t *rgb888Buf, int32_t size) +bool SnapShotUtils::RGBA8888ToRGB888(const uint8_t* rgba8888Buf, uint8_t* rgb888Buf, int32_t size) { if (rgba8888Buf == nullptr || rgb888Buf == nullptr || size <= 0) { std::cout << __func__ << ": params are invalid." << std::endl; @@ -203,7 +203,7 @@ bool SnapShotUtils::RGBA8888ToRGB888(const uint8_t* rgba8888Buf, uint8_t *rgb888 return true; } -bool SnapShotUtils::RGB565ToRGB888(const uint8_t* rgb565Buf, uint8_t *rgb888Buf, int32_t size) +bool SnapShotUtils::RGB565ToRGB888(const uint8_t* rgb565Buf, uint8_t* rgb888Buf, int32_t size) { if (rgb565Buf == nullptr || rgb888Buf == nullptr || size <= 0) { std::cout << __func__ << ": params are invalid." << std::endl; @@ -267,7 +267,7 @@ bool SnapShotUtils::WriteRgb888ToJpeg(FILE* file, uint32_t width, uint32_t heigh return true; } -bool SnapShotUtils::WriteToJpeg(const std::string &fileName, const WriteToJpegParam ¶m) +bool SnapShotUtils::WriteToJpeg(const std::string& fileName, const WriteToJpegParam& param) { bool ret = false; if (!CheckFileNameValid(fileName)) { @@ -315,7 +315,7 @@ bool SnapShotUtils::WriteToJpeg(const std::string &fileName, const WriteToJpegPa return ret; } -bool SnapShotUtils::WriteToJpeg(int fd, const WriteToJpegParam ¶m) +bool SnapShotUtils::WriteToJpeg(int fd, const WriteToJpegParam& param) { bool ret = false; if (!CheckParamValid(param)) { @@ -358,7 +358,7 @@ bool SnapShotUtils::WriteToJpeg(int fd, const WriteToJpegParam ¶m) return ret; } -bool SnapShotUtils::SaveSnapShot(const std::string &fileName, Media::PixelMap &pixelMap, std::string fileType) +bool SnapShotUtils::SaveSnapShot(const std::string& fileName, Media::PixelMap& pixelMap, std::string fileType) { OHOS::Media::ImagePacker imagePacker; OHOS::Media::PackOption option; @@ -383,7 +383,7 @@ bool SnapShotUtils::SaveSnapShot(const std::string &fileName, Media::PixelMap &p return true; } -bool SnapShotUtils::WriteToJpegWithPixelMap(const std::string &fileName, Media::PixelMap &pixelMap) +bool SnapShotUtils::WriteToJpegWithPixelMap(const std::string& fileName, Media::PixelMap& pixelMap) { if (pixelMap.GetAllocatorType() == Media::AllocatorType::DMA_ALLOC) { return SaveSnapShot(fileName, pixelMap); @@ -397,7 +397,7 @@ bool SnapShotUtils::WriteToJpegWithPixelMap(const std::string &fileName, Media:: return SnapShotUtils::WriteToJpeg(fileName, param); } -bool SnapShotUtils::WriteToJpegWithPixelMap(int fd, Media::PixelMap &pixelMap) +bool SnapShotUtils::WriteToJpegWithPixelMap(int fd, Media::PixelMap& pixelMap) { WriteToJpegParam param; param.width = static_cast(pixelMap.GetWidth()); @@ -408,7 +408,7 @@ bool SnapShotUtils::WriteToJpegWithPixelMap(int fd, Media::PixelMap &pixelMap) return SnapShotUtils::WriteToJpeg(fd, param); } -bool SnapShotUtils::ProcessDisplayId(Rosen::DisplayId &displayId, bool isDisplayIdSet) +bool SnapShotUtils::ProcessDisplayId(Rosen::DisplayId& displayId, bool isDisplayIdSet) { if (!isDisplayIdSet) { displayId = DisplayManager::GetInstance().GetDefaultDisplayId(); @@ -433,7 +433,7 @@ bool SnapShotUtils::ProcessDisplayId(Rosen::DisplayId &displayId, bool isDisplay return true; } -bool SnapShotUtils::ProcessArgs(int argc, char * const argv[], CmdArguments &cmdArguments) +bool SnapShotUtils::ProcessArgs(int argc, char* const argv[], CmdArguments& cmdArguments) { int opt = 0; const struct option longOption[] = { diff --git a/test/common/mock/iremote_object_mocker.h b/test/common/mock/iremote_object_mocker.h index 8baafb8d8c..81d8c6386b 100644 --- a/test/common/mock/iremote_object_mocker.h +++ b/test/common/mock/iremote_object_mocker.h @@ -35,7 +35,7 @@ public: return 0; } - int SendRequest(uint32_t code, MessageParcel &data, MessageParcel &reply, MessageOption &option) + int SendRequest(uint32_t code, MessageParcel& data, MessageParcel& reply, MessageOption& option) { return 0; } @@ -50,12 +50,12 @@ public: return true; } - bool AddDeathRecipient(const sptr &recipient) + bool AddDeathRecipient(const sptr& recipient) { return true; } - bool RemoveDeathRecipient(const sptr &recipient) + bool RemoveDeathRecipient(const sptr& recipient) { return true; } @@ -65,7 +65,7 @@ public: return nullptr; } - int Dump(int fd, const std::vector &args) + int Dump(int fd, const std::vector& args) { return 0; } @@ -85,7 +85,7 @@ public: return 0; } - int SendRequest(uint32_t code, MessageParcel &data, MessageParcel &reply, MessageOption &option) + int SendRequest(uint32_t code, MessageParcel& data, MessageParcel& reply, MessageOption& option) { return sendRequestResult_; } @@ -100,12 +100,12 @@ public: return true; } - bool AddDeathRecipient(const sptr &recipient) + bool AddDeathRecipient(const sptr& recipient) { return true; } - bool RemoveDeathRecipient(const sptr &recipient) + bool RemoveDeathRecipient(const sptr& recipient) { return true; } @@ -115,7 +115,7 @@ public: return nullptr; } - int Dump(int fd, const std::vector &args) + int Dump(int fd, const std::vector& args) { return 0; } diff --git a/test/common/mock/mock_uicontent.h b/test/common/mock/mock_uicontent.h index dccf6ef926..3b41a68aa1 100644 --- a/test/common/mock/mock_uicontent.h +++ b/test/common/mock/mock_uicontent.h @@ -88,10 +88,10 @@ public: int64_t baseParent, std::list& output)); MOCK_METHOD4( FindFocusedElementInfo, void(int64_t elementId, - int32_t focusType, int64_t baseParent, Accessibility::AccessibilityElementInfo &output)); + int32_t focusType, int64_t baseParent, Accessibility::AccessibilityElementInfo& output)); MOCK_METHOD4( FocusMoveSearch, void(int64_t elementId, int32_t direction, int64_t baseParent, - Accessibility::AccessibilityElementInfo &output)); + Accessibility::AccessibilityElementInfo& output)); MOCK_METHOD1(GetAppPaintSize, void(OHOS::Rosen::Rect& drawableRect)); MOCK_METHOD2(SetContainerModalTitleVisible, void(bool customTitleSettedShow, bool floatingTitleSettedShow)); MOCK_METHOD1(SetContainerModalTitleHeight, void(int height)); diff --git a/test/demo/demo_session_manager.cpp b/test/demo/demo_session_manager.cpp index 3cc3dc9094..a083f13f5e 100644 --- a/test/demo/demo_session_manager.cpp +++ b/test/demo/demo_session_manager.cpp @@ -22,7 +22,7 @@ using namespace OHOS; using namespace OHOS::Rosen; -int main(int argc, char *argv[]) +int main(int argc, char* argv[]) { SessionManager sessionManager; diff --git a/test/demo/demo_system_sub_window.cpp b/test/demo/demo_system_sub_window.cpp index c6075a9422..cce77ed70e 100644 --- a/test/demo/demo_system_sub_window.cpp +++ b/test/demo/demo_system_sub_window.cpp @@ -53,7 +53,7 @@ void OutputWindowInfos(const std::vector>& infos) } } -int main(int argc, char *argv[]) +int main(int argc, char* argv[]) { std::cout << "===========================Start===========================" << std::endl; std::cout << "Wait 20s, The Windows will close itself" << std::endl; diff --git a/test/demo/demo_visible_window_num_listener.cpp b/test/demo/demo_visible_window_num_listener.cpp index a266e8ac4b..3f62619280 100644 --- a/test/demo/demo_visible_window_num_listener.cpp +++ b/test/demo/demo_visible_window_num_listener.cpp @@ -42,7 +42,7 @@ public: using namespace OHOS; using namespace OHOS::Rosen; -int main(int argc, char *argv[]) +int main(int argc, char* argv[]) { std::cout << "===========================Start===========================" << std::endl; diff --git a/test/demo/demo_water_mark_listener.cpp b/test/demo/demo_water_mark_listener.cpp index a6607caf50..2990a4da9f 100644 --- a/test/demo/demo_water_mark_listener.cpp +++ b/test/demo/demo_water_mark_listener.cpp @@ -41,7 +41,7 @@ public: using namespace OHOS; using namespace OHOS::Rosen; -int main(int argc, char *argv[]) +int main(int argc, char* argv[]) { std::cout << "===========================Start===========================" << std::endl; diff --git a/test/fuzztest/window_scene/scenesessionmgrlstubget_fuzzer/scenesessionmgrlstubget_fuzzer.cpp b/test/fuzztest/window_scene/scenesessionmgrlstubget_fuzzer/scenesessionmgrlstubget_fuzzer.cpp index 1d2274e10d..10ae49c0fa 100644 --- a/test/fuzztest/window_scene/scenesessionmgrlstubget_fuzzer/scenesessionmgrlstubget_fuzzer.cpp +++ b/test/fuzztest/window_scene/scenesessionmgrlstubget_fuzzer/scenesessionmgrlstubget_fuzzer.cpp @@ -35,7 +35,7 @@ namespace { constexpr size_t DATA_MIN_SIZE = 2; } -void SceneSessionMgrLsTest(MessageParcel &parcel, MessageParcel &reply, MessageOption &option) +void SceneSessionMgrLsTest(MessageParcel& parcel, MessageParcel& reply, MessageOption& option) { parcel.RewindRead(0); SceneSessionManagerLite::GetInstance().OnRemoteRequest(static_cast(ISceneSessionManagerLite:: diff --git a/test/fuzztest/wms/pip_fuzzer/pip_fuzzer.cpp b/test/fuzztest/wms/pip_fuzzer/pip_fuzzer.cpp index f30eefa79a..ff2effb611 100644 --- a/test/fuzztest/wms/pip_fuzzer/pip_fuzzer.cpp +++ b/test/fuzztest/wms/pip_fuzzer/pip_fuzzer.cpp @@ -31,7 +31,7 @@ namespace { } template -size_t GetObject(T &object, const uint8_t *data, size_t size) +size_t GetObject(T& object, const uint8_t* data, size_t size) { size_t objectSize = sizeof(object); if (objectSize > size) { diff --git a/test/fuzztest/wms/window_fuzzer/window_fuzzer.cpp b/test/fuzztest/wms/window_fuzzer/window_fuzzer.cpp index 3ee84d5255..b59133df5b 100644 --- a/test/fuzztest/wms/window_fuzzer/window_fuzzer.cpp +++ b/test/fuzztest/wms/window_fuzzer/window_fuzzer.cpp @@ -221,7 +221,7 @@ public: }; template -size_t GetObject(T &object, const uint8_t *data, size_t size) +size_t GetObject(T& object, const uint8_t* data, size_t size) { size_t objectSize = sizeof(object); if (objectSize > size) { @@ -231,7 +231,7 @@ size_t GetObject(T &object, const uint8_t *data, size_t size) } /* 调用该接口后, 需要释放内存 */ -char *CopyDataToString(const uint8_t *data, size_t size) +char *CopyDataToString(const uint8_t* data, size_t size) { if (size > DATA_MAX_SIZE) { return nullptr; diff --git a/test/fuzztest/wms/windowagent_fuzzer/window_agent_fuzzer.cpp b/test/fuzztest/wms/windowagent_fuzzer/window_agent_fuzzer.cpp index e884c8e0d9..638a277dfa 100644 --- a/test/fuzztest/wms/windowagent_fuzzer/window_agent_fuzzer.cpp +++ b/test/fuzztest/wms/windowagent_fuzzer/window_agent_fuzzer.cpp @@ -34,7 +34,7 @@ namespace { } template -size_t GetObject(T &object, const uint8_t *data, size_t size) +size_t GetObject(T& object, const uint8_t* data, size_t size) { size_t objectSize = sizeof(object); if (objectSize > size) { diff --git a/test/fuzztest/wms/windowipc_fuzzer/windowipc_fuzzer.cpp b/test/fuzztest/wms/windowipc_fuzzer/windowipc_fuzzer.cpp index 6ed5984eb5..6e0f9a69f4 100644 --- a/test/fuzztest/wms/windowipc_fuzzer/windowipc_fuzzer.cpp +++ b/test/fuzztest/wms/windowipc_fuzzer/windowipc_fuzzer.cpp @@ -28,7 +28,7 @@ namespace { constexpr HiviewDFX::HiLogLabel LABEL = {LOG_CORE, HILOG_DOMAIN_DISPLAY, "DisplayManagerIPC_Fuzzer"}; } template -size_t GetObject(T &object, const uint8_t *data, size_t size) +size_t GetObject(T& object, const uint8_t* data, size_t size) { size_t objectSize = sizeof(object); if (objectSize > size) { diff --git a/test/fuzztest/wms/windowmanager_fuzzer/windowmanager_fuzzer.cpp b/test/fuzztest/wms/windowmanager_fuzzer/windowmanager_fuzzer.cpp index be0299b252..85c287e730 100644 --- a/test/fuzztest/wms/windowmanager_fuzzer/windowmanager_fuzzer.cpp +++ b/test/fuzztest/wms/windowmanager_fuzzer/windowmanager_fuzzer.cpp @@ -28,7 +28,7 @@ namespace { } template -size_t GetObject(T &object, const uint8_t *data, size_t size) +size_t GetObject(T& object, const uint8_t* data, size_t size) { size_t objectSize = sizeof(object); if (objectSize > size) { diff --git a/test/fuzztest/wms/windowscene_fuzzer/windowscene_fuzzer.cpp b/test/fuzztest/wms/windowscene_fuzzer/windowscene_fuzzer.cpp index 3546edde0d..b1e93a33cf 100644 --- a/test/fuzztest/wms/windowscene_fuzzer/windowscene_fuzzer.cpp +++ b/test/fuzztest/wms/windowscene_fuzzer/windowscene_fuzzer.cpp @@ -63,7 +63,7 @@ public: }; template -size_t GetObject(T &object, const uint8_t *data, size_t size) +size_t GetObject(T& object, const uint8_t* data, size_t size) { size_t objectSize = sizeof(object); if (objectSize > size) { @@ -72,7 +72,7 @@ size_t GetObject(T &object, const uint8_t *data, size_t size) return memcpy_s(&object, objectSize, data, objectSize) == EOK ? objectSize : 0; } -size_t InitWindowOption1(WindowOption &windowOption, const uint8_t *data, size_t size) +size_t InitWindowOption1(WindowOption& windowOption, const uint8_t* data, size_t size) { size_t startPos = 0; Rect windowRect; @@ -106,7 +106,7 @@ size_t InitWindowOption1(WindowOption &windowOption, const uint8_t *data, size_t return startPos; } -size_t InitWindowOption2(WindowOption &windowOption, const uint8_t *data, size_t size) +size_t InitWindowOption2(WindowOption& windowOption, const uint8_t* data, size_t size) { size_t startPos = 0; uint32_t flags; @@ -150,7 +150,7 @@ size_t InitWindowOption2(WindowOption &windowOption, const uint8_t *data, size_t return startPos; } -size_t InitWindowOption(WindowOption &windowOption, const uint8_t *data, size_t size) +size_t InitWindowOption(WindowOption& windowOption, const uint8_t* data, size_t size) { size_t startPos = 0; startPos += InitWindowOption1(windowOption, data + startPos, size - startPos); diff --git a/test/fuzztest/wms/windowutilmath_fuzzer/windowutilmath_fuzzer.cpp b/test/fuzztest/wms/windowutilmath_fuzzer/windowutilmath_fuzzer.cpp index 6d79c76a78..846252161e 100644 --- a/test/fuzztest/wms/windowutilmath_fuzzer/windowutilmath_fuzzer.cpp +++ b/test/fuzztest/wms/windowutilmath_fuzzer/windowutilmath_fuzzer.cpp @@ -32,7 +32,7 @@ namespace { } template -size_t GetObject(T &object, const uint8_t *data, size_t size) +size_t GetObject(T& object, const uint8_t* data, size_t size) { size_t objectSize = sizeof(object); if (objectSize > size) { @@ -42,7 +42,7 @@ size_t GetObject(T &object, const uint8_t *data, size_t size) } size_t InitMatrix3(OHOS::Rosen::TransformHelper::Matrix3& mat3, - const uint8_t *data, size_t size, size_t startPos) + const uint8_t* data, size_t size, size_t startPos) { if (data == nullptr || size < DATA_MIN_SIZE) { return 0; @@ -58,7 +58,7 @@ size_t InitMatrix3(OHOS::Rosen::TransformHelper::Matrix3& mat3, } void InitMatrix4(OHOS::Rosen::TransformHelper::Matrix4& mat4, - const uint8_t *data, size_t size, size_t& startPos) + const uint8_t* data, size_t size, size_t& startPos) { if (data == nullptr || size < DATA_MIN_SIZE) { return; @@ -73,7 +73,7 @@ void InitMatrix4(OHOS::Rosen::TransformHelper::Matrix4& mat4, } void InitVector2(OHOS::Rosen::TransformHelper::Vector2& vec2, - const uint8_t *data, size_t size, size_t& startPos) + const uint8_t* data, size_t size, size_t& startPos) { if (data == nullptr || size < DATA_MIN_SIZE) { return; @@ -83,7 +83,7 @@ void InitVector2(OHOS::Rosen::TransformHelper::Vector2& vec2, } void InitVector3(OHOS::Rosen::TransformHelper::Vector3& vec3, - const uint8_t *data, size_t size, size_t& startPos) + const uint8_t* data, size_t size, size_t& startPos) { if (data == nullptr || size < DATA_MIN_SIZE) { return; @@ -93,7 +93,7 @@ void InitVector3(OHOS::Rosen::TransformHelper::Vector3& vec3, startPos += GetObject(vec3.y_, data + startPos, size - startPos); } -void WindowUtilMathFuzzPart1(const uint8_t *data, size_t size) +void WindowUtilMathFuzzPart1(const uint8_t* data, size_t size) { if (data == nullptr || size < DATA_MIN_SIZE) { return; @@ -137,7 +137,7 @@ void WindowUtilMathFuzzPart1(const uint8_t *data, size_t size) OHOS::Rosen::TransformHelper::CreateTranslation(vec3); } -void WindowUtilMathFuzzPart2(const uint8_t *data, size_t size) +void WindowUtilMathFuzzPart2(const uint8_t* data, size_t size) { if (data == nullptr || size < DATA_MIN_SIZE) { return; diff --git a/utils/include/cutout_info.h b/utils/include/cutout_info.h index 5722168b51..2c01c7b645 100644 --- a/utils/include/cutout_info.h +++ b/utils/include/cutout_info.h @@ -52,9 +52,9 @@ public: DEFINE_VAR_FUNC_GET_SET(std::vector, BoundingRects, boundingRects); private: const static uint32_t MAX_CUTOUT_INFO_SIZE = 20; - bool WriteBoundingRectsVector(const std::vector& boundingRects, Parcel &parcel) const; - static bool ReadBoundingRectsVector(std::vector& unmarBoundingRects, Parcel &parcel); - static bool ReadWaterfallDisplayAreaRects(WaterfallDisplayAreaRects& waterfallDisplayAreaRects, Parcel &parcel); + bool WriteBoundingRectsVector(const std::vector& boundingRects, Parcel& parcel) const; + static bool ReadBoundingRectsVector(std::vector& unmarBoundingRects, Parcel& parcel); + static bool ReadWaterfallDisplayAreaRects(WaterfallDisplayAreaRects& waterfallDisplayAreaRects, Parcel& parcel); }; } // namespace OHOS::Rosen #endif // FOUNDATION_DMSERVER_CUTOUT_INFO_H \ No newline at end of file diff --git a/utils/include/focus_change_info.h b/utils/include/focus_change_info.h index 889924e843..d2aa5fd046 100644 --- a/utils/include/focus_change_info.h +++ b/utils/include/focus_change_info.h @@ -61,7 +61,7 @@ public: } } - static FocusChangeInfo* Unmarshalling(Parcel &parcel) + static FocusChangeInfo* Unmarshalling(Parcel& parcel) { auto focusChangeInfo = new FocusChangeInfo(); bool res = parcel.ReadInt32(focusChangeInfo->windowId_) && parcel.ReadUint64(focusChangeInfo->displayId_) && diff --git a/utils/include/marshalling_helper.h b/utils/include/marshalling_helper.h index 6d594e8259..a5fedcc03a 100644 --- a/utils/include/marshalling_helper.h +++ b/utils/include/marshalling_helper.h @@ -23,7 +23,7 @@ class MarshallingHelper : public Parcelable { public: MarshallingHelper() = delete; template - static bool MarshallingVectorParcelableObj(Parcel &parcel, const std::vector>& data) + static bool MarshallingVectorParcelableObj(Parcel& parcel, const std::vector>& data) { if (data.size() > INT_MAX) { return false; @@ -40,7 +40,7 @@ public: } template - static bool UnmarshallingVectorParcelableObj(Parcel &parcel, std::vector>& data) + static bool UnmarshallingVectorParcelableObj(Parcel& parcel, std::vector>& data) { int32_t len = parcel.ReadInt32(); if (len < 0) { @@ -71,7 +71,7 @@ public: } template - static bool MarshallingVectorObj(Parcel &parcel, const std::vector& data, + static bool MarshallingVectorObj(Parcel& parcel, const std::vector& data, std::function func) { if (data.size() > INT_MAX) { @@ -92,7 +92,7 @@ public: } template - static bool UnmarshallingVectorObj(Parcel &parcel, std::vector& data, std::function func) + static bool UnmarshallingVectorObj(Parcel& parcel, std::vector& data, std::function func) { if (func == nullptr) { return false; diff --git a/utils/include/pip_report.h b/utils/include/pip_report.h index ad3fc79b5a..4f8c9c2ef4 100644 --- a/utils/include/pip_report.h +++ b/utils/include/pip_report.h @@ -26,10 +26,10 @@ class PiPReporter { WM_DECLARE_SINGLE_INSTANCE(PiPReporter); public: - void SetCurrentPackageName(const std::string &packageName); - void ReportPiPStartWindow(int32_t source, int32_t templateType, int32_t isSuccess, const std::string &errorReason); - void ReportPiPStopWindow(int32_t source, int32_t templateType, int32_t isSuccess, const std::string &errorReason); - void ReportPiPActionEvent(int32_t templateType, const std::string &actionEvent); + void SetCurrentPackageName(const std::string& packageName); + void ReportPiPStartWindow(int32_t source, int32_t templateType, int32_t isSuccess, const std::string& errorReason); + void ReportPiPStopWindow(int32_t source, int32_t templateType, int32_t isSuccess, const std::string& errorReason); + void ReportPiPActionEvent(int32_t templateType, const std::string& actionEvent); void ReportPiPControlEvent(int32_t templateType, PiPControlType controlType); void ReportPiPRatio(int32_t windowWidth, int32_t windowHeight); void ReportPiPRestore(); diff --git a/utils/include/surface_draw.h b/utils/include/surface_draw.h index 48d78147f4..a6f6b84517 100644 --- a/utils/include/surface_draw.h +++ b/utils/include/surface_draw.h @@ -45,14 +45,14 @@ public: Rect transparentRect); private: - static bool DoDraw(uint8_t *addr, uint32_t width, uint32_t height, const std::string& imagePath); - static bool DoDraw(uint8_t *addr, uint32_t width, uint32_t height, uint32_t color); - static bool DoDraw(uint8_t *addr, uint32_t width, uint32_t height, std::shared_ptr pixelMap); + static bool DoDraw(uint8_t* addr, uint32_t width, uint32_t height, const std::string& imagePath); + static bool DoDraw(uint8_t* addr, uint32_t width, uint32_t height, uint32_t color); + static bool DoDraw(uint8_t* addr, uint32_t width, uint32_t height, std::shared_ptr pixelMap); static sptr GetLayer(std::shared_ptr surfaceNode); static sptr GetSurfaceBuffer(sptr layer, int32_t bufferWidth, int32_t bufferHeight); - static void DrawPixelmap(Drawing::Canvas &canvas, const std::string& imagePath); - static std::unique_ptr DecodeImageToPixelMap(const std::string &imagePath); + static void DrawPixelmap(Drawing::Canvas& canvas, const std::string& imagePath); + static std::unique_ptr DecodeImageToPixelMap(const std::string& imagePath); static bool DoDrawImageRect(sptr buffer, const Rect& rect, std::shared_ptr pixelMap, uint32_t color, bool fillWindow = false); }; diff --git a/utils/include/surface_reader.h b/utils/include/surface_reader.h index a23191ef38..7265d03702 100644 --- a/utils/include/surface_reader.h +++ b/utils/include/surface_reader.h @@ -37,7 +37,7 @@ public: private: class BufferListener : public IBufferConsumerListener { public: - explicit BufferListener(SurfaceReader &surfaceReader): surfaceReader_(surfaceReader) + explicit BufferListener(SurfaceReader& surfaceReader): surfaceReader_(surfaceReader) { } ~BufferListener() noexcept override = default; @@ -52,7 +52,7 @@ private: friend class BufferListener; void OnVsync(); - bool ProcessBuffer(const sptr &buf); + bool ProcessBuffer(const sptr& buf); sptr listener_ = nullptr; sptr csurface_ = nullptr; // cosumer surface diff --git a/utils/src/cutout_info.cpp b/utils/src/cutout_info.cpp index 5d1cda65be..790cf69694 100644 --- a/utils/src/cutout_info.cpp +++ b/utils/src/cutout_info.cpp @@ -22,7 +22,7 @@ CutoutInfo::CutoutInfo(const std::vector& boundingRects, { } -bool CutoutInfo::Marshalling(Parcel &parcel) const +bool CutoutInfo::Marshalling(Parcel& parcel) const { return parcel.WriteInt32(waterfallDisplayAreaRects_.left.posX_) && parcel.WriteInt32(waterfallDisplayAreaRects_.left.posY_) && @@ -43,7 +43,7 @@ bool CutoutInfo::Marshalling(Parcel &parcel) const WriteBoundingRectsVector(boundingRects_, parcel); } -CutoutInfo *CutoutInfo::Unmarshalling(Parcel &parcel) +CutoutInfo *CutoutInfo::Unmarshalling(Parcel& parcel) { WaterfallDisplayAreaRects waterfallDisplayAreaRects; std::vector boundingRects; @@ -53,7 +53,7 @@ CutoutInfo *CutoutInfo::Unmarshalling(Parcel &parcel) return cutoutInfo; } -bool CutoutInfo::WriteBoundingRectsVector(const std::vector& boundingRects, Parcel &parcel) const +bool CutoutInfo::WriteBoundingRectsVector(const std::vector& boundingRects, Parcel& parcel) const { uint32_t size = static_cast(boundingRects.size()); if (!parcel.WriteUint32(size)) { @@ -71,7 +71,7 @@ bool CutoutInfo::WriteBoundingRectsVector(const std::vector& boundingRec return true; } -bool CutoutInfo::ReadBoundingRectsVector(std::vector& unmarBoundingRects, Parcel &parcel) +bool CutoutInfo::ReadBoundingRectsVector(std::vector& unmarBoundingRects, Parcel& parcel) { uint32_t size; if (!parcel.ReadUint32(size)) { @@ -95,7 +95,7 @@ bool CutoutInfo::ReadBoundingRectsVector(std::vector& unmarBoundingRects return true; } -bool CutoutInfo::ReadWaterfallDisplayAreaRects(WaterfallDisplayAreaRects& waterfallDisplayAreaRects, Parcel &parcel) +bool CutoutInfo::ReadWaterfallDisplayAreaRects(WaterfallDisplayAreaRects& waterfallDisplayAreaRects, Parcel& parcel) { if (!(parcel.ReadInt32(waterfallDisplayAreaRects.left.posX_) && parcel.ReadInt32(waterfallDisplayAreaRects.left.posY_) && diff --git a/utils/src/pip_report.cpp b/utils/src/pip_report.cpp index 3fb82f0e08..5073bc115f 100644 --- a/utils/src/pip_report.cpp +++ b/utils/src/pip_report.cpp @@ -57,7 +57,7 @@ constexpr char EVENT_KEY_ACTION_EVENT[] = "ACTION_EVENT"; constexpr char EVENT_KEY_WINDOW_WIDTH[] = "WINDOW_WIDTH"; constexpr char EVENT_KEY_WINDOW_HEIGHT[] = "WINDOW_HEIGHT"; -void PiPReporter::SetCurrentPackageName(const std::string &packageName) +void PiPReporter::SetCurrentPackageName(const std::string& packageName) { std::lock_guard lock(packageNameMutex_); packageName_ = packageName; @@ -113,7 +113,7 @@ void PiPReporter::ReportPiPStopWindow(int32_t source, int32_t templateType, LOG_WHEN_ERROR(ret); } -void PiPReporter::ReportPiPActionEvent(int32_t templateType, const std::string &actionEvent) +void PiPReporter::ReportPiPActionEvent(int32_t templateType, const std::string& actionEvent) { TLOGI(WmsLogTag::WMS_PIP, "Report pip widow action event"); std::string eventName = "CONTROL_PANNEL_ACTION_EVENT"; diff --git a/utils/src/surface_draw.cpp b/utils/src/surface_draw.cpp index c1a7543b5d..48accffba2 100644 --- a/utils/src/surface_draw.cpp +++ b/utils/src/surface_draw.cpp @@ -157,7 +157,7 @@ sptr SurfaceDraw::GetSurfaceBuffer(sptr laye return buffer; } -std::unique_ptr SurfaceDraw::DecodeImageToPixelMap(const std::string &imagePath) +std::unique_ptr SurfaceDraw::DecodeImageToPixelMap(const std::string& imagePath) { OHOS::Media::SourceOptions opts; opts.formatHint = "image/png"; @@ -179,7 +179,7 @@ std::unique_ptr SurfaceDraw::DecodeImageToPixelMap(const return pixelMap; } -void SurfaceDraw::DrawPixelmap(Drawing::Canvas &canvas, const std::string& imagePath) +void SurfaceDraw::DrawPixelmap(Drawing::Canvas& canvas, const std::string& imagePath) { std::unique_ptr pixelmap = DecodeImageToPixelMap(imagePath); if (pixelmap == nullptr) { @@ -195,7 +195,7 @@ void SurfaceDraw::DrawPixelmap(Drawing::Canvas &canvas, const std::string& image RSPixelMapUtil::DrawPixelMap(canvas, *pixelmap, 0, 0); } -bool SurfaceDraw::DoDraw(uint8_t *addr, uint32_t width, uint32_t height, const std::string& imagePath) +bool SurfaceDraw::DoDraw(uint8_t* addr, uint32_t width, uint32_t height, const std::string& imagePath) { Drawing::Bitmap bitmap; Drawing::BitmapFormat format { Drawing::ColorType::COLORTYPE_RGBA_8888, @@ -214,7 +214,7 @@ bool SurfaceDraw::DoDraw(uint8_t *addr, uint32_t width, uint32_t height, const s return true; } -bool SurfaceDraw::DoDraw(uint8_t *addr, uint32_t width, uint32_t height, std::shared_ptr pixelMap) +bool SurfaceDraw::DoDraw(uint8_t* addr, uint32_t width, uint32_t height, std::shared_ptr pixelMap) { Drawing::Bitmap bitmap; Drawing::Canvas canvas; @@ -244,7 +244,7 @@ bool SurfaceDraw::DoDraw(uint8_t *addr, uint32_t width, uint32_t height, std::sh return true; } -bool SurfaceDraw::DoDraw(uint8_t *addr, uint32_t width, uint32_t height, uint32_t color) +bool SurfaceDraw::DoDraw(uint8_t* addr, uint32_t width, uint32_t height, uint32_t color) { Drawing::Bitmap bitmap; Drawing::BitmapFormat format { Drawing::ColorType::COLORTYPE_RGBA_8888, diff --git a/utils/src/surface_reader.cpp b/utils/src/surface_reader.cpp index f78a162f9c..fd5c3caa31 100644 --- a/utils/src/surface_reader.cpp +++ b/utils/src/surface_reader.cpp @@ -107,7 +107,7 @@ void SurfaceReader::SetHandler(sptr handler) handler_ = handler; } -bool SurfaceReader::ProcessBuffer(const sptr &buf) +bool SurfaceReader::ProcessBuffer(const sptr& buf) { if (handler_ == nullptr) { WLOGFE("SurfaceReaderHandler not set"); diff --git a/utils/src/window_drawing_content_info.cpp b/utils/src/window_drawing_content_info.cpp index a922c7cc8d..269b79f44f 100644 --- a/utils/src/window_drawing_content_info.cpp +++ b/utils/src/window_drawing_content_info.cpp @@ -21,14 +21,14 @@ namespace { constexpr HiviewDFX::HiLogLabel LABEL = {LOG_CORE, HILOG_DOMAIN_WINDOW, "WindowDrawingContentInfo"}; } -bool WindowDrawingContentInfo::Marshalling(Parcel &parcel) const +bool WindowDrawingContentInfo::Marshalling(Parcel& parcel) const { return parcel.WriteUint32(windowId_) && parcel.WriteInt32(pid_) && parcel.WriteInt32(uid_) && parcel.WriteUint32(static_cast(drawingContentState_)) && parcel.WriteUint32(static_cast(windowType_)); } -WindowDrawingContentInfo* WindowDrawingContentInfo::Unmarshalling(Parcel &parcel) +WindowDrawingContentInfo* WindowDrawingContentInfo::Unmarshalling(Parcel& parcel) { auto windowDrawingContentInfo = new (std::nothrow) WindowDrawingContentInfo(); if (windowDrawingContentInfo == nullptr) { diff --git a/utils/src/window_visibility_info.cpp b/utils/src/window_visibility_info.cpp index b8a6a9b6c4..3fff740651 100644 --- a/utils/src/window_visibility_info.cpp +++ b/utils/src/window_visibility_info.cpp @@ -21,7 +21,7 @@ namespace { constexpr HiviewDFX::HiLogLabel LABEL = {LOG_CORE, HILOG_DOMAIN_WINDOW, "WindowVisibilityInfo"}; } -bool WindowVisibilityInfo::Marshalling(Parcel &parcel) const +bool WindowVisibilityInfo::Marshalling(Parcel& parcel) const { return parcel.WriteUint32(windowId_) && parcel.WriteInt32(pid_) && parcel.WriteInt32(uid_) && parcel.WriteUint32(static_cast(visibilityState_)) && @@ -31,7 +31,7 @@ bool WindowVisibilityInfo::Marshalling(Parcel &parcel) const parcel.WriteString(bundleName_) && parcel.WriteString(abilityName_); } -WindowVisibilityInfo* WindowVisibilityInfo::Unmarshalling(Parcel &parcel) +WindowVisibilityInfo* WindowVisibilityInfo::Unmarshalling(Parcel& parcel) { auto windowVisibilityInfo = new (std::nothrow) WindowVisibilityInfo(); if (windowVisibilityInfo == nullptr) { diff --git a/window_scene/common/src/session_permission.cpp b/window_scene/common/src/session_permission.cpp index c99f936da5..5dfda9d9cc 100644 --- a/window_scene/common/src/session_permission.cpp +++ b/window_scene/common/src/session_permission.cpp @@ -58,7 +58,7 @@ sptr GetBundleManagerProxy() return bundleManagerServiceProxy; } -bool GetInputMethodBundleName(std::string &name) +bool GetInputMethodBundleName(std::string& name) { auto imc = MiscServices::InputMethodController::GetInstance(); if (!imc) { diff --git a/window_scene/intention_event/framework/anr_handler/include/anr_handler.h b/window_scene/intention_event/framework/anr_handler/include/anr_handler.h index e2576831b4..7816f21402 100644 --- a/window_scene/intention_event/framework/anr_handler/include/anr_handler.h +++ b/window_scene/intention_event/framework/anr_handler/include/anr_handler.h @@ -33,7 +33,7 @@ class ANRHandler { public: DISALLOW_COPY_AND_MOVE(ANRHandler); - void SetSessionStage(int32_t eventId, const wptr &sessionStage); + void SetSessionStage(int32_t eventId, const wptr& sessionStage); void HandleEventConsumed(int32_t eventId, int64_t actionTime); void OnWindowDestroyed(int32_t persistentId); diff --git a/window_scene/intention_event/framework/anr_handler/src/anr_handler.cpp b/window_scene/intention_event/framework/anr_handler/src/anr_handler.cpp index 044e238c3b..920abb2c02 100644 --- a/window_scene/intention_event/framework/anr_handler/src/anr_handler.cpp +++ b/window_scene/intention_event/framework/anr_handler/src/anr_handler.cpp @@ -49,7 +49,7 @@ ANRHandler::ANRHandler() ANRHandler::~ANRHandler() {} -void ANRHandler::SetSessionStage(int32_t eventId, const wptr &sessionStage) +void ANRHandler::SetSessionStage(int32_t eventId, const wptr& sessionStage) { auto task = [this, eventId, sessionStage]() { sptr session = sessionStage.promote(); diff --git a/window_scene/intention_event/service/event_stage/src/event_stage.cpp b/window_scene/intention_event/service/event_stage/src/event_stage.cpp index f953ddc80c..79ed674b13 100644 --- a/window_scene/intention_event/service/event_stage/src/event_stage.cpp +++ b/window_scene/intention_event/service/event_stage/src/event_stage.cpp @@ -78,7 +78,7 @@ std::vector EventStage::DelEvents(int32_t persistentId, int32_t eventId return {}; } auto &events = events_[persistentId]; - auto fistMatchIter = find_if(events.begin(), events.end(), [eventId](const auto &item) { + auto fistMatchIter = find_if(events.begin(), events.end(), [eventId](const auto& item) { return item.eventId > eventId; }); std::vector timerIds; diff --git a/window_scene/intention_event/utils/include/util.h b/window_scene/intention_event/utils/include/util.h index ef402d5347..9d44cbaf1d 100644 --- a/window_scene/intention_event/utils/include/util.h +++ b/window_scene/intention_event/utils/include/util.h @@ -26,7 +26,7 @@ int64_t GetSysClockTime(); int64_t GetMillisTime(); template -bool AddInt(T op1, T op2, T minVal, T maxVal, T &res) +bool AddInt(T op1, T op2, T minVal, T maxVal, T& res) { if (op1 >= 0) { if (op2 > maxVal - op1) { @@ -41,12 +41,12 @@ bool AddInt(T op1, T op2, T minVal, T maxVal, T &res) return true; } -inline bool AddInt32(int32_t op1, int32_t op2, int32_t &res) +inline bool AddInt32(int32_t op1, int32_t op2, int32_t& res) { return AddInt(op1, op2, INT32_MIN, INT32_MAX, res); } -inline bool AddInt64(int64_t op1, int64_t op2, int64_t &res) +inline bool AddInt64(int64_t op1, int64_t op2, int64_t& res) { return AddInt(op1, op2, INT64_MIN, INT64_MAX, res); } diff --git a/window_scene/interfaces/kits/napi/scene_session_manager/js_scene_session.cpp b/window_scene/interfaces/kits/napi/scene_session_manager/js_scene_session.cpp index 200834f6b5..62e38c4700 100644 --- a/window_scene/interfaces/kits/napi/scene_session_manager/js_scene_session.cpp +++ b/window_scene/interfaces/kits/napi/scene_session_manager/js_scene_session.cpp @@ -2309,7 +2309,7 @@ void JsSceneSession::TerminateSessionTotal(const SessionInfo& info, TerminateTyp taskScheduler_->PostMainThreadTask(task, "TerminateSessionTotal:name:" + info.abilityName_); } -void JsSceneSession::UpdateSessionLabel(const std::string &label) +void JsSceneSession::UpdateSessionLabel(const std::string& label) { WLOGFI("[NAPI]run UpdateSessionLabel"); @@ -2359,7 +2359,7 @@ void JsSceneSession::ProcessUpdateSessionIconRegister() WLOGFD("ProcessUpdateSessionIconRegister success"); } -void JsSceneSession::UpdateSessionIcon(const std::string &iconPath) +void JsSceneSession::UpdateSessionIcon(const std::string& iconPath) { WLOGFI("[NAPI]run UpdateSessionIcon"); diff --git a/window_scene/interfaces/kits/napi/scene_session_manager/js_scene_session.h b/window_scene/interfaces/kits/napi/scene_session_manager/js_scene_session.h index 56b6b9ed60..c47bcf366f 100644 --- a/window_scene/interfaces/kits/napi/scene_session_manager/js_scene_session.h +++ b/window_scene/interfaces/kits/napi/scene_session_manager/js_scene_session.h @@ -237,8 +237,8 @@ private: void TerminateSession(const SessionInfo& info); void TerminateSessionNew(const SessionInfo& info, bool needStartCaller, bool isFromBroker); void TerminateSessionTotal(const SessionInfo& info, TerminateType terminateType); - void UpdateSessionLabel(const std::string &label); - void UpdateSessionIcon(const std::string &iconPath); + void UpdateSessionLabel(const std::string& label); + void UpdateSessionIcon(const std::string& iconPath); void OnSessionException(const SessionInfo& info, bool needRemoveSession); void OnSystemBarPropertyChange(const std::unordered_map& propertyMap); void OnNeedAvoid(bool status); diff --git a/window_scene/interfaces/kits/napi/scene_session_manager/js_scene_session_manager.cpp b/window_scene/interfaces/kits/napi/scene_session_manager/js_scene_session_manager.cpp index 551018eb65..e827f26107 100644 --- a/window_scene/interfaces/kits/napi/scene_session_manager/js_scene_session_manager.cpp +++ b/window_scene/interfaces/kits/napi/scene_session_manager/js_scene_session_manager.cpp @@ -1061,7 +1061,7 @@ napi_value JsSceneSessionManager::OnGetAllAbilityInfos(napi_env env, napi_callba *errCode = static_cast(code); }; auto complete = [obj = this, errCode, infos = scbAbilityInfos] - (napi_env env, NapiAsyncTask &task, int32_t status) { + (napi_env env, NapiAsyncTask& task, int32_t status) { if (*errCode != static_cast(WSErrorCode::WS_OK)) { std::string errMsg = "invalid params can not get All AbilityInfos!"; task.RejectWithCustomize(env, CreateJsValue(env, *errCode), CreateJsValue(env, errMsg)); diff --git a/window_scene/interfaces/kits/napi/scene_session_manager/js_scene_utils.cpp b/window_scene/interfaces/kits/napi/scene_session_manager/js_scene_utils.cpp index adf76ae2ca..8fc5d2dbd1 100644 --- a/window_scene/interfaces/kits/napi/scene_session_manager/js_scene_utils.cpp +++ b/window_scene/interfaces/kits/napi/scene_session_manager/js_scene_utils.cpp @@ -641,7 +641,7 @@ bool ConvertDeviceIdFromJs(napi_env env, napi_value jsObject, MMI::PointerEvent& return true; } -bool ConvertInt32ArrayFromJs(napi_env env, napi_value jsObject, std::vector &intList) +bool ConvertInt32ArrayFromJs(napi_env env, napi_value jsObject, std::vector& intList) { bool isArray = false; napi_is_array(env, jsObject, &isArray); @@ -666,7 +666,7 @@ bool ConvertInt32ArrayFromJs(napi_env env, napi_value jsObject, std::vector &stringMap) +bool ConvertStringMapFromJs(napi_env env, napi_value value, std::unordered_map& stringMap) { if (value == nullptr) { WLOGFE("value is nullptr"); @@ -707,7 +707,7 @@ bool ConvertStringMapFromJs(napi_env env, napi_value value, std::unordered_map &vector) +bool ParseArrayStringValue(napi_env env, napi_value array, std::vector& vector) { if (array == nullptr) { WLOGFE("array is nullptr!"); @@ -798,7 +798,7 @@ napi_value CreateJsSessionInfo(napi_env env, const SessionInfo& sessionInfo) } napi_value CreateJsSessionRecoverInfo( - napi_env env, const SessionInfo &sessionInfo, const sptr property) + napi_env env, const SessionInfo& sessionInfo, const sptr property) { napi_value objValue = nullptr; napi_create_object(env, &objValue); diff --git a/window_scene/interfaces/kits/napi/scene_session_manager/js_scene_utils.h b/window_scene/interfaces/kits/napi/scene_session_manager/js_scene_utils.h index 206d9255a7..690538f8c1 100644 --- a/window_scene/interfaces/kits/napi/scene_session_manager/js_scene_utils.h +++ b/window_scene/interfaces/kits/napi/scene_session_manager/js_scene_utils.h @@ -148,13 +148,13 @@ bool ConvertSessionInfoFromJs(napi_env env, napi_value jsObject, SessionInfo& se bool ConvertPointerEventFromJs(napi_env env, napi_value jsObject, MMI::PointerEvent& pointerEvent); bool ConvertDeviceIdFromJs(napi_env env, napi_value jsObject, MMI::PointerEvent& pointerEvent); bool ConvertInt32ArrayFromJs(napi_env env, napi_value jsObject, std::vector& intList); -bool ConvertStringMapFromJs(napi_env env, napi_value value, std::unordered_map &stringMap); -bool ParseArrayStringValue(napi_env env, napi_value array, std::vector &vector); +bool ConvertStringMapFromJs(napi_env env, napi_value value, std::unordered_map& stringMap); +bool ParseArrayStringValue(napi_env env, napi_value array, std::vector& vector); bool ConvertProcessOptionFromJs(napi_env env, napi_value jsObject, std::shared_ptr processOptions); napi_value CreateJsSessionInfo(napi_env env, const SessionInfo& sessionInfo); napi_value CreateJsSessionRecoverInfo( - napi_env env, const SessionInfo &sessionInfo, const sptr property); + napi_env env, const SessionInfo& sessionInfo, const sptr property); void SetJsSessionInfoByWant(napi_env env, const SessionInfo& sessionInfo, napi_value objValue); napi_value CreateJsProcessOption(napi_env env, std::shared_ptr processOptions); napi_value CreateJsSessionStartupVisibility(napi_env env); diff --git a/window_scene/session/container/include/zidl/session_stage_stub.h b/window_scene/session/container/include/zidl/session_stage_stub.h index 91c3a93aaf..c159db3b20 100644 --- a/window_scene/session/container/include/zidl/session_stage_stub.h +++ b/window_scene/session/container/include/zidl/session_stage_stub.h @@ -30,8 +30,8 @@ public: SessionStageStub() = default; ~SessionStageStub() = default; - int OnRemoteRequest(uint32_t code, MessageParcel &data, MessageParcel &reply, - MessageOption &option) override; + int OnRemoteRequest(uint32_t code, MessageParcel& data, MessageParcel& reply, + MessageOption& option) override; private: int HandleSetActive(MessageParcel& data, MessageParcel& reply); diff --git a/window_scene/session/container/include/zidl/window_event_channel_stub.h b/window_scene/session/container/include/zidl/window_event_channel_stub.h index 1bbad2e60d..ae52e53bce 100644 --- a/window_scene/session/container/include/zidl/window_event_channel_stub.h +++ b/window_scene/session/container/include/zidl/window_event_channel_stub.h @@ -28,8 +28,8 @@ public: WindowEventChannelStub() = default; ~WindowEventChannelStub() = default; - int OnRemoteRequest(uint32_t code, MessageParcel &data, MessageParcel &reply, - MessageOption &option) override; + int OnRemoteRequest(uint32_t code, MessageParcel& data, MessageParcel& reply, + MessageOption& option) override; private: int HandleTransferBackpressedEvent(MessageParcel& data, MessageParcel& reply); diff --git a/window_scene/session/container/src/zidl/session_stage_stub.cpp b/window_scene/session/container/src/zidl/session_stage_stub.cpp index b089d6354f..f90607cd4f 100644 --- a/window_scene/session/container/src/zidl/session_stage_stub.cpp +++ b/window_scene/session/container/src/zidl/session_stage_stub.cpp @@ -27,7 +27,7 @@ namespace { constexpr HiviewDFX::HiLogLabel LABEL = {LOG_CORE, HILOG_DOMAIN_WINDOW, "SessionStageStub"}; } -int SessionStageStub::OnRemoteRequest(uint32_t code, MessageParcel &data, MessageParcel &reply, MessageOption &option) +int SessionStageStub::OnRemoteRequest(uint32_t code, MessageParcel& data, MessageParcel& reply, MessageOption& option) { WLOGFD("Scene session stage on remote request!, code: %{public}u", code); if (data.ReadInterfaceToken() != GetDescriptor()) { diff --git a/window_scene/session/container/src/zidl/window_event_channel_stub.cpp b/window_scene/session/container/src/zidl/window_event_channel_stub.cpp index 7a830104a0..f8a22f87f6 100644 --- a/window_scene/session/container/src/zidl/window_event_channel_stub.cpp +++ b/window_scene/session/container/src/zidl/window_event_channel_stub.cpp @@ -30,8 +30,8 @@ namespace { constexpr HiviewDFX::HiLogLabel LABEL = {LOG_CORE, HILOG_DOMAIN_WINDOW, "WindowEventChannelStub"}; } -int WindowEventChannelStub::OnRemoteRequest(uint32_t code, MessageParcel &data, - MessageParcel &reply, MessageOption &option) +int WindowEventChannelStub::OnRemoteRequest(uint32_t code, MessageParcel& data, + MessageParcel& reply, MessageOption& option) { WLOGFD("Window event channel on remote request!, code: %{public}u", code); if (data.ReadInterfaceToken() != GetDescriptor()) { @@ -178,7 +178,7 @@ int WindowEventChannelStub::HandleTransferAccessibilityHoverEvent(MessageParcel& return ERR_NONE; } -int32_t WindowEventChannelStub::HandleTransferAccessibilityChildTreeRegister(MessageParcel &data, MessageParcel &reply) +int32_t WindowEventChannelStub::HandleTransferAccessibilityChildTreeRegister(MessageParcel& data, MessageParcel& reply) { uint32_t windowId = 0; int32_t treeId = -1; @@ -195,14 +195,14 @@ int32_t WindowEventChannelStub::HandleTransferAccessibilityChildTreeRegister(Mes } int32_t WindowEventChannelStub::HandleTransferAccessibilityChildTreeUnregister( - MessageParcel &data, MessageParcel &reply) + MessageParcel& data, MessageParcel& reply) { WSError errCode = TransferAccessibilityChildTreeUnregister(); reply.WriteInt32(static_cast(errCode)); return ERR_NONE; } -int32_t WindowEventChannelStub::HandleTransferAccessibilityDumpChildInfo(MessageParcel &data, MessageParcel &reply) +int32_t WindowEventChannelStub::HandleTransferAccessibilityDumpChildInfo(MessageParcel& data, MessageParcel& reply) { std::vector params; if (!data.ReadStringVector(¶ms)) { diff --git a/window_scene/session/host/include/scene_session.h b/window_scene/session/host/include/scene_session.h index 8893115187..eb4e2db197 100644 --- a/window_scene/session/host/include/scene_session.h +++ b/window_scene/session/host/include/scene_session.h @@ -276,7 +276,7 @@ public: void NotifyWindowVisibility(); WSError UpdateAvoidArea(const sptr& avoidArea, AvoidAreaType type) override; WSError OnShowWhenLocked(bool showWhenLocked); - void SaveUpdatedIcon(const std::shared_ptr &icon); + void SaveUpdatedIcon(const std::shared_ptr& icon); void NotifyTouchOutside(); bool CheckOutTouchOutsideRegister(); void UpdateNativeVisibility(bool visible); @@ -284,7 +284,7 @@ public: void DumpSessionElementInfo(const std::vector& params); void NotifyForceHideChange(bool hide); WSError BindDialogSessionTarget(const sptr& sceneSession); - void DumpSessionInfo(std::vector &info) const; + void DumpSessionInfo(std::vector& info) const; bool AddSubSession(const sptr& subSession); bool RemoveSubSession(int32_t persistentId); bool AddToastSession(const sptr& toastSession); @@ -438,7 +438,7 @@ private: bool SaveAspectRatio(float ratio); void NotifyPropertyWhenConnect(); WSError RaiseAppMainWindowToTop() override; - void SetSurfaceBounds(const WSRect &rect); + void SetSurfaceBounds(const WSRect& rect); void UpdateWinRectForSystemBar(WSRect& rect); bool UpdateInputMethodSessionRect(const WSRect& rect, WSRect& newWinRect, WSRect& newRequestRect); bool IsMovableWindowType(); diff --git a/window_scene/session/host/include/session.h b/window_scene/session/host/include/session.h index 1c75d60e33..a74fc3c3cc 100644 --- a/window_scene/session/host/include/session.h +++ b/window_scene/session/host/include/session.h @@ -63,8 +63,8 @@ using NotifyTerminateSessionFunc = std::function; using NotifyTerminateSessionFuncNew = std::function; using NotifyTerminateSessionFuncTotal = std::function; -using NofitySessionLabelUpdatedFunc = std::function; -using NofitySessionIconUpdatedFunc = std::function; +using NofitySessionLabelUpdatedFunc = std::function; +using NofitySessionIconUpdatedFunc = std::function; using NotifySessionExceptionFunc = std::function; using NotifySessionSnapshotFunc = std::function; using NotifyPendingSessionToForegroundFunc = std::function; @@ -235,9 +235,9 @@ public: WSError TerminateSessionTotal(const sptr info, TerminateType terminateType); void SetTerminateSessionListenerTotal(const NotifyTerminateSessionFuncTotal& func); WSError Clear(bool needStartCaller = false); - WSError SetSessionLabel(const std::string &label); + WSError SetSessionLabel(const std::string& label); void SetUpdateSessionLabelListener(const NofitySessionLabelUpdatedFunc& func); - WSError SetSessionIcon(const std::shared_ptr &icon); + WSError SetSessionIcon(const std::shared_ptr& icon); void SetUpdateSessionIconListener(const NofitySessionIconUpdatedFunc& func); void SetSessionStateChangeListenser(const NotifySessionStateChangeFunc& func); void SetBufferAvailableChangeListener(const NotifyBufferAvailableChangeFunc& func); @@ -360,8 +360,8 @@ public: void SetRaiseToAppTopForPointDownFunc(const NotifyRaiseToTopForPointDownFunc& func); void NotifyScreenshot(); - void RemoveLifeCycleTask(const LifeCycleTaskType &taskType); - void PostLifeCycleTask(Task &&task, const std::string &name, const LifeCycleTaskType &taskType); + void RemoveLifeCycleTask(const LifeCycleTaskType& taskType); + void PostLifeCycleTask(Task &&task, const std::string& name, const LifeCycleTaskType& taskType); WSError UpdateMaximizeMode(bool isMaximize); void NotifySessionForeground(uint32_t reason, bool withAnimation); void NotifySessionBackground(uint32_t reason, bool withAnimation, bool isFromInnerkits); @@ -443,7 +443,7 @@ public: protected: class SessionLifeCycleTask : public virtual RefBase { public: - SessionLifeCycleTask(const Task &task, const std::string &name, const LifeCycleTaskType &type) + SessionLifeCycleTask(const Task& task, const std::string& name, const LifeCycleTaskType& type) : task(task), name(name), type(type) {} Task task; const std::string name; diff --git a/window_scene/session/host/include/session_utils.h b/window_scene/session/host/include/session_utils.h index a23cae1104..646f4c07c1 100644 --- a/window_scene/session/host/include/session_utils.h +++ b/window_scene/session/host/include/session_utils.h @@ -56,8 +56,8 @@ inline void CalcFloatWindowRectLimits(const WindowLimits& limits, uint32_t maxFl maxHeight = std::min(maxHeight, static_cast(maxFloatingWindowSize * vpr)); } -inline std::string ConvertSessionName(const std::string &bundleName, const std::string &name, - const std::string &moduleName, const int32_t appIndex = 0) +inline std::string ConvertSessionName(const std::string& bundleName, const std::string& name, + const std::string& moduleName, const int32_t appIndex = 0) { std::string strName; if (appIndex == 0) { diff --git a/window_scene/session/host/include/zidl/session_stub.h b/window_scene/session/host/include/zidl/session_stub.h index e8a381cb79..599f7b1ee5 100644 --- a/window_scene/session/host/include/zidl/session_stub.h +++ b/window_scene/session/host/include/zidl/session_stub.h @@ -30,7 +30,7 @@ public: SessionStub() = default; virtual ~SessionStub() = default; - int OnRemoteRequest(uint32_t code, MessageParcel &data, MessageParcel &reply, MessageOption &option) override; + int OnRemoteRequest(uint32_t code, MessageParcel& data, MessageParcel& reply, MessageOption& option) override; private: int HandleConnect(MessageParcel& data, MessageParcel& reply); @@ -56,9 +56,9 @@ private: int HandleSetWindowAnimationFlag(MessageParcel& data, MessageParcel& reply); int HandleUpdateWindowSceneAfterCustomAnimation(MessageParcel& data, MessageParcel& reply); int HandleRaiseAboveTarget(MessageParcel& data, MessageParcel& reply); - int HandleRaiseAppMainWindowToTop(MessageParcel &data, MessageParcel &reply); - int HandleChangeSessionVisibilityWithStatusBar(MessageParcel &data, MessageParcel &reply); - int HandlePendingSessionActivation(MessageParcel &data, MessageParcel &reply); + int HandleRaiseAppMainWindowToTop(MessageParcel& data, MessageParcel& reply); + int HandleChangeSessionVisibilityWithStatusBar(MessageParcel& data, MessageParcel& reply); + int HandlePendingSessionActivation(MessageParcel& data, MessageParcel& reply); int HandleTerminateSession(MessageParcel& data, MessageParcel& reply); int HandleSessionException(MessageParcel& data, MessageParcel& reply); int HandleProcessPointDownSession(MessageParcel& data, MessageParcel& reply); diff --git a/window_scene/session/host/src/scene_persistence.cpp b/window_scene/session/host/src/scene_persistence.cpp index bbd8e0d3e4..653e6e8072 100644 --- a/window_scene/session/host/src/scene_persistence.cpp +++ b/window_scene/session/host/src/scene_persistence.cpp @@ -151,7 +151,7 @@ bool ScenePersistence::IsSavingSnapshot() return isSavingSnapshot_.load(); } -void ScenePersistence::RenameSnapshotFromOldPersistentId(const int32_t &oldPersistentId) +void ScenePersistence::RenameSnapshotFromOldPersistentId(const int32_t& oldPersistentId) { auto task = [weakThis = wptr(this), oldPersistentId]() { auto scenePersistence = weakThis.promote(); diff --git a/window_scene/session/host/src/scene_session.cpp b/window_scene/session/host/src/scene_session.cpp index 48630dc029..6deb37aad4 100644 --- a/window_scene/session/host/src/scene_session.cpp +++ b/window_scene/session/host/src/scene_session.cpp @@ -493,7 +493,7 @@ WSError SceneSession::SetGlobalMaximizeMode(MaximizeMode mode) return PostSyncTask(task, "SetGlobalMaximizeMode"); } -WSError SceneSession::GetGlobalMaximizeMode(MaximizeMode &mode) +WSError SceneSession::GetGlobalMaximizeMode(MaximizeMode& mode) { auto task = [weakThis = wptr(this), &mode]() { auto session = weakThis.promote(); @@ -2184,7 +2184,7 @@ std::string SceneSession::GetSessionSnapshotFilePath() const return ""; } -void SceneSession::SaveUpdatedIcon(const std::shared_ptr &icon) +void SceneSession::SaveUpdatedIcon(const std::shared_ptr& icon) { WLOGFI("run SaveUpdatedIcon"); if (scenePersistence_ != nullptr) { @@ -2564,7 +2564,7 @@ void SceneSession::SetClientIdentityToken(const std::string& clientIdentityToken clientIdentityToken_ = clientIdentityToken; } -void SceneSession::DumpSessionInfo(std::vector &info) const +void SceneSession::DumpSessionInfo(std::vector& info) const { std::string dumpInfo = " Session ID #" + std::to_string(persistentId_); info.push_back(dumpInfo); diff --git a/window_scene/session/host/src/session.cpp b/window_scene/session/host/src/session.cpp index 07efa5b61f..e6b870aa51 100644 --- a/window_scene/session/host/src/session.cpp +++ b/window_scene/session/host/src/session.cpp @@ -1250,7 +1250,7 @@ void Session::SetTerminateSessionListener(const NotifyTerminateSessionFunc& func terminateSessionFunc_ = func; } -void Session::RemoveLifeCycleTask(const LifeCycleTaskType &taskType) +void Session::RemoveLifeCycleTask(const LifeCycleTaskType& taskType) { std::lock_guard lock(lifeCycleTaskQueueMutex_); if (lifeCycleTaskQueue_.empty()) { @@ -1383,7 +1383,7 @@ void Session::SetTerminateSessionListenerTotal(const NotifyTerminateSessionFuncT terminateSessionFuncTotal_ = func; } -WSError Session::SetSessionLabel(const std::string &label) +WSError Session::SetSessionLabel(const std::string& label) { WLOGFI("run Session::SetSessionLabel"); if (updateSessionLabelFunc_) { @@ -1392,12 +1392,12 @@ WSError Session::SetSessionLabel(const std::string &label) return WSError::WS_OK; } -void Session::SetUpdateSessionLabelListener(const NofitySessionLabelUpdatedFunc &func) +void Session::SetUpdateSessionLabelListener(const NofitySessionLabelUpdatedFunc& func) { updateSessionLabelFunc_ = func; } -WSError Session::SetSessionIcon(const std::shared_ptr &icon) +WSError Session::SetSessionIcon(const std::shared_ptr& icon) { WLOGFD("run Session::SetSessionIcon, id: %{public}d", GetPersistentId()); if (scenePersistence_ == nullptr) { @@ -1412,7 +1412,7 @@ WSError Session::SetSessionIcon(const std::shared_ptr &icon) return WSError::WS_OK; } -void Session::SetUpdateSessionIconListener(const NofitySessionIconUpdatedFunc &func) +void Session::SetUpdateSessionIconListener(const NofitySessionIconUpdatedFunc& func) { updateSessionIconFunc_ = func; } diff --git a/window_scene/session/host/src/zidl/session_stub.cpp b/window_scene/session/host/src/zidl/session_stub.cpp index 220d816a3e..7185591504 100644 --- a/window_scene/session/host/src/zidl/session_stub.cpp +++ b/window_scene/session/host/src/zidl/session_stub.cpp @@ -36,7 +36,7 @@ namespace { constexpr HiviewDFX::HiLogLabel LABEL = { LOG_CORE, HILOG_DOMAIN_WINDOW, "SessionStub" }; } // namespace -int SessionStub::OnRemoteRequest(uint32_t code, MessageParcel &data, MessageParcel &reply, MessageOption &option) +int SessionStub::OnRemoteRequest(uint32_t code, MessageParcel& data, MessageParcel& reply, MessageOption& option) { WLOGFD("Scene session on remote request!, code: %{public}u", code); if (data.ReadInterfaceToken() != GetDescriptor()) { @@ -497,7 +497,7 @@ int SessionStub::HandleMarkProcessed(MessageParcel& data, MessageParcel& reply) return ERR_NONE; } -int SessionStub::HandleSetGlobalMaximizeMode(MessageParcel &data, MessageParcel &reply) +int SessionStub::HandleSetGlobalMaximizeMode(MessageParcel& data, MessageParcel& reply) { WLOGFD("HandleSetGlobalMaximizeMode!"); auto mode = data.ReadUint32(); @@ -506,7 +506,7 @@ int SessionStub::HandleSetGlobalMaximizeMode(MessageParcel &data, MessageParcel return ERR_NONE; } -int SessionStub::HandleGetGlobalMaximizeMode(MessageParcel &data, MessageParcel &reply) +int SessionStub::HandleGetGlobalMaximizeMode(MessageParcel& data, MessageParcel& reply) { WLOGFD("HandleGetGlobalMaximizeMode!"); MaximizeMode mode = MaximizeMode::MODE_FULL_FILL; @@ -704,7 +704,7 @@ int SessionStub::HandleUpdateRectChangeListenerRegistered(MessageParcel& data, M return ERR_NONE; } -int SessionStub::HandleSetKeyboardSessionGravity(MessageParcel &data, MessageParcel &reply) +int SessionStub::HandleSetKeyboardSessionGravity(MessageParcel& data, MessageParcel& reply) { TLOGD(WmsLogTag::WMS_KEYBOARD, "run HandleSetKeyboardSessionGravity!"); SessionGravity gravity = static_cast(data.ReadUint32()); diff --git a/window_scene/session_manager/include/distributed_client.h b/window_scene/session_manager/include/distributed_client.h index 460c767047..6cba760721 100644 --- a/window_scene/session_manager/include/distributed_client.h +++ b/window_scene/session_manager/include/distributed_client.h @@ -33,7 +33,7 @@ public: std::vector& missionInfos); int32_t GetRemoteMissionSnapshotInfo(const std::string& deviceId, int32_t missionId, AAFwk::MissionSnapshot& missionSnapshot); - int32_t SetMissionContinueState(int32_t missionId, const AAFwk::ContinueState &state); + int32_t SetMissionContinueState(int32_t missionId, const AAFwk::ContinueState& state); void ClearDmsProxy(); enum { START_REMOTE_ABILITY = 1, diff --git a/window_scene/session_manager/include/publish/scene_event_publish.h b/window_scene/session_manager/include/publish/scene_event_publish.h index 85fcbd1205..a533cf9a37 100644 --- a/window_scene/session_manager/include/publish/scene_event_publish.h +++ b/window_scene/session_manager/include/publish/scene_event_publish.h @@ -30,16 +30,16 @@ namespace OHOS::Rosen { class SceneEventPublish : public EventFwk::CommonEventSubscriber { public: - explicit SceneEventPublish(const EventFwk::CommonEventSubscribeInfo &subscribeInfo) + explicit SceneEventPublish(const EventFwk::CommonEventSubscribeInfo& subscribeInfo) : CommonEventSubscriber(subscribeInfo) {} ~SceneEventPublish() = default; - void OnReceiveEvent(const EventFwk::CommonEventData &data); + void OnReceiveEvent(const EventFwk::CommonEventData& data); WSError Publish(std::string cmd); - std::string GetDebugDumpInfo(std::chrono::milliseconds const &time); + std::string GetDebugDumpInfo(std::chrono::milliseconds const& time); static void Subscribe(std::shared_ptr& scbSubscriber); diff --git a/window_scene/session_manager/include/scene_session_manager.h b/window_scene/session_manager/include/scene_session_manager.h index 9a7fa1dfeb..fbddf7a6ac 100644 --- a/window_scene/session_manager/include/scene_session_manager.h +++ b/window_scene/session_manager/include/scene_session_manager.h @@ -100,8 +100,8 @@ using RootSceneProcessBackEventFunc = std::function; class AppAnrListener : public IRemoteStub { public: - void OnAppDebugStarted(const std::vector &debugInfos) override; - void OnAppDebugStoped(const std::vector &debugInfos) override; + void OnAppDebugStarted(const std::vector& debugInfos) override; + void OnAppDebugStoped(const std::vector& debugInfos) override; }; class DisplayChangeListener : public IDisplayChangeListener { @@ -133,7 +133,7 @@ public: const bool isToDesktop = false, const bool isSaveSnapshot = true); WSError RequestSceneSessionDestruction(const sptr& sceneSession, bool needRemoveSession = true, bool isSaveSnapshot = true, const bool isForceClean = false); - WSError RequestSceneSessionDestructionInner(sptr &scnSession, sptr scnSessionInfo, + WSError RequestSceneSessionDestructionInner(sptr& scnSession, sptr scnSessionInfo, const bool needRemoveSession, const bool isForceClean = false); void NotifyForegroundInteractiveStatus(const sptr& sceneSession, bool interactive); WSError RequestSceneSessionByCall(const sptr& sceneSession); @@ -205,22 +205,22 @@ public: void SetScreenLocked(const bool isScreenLocked); bool IsScreenLocked() const; - WSError InitUserInfo(int32_t userId, std::string &fileDir); + WSError InitUserInfo(int32_t userId, std::string& fileDir); void NotifySwitchingUser(const bool isUserActive); int32_t GetCurrentUserId() const; void StartWindowInfoReportLoop(); void GetFocusWindowInfo(FocusChangeInfo& focusInfo) override; void NotifyCompleteFirstFrameDrawing(int32_t persistentId); void NotifySessionMovedToFront(int32_t persistentId); - WSError SetSessionLabel(const sptr &token, const std::string &label) override; - WSError SetSessionIcon(const sptr &token, const std::shared_ptr &icon) override; - WSError IsValidSessionIds(const std::vector &sessionIds, std::vector &results) override; + WSError SetSessionLabel(const sptr& token, const std::string& label) override; + WSError SetSessionIcon(const sptr& token, const std::shared_ptr& icon) override; + WSError IsValidSessionIds(const std::vector& sessionIds, std::vector& results) override; void HandleTurnScreenOn(const sptr& sceneSession); void HandleKeepScreenOn(const sptr& sceneSession, bool requireLock); void InitWithRenderServiceAdded(); - WSError PendingSessionToForeground(const sptr &token) override; - WSError PendingSessionToBackgroundForDelegator(const sptr &token) override; - WSError GetFocusSessionToken(sptr &token) override; + WSError PendingSessionToForeground(const sptr& token) override; + WSError PendingSessionToBackgroundForDelegator(const sptr& token) override; + WSError GetFocusSessionToken(sptr& token) override; WSError GetFocusSessionElement(AppExecFwk::ElementName& element) override; WSError RegisterSessionListener(const sptr& listener) override; WSError UnRegisterSessionListener(const sptr& listener) override; @@ -229,10 +229,10 @@ public: WSError GetSessionInfo(const std::string& deviceId, int32_t persistentId, SessionInfoBean& sessionInfo) override; WSError GetSessionInfoByContinueSessionId(const std::string& continueSessionId, SessionInfoBean& sessionInfo) override; - WSError DumpSessionAll(std::vector &infos) override; - WSError DumpSessionWithId(int32_t persistentId, std::vector &infos) override; - WSError GetAllAbilityInfos(const AAFwk::Want &want, int32_t userId, - std::vector &scbAbilityInfos); + WSError DumpSessionAll(std::vector& infos) override; + WSError DumpSessionWithId(int32_t persistentId, std::vector& infos) override; + WSError GetAllAbilityInfos(const AAFwk::Want& want, int32_t userId, + std::vector& scbAbilityInfos); WSError PrepareTerminate(int32_t persistentId, bool& isPrepareTerminate); WSError GetIsLayoutFullScreen(bool& isLayoutFullScreen); @@ -245,7 +245,7 @@ public: WMError GetSessionSnapshotById(int32_t persistentId, SessionSnapshot& snapshot) override; WSError SetVmaCacheStatus(bool flag); WSError GetUIContentRemoteObj(int32_t persistentId, sptr& uiContentRemoteObj) override; - WSError SetSessionContinueState(const sptr &token, const ContinueState& continueState) override; + WSError SetSessionContinueState(const sptr& token, const ContinueState& continueState) override; WSError ClearSession(int32_t persistentId) override; WSError ClearAllSessions() override; WSError LockSession(int32_t sessionId) override; @@ -278,7 +278,7 @@ public: void RegisterWindowChanged(const WindowChangedFunc& func); WSError RegisterIAbilityManagerCollaborator(int32_t type, - const sptr &impl) override; + const sptr& impl) override; WSError UnregisterIAbilityManagerCollaborator(int32_t type) override; bool IsInputEventEnabled(); @@ -287,7 +287,7 @@ public: void SetAlivePersistentIds(const std::vector& alivePersistentIds); void NotifyRecoveringFinished(); - WMError CheckWindowId(int32_t windowId, int32_t &pid) override; + WMError CheckWindowId(int32_t windowId, int32_t& pid) override; void GetSceneSessionPrivacyModeBundles(DisplayId displayId, std::unordered_set& privacyBundles); BrokerStates CheckIfReuseSession(SessionInfo& sessionInfo); bool CheckCollaboratorType(int32_t type); @@ -451,8 +451,8 @@ private: WSError ShiftFocus(sptr& nextSession, FocusChangeReason reason = FocusChangeReason::DEFAULT); void UpdateFocusStatus(sptr& sceneSession, bool isFocused); void NotifyFocusStatus(sptr& sceneSession, bool isFocused); - int32_t NotifyRssThawApp(const int32_t uid, const std::string &bundleName, - const std::string &reason); + int32_t NotifyRssThawApp(const int32_t uid, const std::string& bundleName, + const std::string& reason); void NotifyFocusStatusByMission(sptr& prevSession, sptr& currSession); void NotifyUnFocusedByMission(sptr& sceneSession); bool MissionChanged(sptr& prevSession, sptr& currSession); @@ -467,7 +467,7 @@ private: WSError UpdateParentSessionForDialog(const sptr& sceneSession, sptr property); void UpdateCameraFloatWindowStatus(uint32_t accessTokenId, bool isShowing); void UpdateFocusableProperty(int32_t persistentId); - WMError UpdateTopmostProperty(const sptr &property, const sptr &sceneSession); + WMError UpdateTopmostProperty(const sptr& property, const sptr& sceneSession); std::vector> GetSceneSessionVectorByType(WindowType type, uint64_t displayId); bool UpdateSessionAvoidAreaIfNeed(const int32_t& persistentId, const sptr& sceneSession, const AvoidArea& avoidArea, AvoidAreaType avoidAreaType); @@ -487,7 +487,7 @@ private: bool GetLocalDeviceId(std::string& localDeviceId); std::string AnonymizeDeviceId(const std::string& deviceId); int GetRemoteSessionInfos(const std::string& deviceId, int32_t numMax, - std::vector &sessionInfos); + std::vector& sessionInfos); int GetRemoteSessionInfo(const std::string& deviceId, int32_t persistentId, SessionInfoBean& sessionInfo); WSError GetTotalUITreeInfo(const std::string& strId, std::string& dumpInfo); @@ -530,8 +530,8 @@ private: bool GetExtensionWindowIds(const sptr& token, int32_t& persistentId, int32_t& parentId); void DestroyExtensionSession(const sptr& remoteExtSession); void EraseSceneSessionMapById(int32_t persistentId); - WSError GetAbilityInfosFromBundleInfo(std::vector &bundleInfos, - std::vector &scbAbilityInfos); + WSError GetAbilityInfosFromBundleInfo(std::vector& bundleInfos, + std::vector& scbAbilityInfos); void GetOrientationFromResourceManager(AppExecFwk::AbilityInfo& abilityInfo); void UpdatePrivateStateAndNotifyForAllScreens(); @@ -655,7 +655,7 @@ private: void ProcessSubSessionBackground(sptr& sceneSession); WSError ProcessDialogRequestFocusImmdediately(sptr& sceneSession); WSError ProcessModalTopmostRequestFocusImmdediately(sptr& sceneSession); - sptr FindSessionByToken(const sptr &token); + sptr FindSessionByToken(const sptr& token); void CheckAndNotifyWaterMarkChangedResult(); WSError NotifyWaterMarkFlagChangedResult(bool hasWaterMark); diff --git a/window_scene/session_manager/include/scene_session_manager_lite.h b/window_scene/session_manager/include/scene_session_manager_lite.h index 161ad82de6..82420b7042 100644 --- a/window_scene/session_manager/include/scene_session_manager_lite.h +++ b/window_scene/session_manager/include/scene_session_manager_lite.h @@ -58,7 +58,7 @@ public: const sptr& windowManagerAgent) override; WMError UnregisterWindowManagerAgent(WindowManagerAgentType type, const sptr& windowManagerAgent) override; - WMError CheckWindowId(int32_t windowId, int32_t &pid) override; + WMError CheckWindowId(int32_t windowId, int32_t& pid) override; WMError GetVisibilityWindowInfo(std::vector>& infos) override; WSError UpdateWindowMode(int32_t persistentId, int32_t windowMode); WMError GetWindowModeType(WindowModeType& windowModeType) override; diff --git a/window_scene/session_manager/include/session_manager.h b/window_scene/session_manager/include/session_manager.h index 0926f69d50..a903991b3a 100644 --- a/window_scene/session_manager/include/session_manager.h +++ b/window_scene/session_manager/include/session_manager.h @@ -63,7 +63,7 @@ private: WMError InitMockSMSProxy(); void InitSceneSessionManagerProxy(); void OnWMSConnectionChangedCallback(int32_t userId, int32_t screenId, bool isConnected, bool isCallbackRegistered); - void OnUserSwitch(const sptr &sessionManagerService); + void OnUserSwitch(const sptr& sessionManagerService); void RegisterSMSRecoverListener(); UserSwitchCallbackFunc userSwitchCallbackFunc_ = nullptr; diff --git a/window_scene/session_manager/include/session_manager_lite.h b/window_scene/session_manager/include/session_manager_lite.h index 134f15a5b9..f06099e5c9 100644 --- a/window_scene/session_manager/include/session_manager_lite.h +++ b/window_scene/session_manager/include/session_manager_lite.h @@ -68,7 +68,7 @@ private: void InitSessionManagerServiceProxy(); void InitSceneSessionManagerLiteProxy(); void InitScreenSessionManagerLiteProxy(); - void OnUserSwitch(const sptr &sessionManagerService); + void OnUserSwitch(const sptr& sessionManagerService); void DeleteAllSessionListeners(); void ReregisterSessionListener() const; void RegisterSMSRecoverListener(); diff --git a/window_scene/session_manager/include/zidl/scene_session_manager_interface.h b/window_scene/session_manager/include/zidl/scene_session_manager_interface.h index f1a01da9fb..11d53bc70b 100644 --- a/window_scene/session_manager/include/zidl/scene_session_manager_interface.h +++ b/window_scene/session_manager/include/zidl/scene_session_manager_interface.h @@ -113,12 +113,12 @@ public: TRANS_ID_GET_PROCESS_SURFACENODEID_BY_PERSISTENTID, }; - virtual WSError SetSessionLabel(const sptr &token, const std::string &label) = 0; - virtual WSError SetSessionIcon(const sptr &token, const std::shared_ptr &icon) = 0; - virtual WSError IsValidSessionIds(const std::vector &sessionIds, std::vector &results) = 0; - virtual WSError PendingSessionToForeground(const sptr &token) = 0; - virtual WSError PendingSessionToBackgroundForDelegator(const sptr &token) = 0; - virtual WSError GetFocusSessionToken(sptr &token) = 0; + virtual WSError SetSessionLabel(const sptr& token, const std::string& label) = 0; + virtual WSError SetSessionIcon(const sptr& token, const std::shared_ptr& icon) = 0; + virtual WSError IsValidSessionIds(const std::vector& sessionIds, std::vector& results) = 0; + virtual WSError PendingSessionToForeground(const sptr& token) = 0; + virtual WSError PendingSessionToBackgroundForDelegator(const sptr& token) = 0; + virtual WSError GetFocusSessionToken(sptr& token) = 0; virtual WSError GetFocusSessionElement(AppExecFwk::ElementName& element) = 0; virtual WSError RegisterSessionListener(const sptr& listener) = 0; @@ -128,12 +128,12 @@ public: virtual WSError GetSessionInfo(const std::string& deviceId, int32_t persistentId, SessionInfoBean& sessionInfo) = 0; virtual WSError GetSessionInfoByContinueSessionId(const std::string& continueSessionId, SessionInfoBean& sessionInfo) = 0; - virtual WSError DumpSessionAll(std::vector &infos) override { return WSError::WS_OK; } - virtual WSError DumpSessionWithId(int32_t persistentId, std::vector &infos) override + virtual WSError DumpSessionAll(std::vector& infos) override { return WSError::WS_OK; } + virtual WSError DumpSessionWithId(int32_t persistentId, std::vector& infos) override { return WSError::WS_OK; } - virtual WSError SetSessionContinueState(const sptr &token, const ContinueState& continueState) = 0; + virtual WSError SetSessionContinueState(const sptr& token, const ContinueState& continueState) = 0; virtual WSError TerminateSessionNew( const sptr info, bool needStartCaller, bool isFromBroker = false) = 0; @@ -157,7 +157,7 @@ public: } virtual WSError RegisterIAbilityManagerCollaborator(int32_t type, - const sptr &impl) = 0; + const sptr& impl) = 0; virtual WSError UnregisterIAbilityManagerCollaborator(int32_t type) = 0; // interfaces of IWindowManager WMError CreateWindow(sptr& window, sptr& property, diff --git a/window_scene/session_manager/include/zidl/scene_session_manager_lite_proxy.h b/window_scene/session_manager/include/zidl/scene_session_manager_lite_proxy.h index df99aca53d..623a43956d 100644 --- a/window_scene/session_manager/include/zidl/scene_session_manager_lite_proxy.h +++ b/window_scene/session_manager/include/zidl/scene_session_manager_lite_proxy.h @@ -58,7 +58,7 @@ public: const sptr& windowManagerAgent) override; WMError UnregisterWindowManagerAgent(WindowManagerAgentType type, const sptr& windowManagerAgent) override; - WMError CheckWindowId(int32_t windowId, int32_t &pid) override; + WMError CheckWindowId(int32_t windowId, int32_t& pid) override; WMError GetVisibilityWindowInfo(std::vector>& infos) override; WMError GetWindowModeType(WindowModeType& windowModeType) override; WMError GetMainWindowInfos(int32_t topNum, std::vector& topNInfo) override; diff --git a/window_scene/session_manager/include/zidl/scene_session_manager_lite_stub.h b/window_scene/session_manager/include/zidl/scene_session_manager_lite_stub.h index 711c3c73d5..082ca25c7c 100644 --- a/window_scene/session_manager/include/zidl/scene_session_manager_lite_stub.h +++ b/window_scene/session_manager/include/zidl/scene_session_manager_lite_stub.h @@ -55,9 +55,9 @@ private: int HandleMoveSessionsToBackground(MessageParcel& data, MessageParcel& reply); //for window manager service int HandleGetFocusSessionInfo(MessageParcel& data, MessageParcel& reply); - int HandleRegisterWindowManagerAgent(MessageParcel &data, MessageParcel &reply); - int HandleUnregisterWindowManagerAgent(MessageParcel &data, MessageParcel &reply); - int HandleCheckWindowId(MessageParcel &data, MessageParcel &reply); + int HandleRegisterWindowManagerAgent(MessageParcel& data, MessageParcel& reply); + int HandleUnregisterWindowManagerAgent(MessageParcel& data, MessageParcel& reply); + int HandleCheckWindowId(MessageParcel& data, MessageParcel& reply); int HandleGetVisibilityWindowInfo(MessageParcel& data, MessageParcel& reply); int HandleGetWindowModeType(MessageParcel& data, MessageParcel& reply); int HandleGetMainWinodowInfo(MessageParcel& data, MessageParcel& reply); diff --git a/window_scene/session_manager/include/zidl/scene_session_manager_proxy.h b/window_scene/session_manager/include/zidl/scene_session_manager_proxy.h index 3338b0a4f8..0f7932a839 100644 --- a/window_scene/session_manager/include/zidl/scene_session_manager_proxy.h +++ b/window_scene/session_manager/include/zidl/scene_session_manager_proxy.h @@ -52,18 +52,18 @@ public: const sptr& windowManagerAgent) override; WMError SetGestureNavigaionEnabled(bool enable) override; void GetFocusWindowInfo(FocusChangeInfo& focusInfo) override; - WSError SetSessionLabel(const sptr &token, const std::string &label) override; - WSError SetSessionIcon(const sptr &token, const std::shared_ptr &icon) override; - WSError IsValidSessionIds(const std::vector &sessionIds, std::vector &results) override; + WSError SetSessionLabel(const sptr& token, const std::string& label) override; + WSError SetSessionIcon(const sptr& token, const std::shared_ptr& icon) override; + WSError IsValidSessionIds(const std::vector& sessionIds, std::vector& results) override; WMError GetAccessibilityWindowInfo(std::vector>& infos) override; WMError GetUnreliableWindowInfo(int32_t windowId, std::vector>& infos) override; - WSError PendingSessionToForeground(const sptr &token) override; - WSError PendingSessionToBackgroundForDelegator(const sptr &token) override; + WSError PendingSessionToForeground(const sptr& token) override; + WSError PendingSessionToBackgroundForDelegator(const sptr& token) override; WMError GetSessionSnapshotById(int32_t persistentId, SessionSnapshot& snapshot) override; WMError GetSnapshotByWindowId(int32_t persistentId, std::shared_ptr& pixelMap) override; - WSError GetFocusSessionToken(sptr &token) override; + WSError GetFocusSessionToken(sptr& token) override; WSError GetFocusSessionElement(AppExecFwk::ElementName& element) override; - WMError CheckWindowId(int32_t windowId, int32_t &pid) override; + WMError CheckWindowId(int32_t windowId, int32_t& pid) override; WSError RegisterSessionListener(const sptr& listener) override; WSError UnRegisterSessionListener(const sptr& listener) override; @@ -73,9 +73,9 @@ public: WSError GetSessionInfoByContinueSessionId(const std::string& continueSessionId, SessionInfoBean& sessionInfo) override; - WSError DumpSessionAll(std::vector &infos) override; - WSError DumpSessionWithId(int32_t persistentId, std::vector &infos) override; - WSError SetSessionContinueState(const sptr &token, const ContinueState& continueState) override; + WSError DumpSessionAll(std::vector& infos) override; + WSError DumpSessionWithId(int32_t persistentId, std::vector& infos) override; + WSError SetSessionContinueState(const sptr& token, const ContinueState& continueState) override; WSError TerminateSessionNew( const sptr info, bool needStartCaller, bool isFromBroker = false) override; WSError GetSessionDumpInfo(const std::vector& params, std::string& info) override; @@ -93,7 +93,7 @@ public: WSError ClearSession(int32_t persistentId) override; WSError ClearAllSessions() override; WSError RegisterIAbilityManagerCollaborator(int32_t type, - const sptr &impl) override; + const sptr& impl) override; WSError UnregisterIAbilityManagerCollaborator(int32_t type) override; WSError NotifyWindowExtensionVisibilityChange(int32_t pid, int32_t uid, bool visible) override; WMError GetTopWindowId(uint32_t mainWinId, uint32_t& topWinId) override; diff --git a/window_scene/session_manager/include/zidl/scene_session_manager_stub.h b/window_scene/session_manager/include/zidl/scene_session_manager_stub.h index 302370800b..dbd3bdce2c 100644 --- a/window_scene/session_manager/include/zidl/scene_session_manager_stub.h +++ b/window_scene/session_manager/include/zidl/scene_session_manager_stub.h @@ -29,29 +29,29 @@ public: SceneSessionManagerStub() = default; virtual ~SceneSessionManagerStub() = default; - int OnRemoteRequest(uint32_t code, MessageParcel &data, MessageParcel &reply, MessageOption &option) override; + int OnRemoteRequest(uint32_t code, MessageParcel& data, MessageParcel& reply, MessageOption& option) override; private: - int HandleGetAccessibilityWindowInfo(MessageParcel &data, MessageParcel &reply); + int HandleGetAccessibilityWindowInfo(MessageParcel& data, MessageParcel& reply); int HandleGetUnreliableWindowInfo(MessageParcel& data, MessageParcel& reply); - int HandleRequestFocusStatus(MessageParcel &data, MessageParcel &reply); - int HandleCreateAndConnectSpecificSession(MessageParcel &data, MessageParcel &reply); - int HandleRecoverAndConnectSpecificSession(MessageParcel &data, MessageParcel &reply); - int HandleRecoverAndReconnectSceneSession(MessageParcel &data, MessageParcel &reply); - int HandleDestroyAndDisconnectSpcificSession(MessageParcel &data, MessageParcel &reply); + int HandleRequestFocusStatus(MessageParcel& data, MessageParcel& reply); + int HandleCreateAndConnectSpecificSession(MessageParcel& data, MessageParcel& reply); + int HandleRecoverAndConnectSpecificSession(MessageParcel& data, MessageParcel& reply); + int HandleRecoverAndReconnectSceneSession(MessageParcel& data, MessageParcel& reply); + int HandleDestroyAndDisconnectSpcificSession(MessageParcel& data, MessageParcel& reply); int HandleDestroyAndDisconnectSpcificSessionWithDetachCallback(MessageParcel& data, MessageParcel& reply); - int HandleRegisterWindowManagerAgent(MessageParcel &data, MessageParcel &reply); - int HandleUnregisterWindowManagerAgent(MessageParcel &data, MessageParcel &reply); - int HandleGetFocusSessionInfo(MessageParcel &data, MessageParcel &reply); - int HandleSetSessionLabel(MessageParcel &data, MessageParcel &reply); - int HandleSetSessionIcon(MessageParcel &data, MessageParcel &reply); - int HandleIsValidSessionIds(MessageParcel &data, MessageParcel &reply); - int HandlePendingSessionToForeground(MessageParcel &data, MessageParcel &reply); - int HandlePendingSessionToBackgroundForDelegator(MessageParcel &data, MessageParcel &reply); - int HandleGetFocusSessionToken(MessageParcel &data, MessageParcel &reply); + int HandleRegisterWindowManagerAgent(MessageParcel& data, MessageParcel& reply); + int HandleUnregisterWindowManagerAgent(MessageParcel& data, MessageParcel& reply); + int HandleGetFocusSessionInfo(MessageParcel& data, MessageParcel& reply); + int HandleSetSessionLabel(MessageParcel& data, MessageParcel& reply); + int HandleSetSessionIcon(MessageParcel& data, MessageParcel& reply); + int HandleIsValidSessionIds(MessageParcel& data, MessageParcel& reply); + int HandlePendingSessionToForeground(MessageParcel& data, MessageParcel& reply); + int HandlePendingSessionToBackgroundForDelegator(MessageParcel& data, MessageParcel& reply); + int HandleGetFocusSessionToken(MessageParcel& data, MessageParcel& reply); int HandleGetFocusSessionElement(MessageParcel& data, MessageParcel& reply); - int HandleSetGestureNavigationEnabled(MessageParcel &data, MessageParcel &reply); - int HandleCheckWindowId(MessageParcel &data, MessageParcel &reply); + int HandleSetGestureNavigationEnabled(MessageParcel& data, MessageParcel& reply); + int HandleCheckWindowId(MessageParcel& data, MessageParcel& reply); int HandleRegisterSessionListener(MessageParcel& data, MessageParcel& reply); int HandleUnRegisterSessionListener(MessageParcel& data, MessageParcel& reply); @@ -61,23 +61,23 @@ private: int HandleDumpSessionAll(MessageParcel& data, MessageParcel& reply); int HandleDumpSessionWithId(MessageParcel& data, MessageParcel& reply); - int HandleSetSessionContinueState(MessageParcel &data, MessageParcel &reply); + int HandleSetSessionContinueState(MessageParcel& data, MessageParcel& reply); int HandleTerminateSessionNew(MessageParcel& data, MessageParcel& reply); - int HandleGetSessionDump(MessageParcel &data, MessageParcel &reply); + int HandleGetSessionDump(MessageParcel& data, MessageParcel& reply); int HandleUpdateSessionAvoidAreaListener(MessageParcel& data, MessageParcel& reply); - int HandleGetSessionSnapshot(MessageParcel &data, MessageParcel &reply); + int HandleGetSessionSnapshot(MessageParcel& data, MessageParcel& reply); int HandleGetSessionSnapshotById(MessageParcel& data, MessageParcel& reply); int HandleGetUIContentRemoteObj(MessageParcel& data, MessageParcel& reply); - int HandleBindDialogTarget(MessageParcel &data, MessageParcel &reply); - int HandleNotifyDumpInfoResult(MessageParcel &data, MessageParcel &reply); - int HandleClearSession(MessageParcel &data, MessageParcel &reply); - int HandleClearAllSessions(MessageParcel &data, MessageParcel &reply); - int HandleLockSession(MessageParcel &data, MessageParcel &reply); - int HandleUnlockSession(MessageParcel &data, MessageParcel &reply); - int HandleMoveSessionsToForeground(MessageParcel &data, MessageParcel &reply); - int HandleMoveSessionsToBackground(MessageParcel &data, MessageParcel &reply); - int HandleRegisterCollaborator(MessageParcel &data, MessageParcel &reply); - int HandleUnregisterCollaborator(MessageParcel &data, MessageParcel &reply); + int HandleBindDialogTarget(MessageParcel& data, MessageParcel& reply); + int HandleNotifyDumpInfoResult(MessageParcel& data, MessageParcel& reply); + int HandleClearSession(MessageParcel& data, MessageParcel& reply); + int HandleClearAllSessions(MessageParcel& data, MessageParcel& reply); + int HandleLockSession(MessageParcel& data, MessageParcel& reply); + int HandleUnlockSession(MessageParcel& data, MessageParcel& reply); + int HandleMoveSessionsToForeground(MessageParcel& data, MessageParcel& reply); + int HandleMoveSessionsToBackground(MessageParcel& data, MessageParcel& reply); + int HandleRegisterCollaborator(MessageParcel& data, MessageParcel& reply); + int HandleUnregisterCollaborator(MessageParcel& data, MessageParcel& reply); int HandleUpdateSessionTouchOutsideListener(MessageParcel& data, MessageParcel& reply); int HandleRaiseWindowToTop(MessageParcel& data, MessageParcel& reply); int HandleNotifyWindowExtensionVisibilityChange(MessageParcel& data, MessageParcel& reply); diff --git a/window_scene/session_manager/src/distributed_client.cpp b/window_scene/session_manager/src/distributed_client.cpp index ce1fd343d7..58158f1c49 100644 --- a/window_scene/session_manager/src/distributed_client.cpp +++ b/window_scene/session_manager/src/distributed_client.cpp @@ -161,7 +161,7 @@ bool DistributedClient::ReadMissionInfosFromParcel(Parcel& parcel, return true; } -int32_t DistributedClient::SetMissionContinueState(int32_t missionId, const AAFwk::ContinueState &state) +int32_t DistributedClient::SetMissionContinueState(int32_t missionId, const AAFwk::ContinueState& state) { TLOGI(WmsLogTag::DEFAULT, "Mission id: %{public}d, state: %{public}d", missionId, state); sptr remote = GetDmsProxy(); diff --git a/window_scene/session_manager/src/publish/scene_event_publish.cpp b/window_scene/session_manager/src/publish/scene_event_publish.cpp index 621dddede1..f24ca12a24 100644 --- a/window_scene/session_manager/src/publish/scene_event_publish.cpp +++ b/window_scene/session_manager/src/publish/scene_event_publish.cpp @@ -26,7 +26,7 @@ namespace OHOS::Rosen { static const std::string TIME_OUT("timeout"); constexpr HiviewDFX::HiLogLabel LABEL = { LOG_CORE, HILOG_DOMAIN_WINDOW, "SceneSessionManager" }; -void SceneEventPublish::OnReceiveEvent(const EventFwk::CommonEventData &data) +void SceneEventPublish::OnReceiveEvent(const EventFwk::CommonEventData& data) { std::lock_guard lock(mutex_); std::ostringstream oss; @@ -36,7 +36,7 @@ void SceneEventPublish::OnReceiveEvent(const EventFwk::CommonEventData &data) cv_.notify_all(); } -std::string SceneEventPublish::GetDebugDumpInfo(std::chrono::milliseconds const &time) +std::string SceneEventPublish::GetDebugDumpInfo(std::chrono::milliseconds const& time) { std::unique_lock lock(mutex_); if (cv_.wait_for(lock, time, [&] { return valueReady_; })) { diff --git a/window_scene/session_manager/src/scene_input_manager.cpp b/window_scene/session_manager/src/scene_input_manager.cpp index 80a70beece..414912d529 100644 --- a/window_scene/session_manager/src/scene_input_manager.cpp +++ b/window_scene/session_manager/src/scene_input_manager.cpp @@ -150,7 +150,7 @@ bool IsEqualUiExtentionWindowInfo(const std::vector& a, const s return true; } -std::string DumpTransformInDisplayInfo(const std::vector &transform) +std::string DumpTransformInDisplayInfo(const std::vector& transform) { std::stringstream stream("["); for (float transformItem : transform) { diff --git a/window_scene/session_manager/src/scene_session_manager.cpp b/window_scene/session_manager/src/scene_session_manager.cpp index bfa2c4d492..eb604f873f 100644 --- a/window_scene/session_manager/src/scene_session_manager.cpp +++ b/window_scene/session_manager/src/scene_session_manager.cpp @@ -131,7 +131,7 @@ std::string GetCurrentTime() static_cast(tn.tv_nsec); return std::to_string(uTime); } -int Comp(const std::pair &a, const std::pair &b) +int Comp(const std::pair& a, const std::pair& b) { return a.first < b.first; } @@ -541,7 +541,7 @@ WSError SceneSessionManager::GetFreeMultiWindowEnableState(bool& enable) return WSError::WS_OK; } -WSError SceneSessionManager::SetSessionContinueState(const sptr &token, +WSError SceneSessionManager::SetSessionContinueState(const sptr& token, const ContinueState& continueState) { TLOGI(WmsLogTag::DEFAULT, "Enter"); @@ -1298,7 +1298,7 @@ sptr SceneSessionManager::CreateKeyboa return keyboardCb; } -WMError SceneSessionManager::CheckWindowId(int32_t windowId, int32_t &pid) +WMError SceneSessionManager::CheckWindowId(int32_t windowId, int32_t& pid) { if (!SessionPermission::IsSystemCalling()) { TLOGE(WmsLogTag::WMS_EVENT, "CheckWindowId permission denied!"); @@ -2122,7 +2122,7 @@ void SceneSessionManager::HandleCastScreenDisConnection(const sptr } } -WSError SceneSessionManager::RequestSceneSessionDestructionInner(sptr &scnSession, +WSError SceneSessionManager::RequestSceneSessionDestructionInner(sptr& scnSession, sptr scnSessionInfo, const bool needRemoveSession, const bool isForceClean) { auto persistentId = scnSession->GetPersistentId(); @@ -3014,7 +3014,7 @@ WSError SceneSessionManager::ProcessBackEvent() return WSError::WS_OK; } -WSError SceneSessionManager::InitUserInfo(int32_t userId, std::string &fileDir) +WSError SceneSessionManager::InitUserInfo(int32_t userId, std::string& fileDir) { if (userId == DEFAULT_USERID || fileDir.empty()) { TLOGE(WmsLogTag::WMS_MAIN, "params invalid"); @@ -4873,8 +4873,8 @@ void SceneSessionManager::NotifyFocusStatus(sptr& sceneSession, bo } } -int32_t SceneSessionManager::NotifyRssThawApp(const int32_t uid, const std::string &bundleName, - const std::string &reason) +int32_t SceneSessionManager::NotifyRssThawApp(const int32_t uid, const std::string& bundleName, + const std::string& reason) { uint32_t resType = ResourceSchedule::ResType::SYNC_RES_TYPE_THAW_ONE_APP; nlohmann::json payload; @@ -5698,7 +5698,7 @@ WSError SceneSessionManager::NotifyWaterMarkFlagChangedResult(bool hasWaterMark) return WSError::WS_OK; } -void SceneSessionManager::ProcessPreload(const AppExecFwk::AbilityInfo &abilityInfo) const +void SceneSessionManager::ProcessPreload(const AppExecFwk::AbilityInfo& abilityInfo) const { if (!bundleMgr_) { WLOGFE("bundle manager is nullptr."); @@ -5779,7 +5779,7 @@ void SceneSessionManager::NotifySessionMovedToFront(int32_t persistentId) } } -WSError SceneSessionManager::SetSessionLabel(const sptr &token, const std::string &label) +WSError SceneSessionManager::SetSessionLabel(const sptr& token, const std::string& label) { WLOGFI("Enter label: %{public}s", label.c_str()); auto task = [this, &token, &label]() { @@ -5800,8 +5800,8 @@ WSError SceneSessionManager::SetSessionLabel(const sptr &token, c return taskScheduler_->PostSyncTask(task, "SetSessionLabel"); } -WSError SceneSessionManager::SetSessionIcon(const sptr &token, - const std::shared_ptr &icon) +WSError SceneSessionManager::SetSessionIcon(const sptr& token, + const std::shared_ptr& icon) { WLOGFI("Enter"); if (!SessionPermission::JudgeCallerIsAllowedToUseSystemAPI()) { @@ -5831,7 +5831,7 @@ WSError SceneSessionManager::SetSessionIcon(const sptr &token, } WSError SceneSessionManager::IsValidSessionIds( - const std::vector &sessionIds, std::vector &results) + const std::vector& sessionIds, std::vector& results) { WLOGFI("Enter"); std::shared_lock lock(sceneSessionMapMutex_); @@ -6114,7 +6114,7 @@ std::string SceneSessionManager::AnonymizeDeviceId(const std::string& deviceId) return anonDeviceId; } -WSError SceneSessionManager::DumpSessionAll(std::vector &infos) +WSError SceneSessionManager::DumpSessionAll(std::vector& infos) { WLOGFI("Dump all session."); if (!SessionPermission::IsSystemCalling()) { @@ -6138,7 +6138,7 @@ WSError SceneSessionManager::DumpSessionAll(std::vector &infos) return taskScheduler_->PostSyncTask(task, "DumpSessionAll"); } -WSError SceneSessionManager::DumpSessionWithId(int32_t persistentId, std::vector &infos) +WSError SceneSessionManager::DumpSessionWithId(int32_t persistentId, std::vector& infos) { WLOGFI("Dump session with id %{public}d", persistentId); if (!SessionPermission::IsSystemCalling()) { @@ -6199,8 +6199,8 @@ __attribute__((no_sanitize("cfi"))) WSError SceneSessionManager::GetAllAbilityIn return GetAbilityInfosFromBundleInfo(bundleInfos, scbAbilityInfos); } -WSError SceneSessionManager::GetAbilityInfosFromBundleInfo(std::vector &bundleInfos, - std::vector &scbAbilityInfos) +WSError SceneSessionManager::GetAbilityInfosFromBundleInfo(std::vector& bundleInfos, + std::vector& scbAbilityInfos) { if (bundleInfos.empty()) { WLOGFE("bundleInfos is empty"); @@ -7333,7 +7333,7 @@ void SceneSessionManager::WindowDestroyNotifyVisibility(const sptr } } -sptr SceneSessionManager::FindSessionByToken(const sptr &token) +sptr SceneSessionManager::FindSessionByToken(const sptr& token) { if (token == nullptr) { TLOGW(WmsLogTag::DEFAULT, "token is nullptr"); @@ -7385,7 +7385,7 @@ void SceneSessionManager::PreloadInLakeApp(const std::string& bundleName) } } -WSError SceneSessionManager::PendingSessionToForeground(const sptr &token) +WSError SceneSessionManager::PendingSessionToForeground(const sptr& token) { TLOGI(WmsLogTag::DEFAULT, "Enter"); auto pid = IPCSkeleton::GetCallingRealPid(); @@ -7405,7 +7405,7 @@ WSError SceneSessionManager::PendingSessionToForeground(const sptrPostSyncTask(task, "PendingSessionToForeground"); } -WSError SceneSessionManager::PendingSessionToBackgroundForDelegator(const sptr &token) +WSError SceneSessionManager::PendingSessionToBackgroundForDelegator(const sptr& token) { auto task = [this, &token]() { auto session = FindSessionByToken(token); @@ -8086,7 +8086,7 @@ bool SceneSessionManager::IsSessionClearable(sptr scnSession) } WSError SceneSessionManager::RegisterIAbilityManagerCollaborator(int32_t type, - const sptr &impl) + const sptr& impl) { WLOGFI("type: %{public}d", type); auto isSaCall = SessionPermission::IsSACalling(); @@ -8485,7 +8485,7 @@ WSError SceneSessionManager::UpdateTitleInTargetPos(int32_t persistentId, bool i return sceneSession->UpdateTitleInTargetPos(isShow, height); } -void AppAnrListener::OnAppDebugStarted(const std::vector &debugInfos) +void AppAnrListener::OnAppDebugStarted(const std::vector& debugInfos) { WLOGFI("AppAnrListener OnAppDebugStarted"); if (debugInfos.empty()) { @@ -8495,7 +8495,7 @@ void AppAnrListener::OnAppDebugStarted(const std::vector::GetInstance()->SwitchAnr(false); } -void AppAnrListener::OnAppDebugStoped(const std::vector &debugInfos) +void AppAnrListener::OnAppDebugStoped(const std::vector& debugInfos) { WLOGFI("AppAnrListener OnAppDebugStoped"); if (debugInfos.empty()) { @@ -9410,7 +9410,7 @@ void SceneSessionManager::CacVisibleWindowNum() } if (isFullScreen) { std::for_each(visibleWindowNumInfo.begin(), visibleWindowNumInfo.end(), - [](auto &info) { info.visibleWindowNum = 1; }); + [](auto& info) { info.visibleWindowNum = 1; }); } std::unique_lock lock(lastInfoMutex_); if (visibleWindowNumInfo.size() > 0 && !IsVectorSame(lastInfo_, visibleWindowNumInfo)) { diff --git a/window_scene/session_manager/src/session_manager.cpp b/window_scene/session_manager/src/session_manager.cpp index 109409a3f6..208eb5045a 100644 --- a/window_scene/session_manager/src/session_manager.cpp +++ b/window_scene/session_manager/src/session_manager.cpp @@ -75,7 +75,7 @@ public: } void OnWMSConnectionChanged( - int32_t userId, int32_t screenId, bool isConnected, const sptr &sessionManagerService) override + int32_t userId, int32_t screenId, bool isConnected, const sptr& sessionManagerService) override { auto sms = iface_cast(sessionManagerService); SessionManager::GetInstance().OnWMSConnectionChanged(userId, screenId, isConnected, sms); @@ -276,7 +276,7 @@ void SessionManager::RecoverSessionManagerService(const sptr &sessionManagerService) +void SessionManager::OnUserSwitch(const sptr& sessionManagerService) { TLOGI(WmsLogTag::WMS_MULTI_USER, "User switched"); Clear(); diff --git a/window_scene/session_manager/src/session_manager_lite.cpp b/window_scene/session_manager/src/session_manager_lite.cpp index b54fad455b..ec049f82fe 100644 --- a/window_scene/session_manager/src/session_manager_lite.cpp +++ b/window_scene/session_manager/src/session_manager_lite.cpp @@ -33,7 +33,7 @@ public: explicit SessionManagerServiceLiteRecoverListener() = default; virtual int32_t OnRemoteRequest( - uint32_t code, MessageParcel &data, MessageParcel &reply, MessageOption &option) override + uint32_t code, MessageParcel& data, MessageParcel& reply, MessageOption& option) override { if (data.ReadInterfaceToken() != GetDescriptor()) { TLOGE(WmsLogTag::WMS_RECOVER, "InterfaceToken check failed"); @@ -246,7 +246,7 @@ void SessionManagerLite::OnWMSConnectionChanged( OnWMSConnectionChangedCallback(userId, screenId, isConnected, isCallbackRegistered); } -void SessionManagerLite::OnUserSwitch(const sptr &sessionManagerService) +void SessionManagerLite::OnUserSwitch(const sptr& sessionManagerService) { TLOGI(WmsLogTag::WMS_MULTI_USER, "User switched Lite"); { diff --git a/window_scene/session_manager/src/zidl/scene_session_manager_lite_proxy.cpp b/window_scene/session_manager/src/zidl/scene_session_manager_lite_proxy.cpp index 28ad03b0e0..4c5005c3a8 100644 --- a/window_scene/session_manager/src/zidl/scene_session_manager_lite_proxy.cpp +++ b/window_scene/session_manager/src/zidl/scene_session_manager_lite_proxy.cpp @@ -25,7 +25,7 @@ constexpr HiviewDFX::HiLogLabel LABEL = {LOG_CORE, HILOG_DOMAIN_WINDOW, "SceneSe constexpr int32_t MAX_TOPN_INFO_SIZE = 200; } -WSError SceneSessionManagerLiteProxy::SetSessionLabel(const sptr &token, const std::string &label) +WSError SceneSessionManagerLiteProxy::SetSessionLabel(const sptr& token, const std::string& label) { WLOGFD("run SceneSessionManagerLiteProxy::SetSessionLabel"); MessageParcel data; @@ -57,8 +57,8 @@ WSError SceneSessionManagerLiteProxy::SetSessionLabel(const sptr return static_cast(reply.ReadInt32()); } -WSError SceneSessionManagerLiteProxy::SetSessionIcon(const sptr &token, - const std::shared_ptr &icon) +WSError SceneSessionManagerLiteProxy::SetSessionIcon(const sptr& token, + const std::shared_ptr& icon) { WLOGFD("run SceneSessionManagerLiteProxy::SetSessionIcon"); MessageParcel data; @@ -91,7 +91,7 @@ WSError SceneSessionManagerLiteProxy::SetSessionIcon(const sptr & } WSError SceneSessionManagerLiteProxy::IsValidSessionIds( - const std::vector &sessionIds, std::vector &results) + const std::vector& sessionIds, std::vector& results) { WLOGFD("run SceneSessionManagerLiteProxy::IsValidSessionIds"); MessageParcel data; @@ -121,7 +121,7 @@ WSError SceneSessionManagerLiteProxy::IsValidSessionIds( return static_cast(reply.ReadInt32()); } -WSError SceneSessionManagerLiteProxy::PendingSessionToForeground(const sptr &token) +WSError SceneSessionManagerLiteProxy::PendingSessionToForeground(const sptr& token) { WLOGFD("run SceneSessionManagerLiteProxy::PendingSessionToForeground"); MessageParcel data; @@ -151,7 +151,7 @@ WSError SceneSessionManagerLiteProxy::PendingSessionToForeground(const sptr(reply.ReadInt32()); } -WSError SceneSessionManagerLiteProxy::PendingSessionToBackgroundForDelegator(const sptr &token) +WSError SceneSessionManagerLiteProxy::PendingSessionToBackgroundForDelegator(const sptr& token) { WLOGFD("run SceneSessionManagerLiteProxy::PendingSessionToBackgroundForDelegator"); MessageParcel data; @@ -413,7 +413,7 @@ WSError SceneSessionManagerLiteProxy::TerminateSessionNew(const sptr(reply.ReadInt32()); } -WSError SceneSessionManagerLiteProxy::GetFocusSessionToken(sptr &token) +WSError SceneSessionManagerLiteProxy::GetFocusSessionToken(sptr& token) { WLOGFD("run SceneSessionManagerLiteProxy::GetFocusSessionToken"); MessageParcel data; @@ -513,7 +513,7 @@ WSError SceneSessionManagerLiteProxy::GetSessionSnapshot(const std::string& devi return static_cast(reply.ReadInt32()); } -WSError SceneSessionManagerLiteProxy::SetSessionContinueState(const sptr &token, +WSError SceneSessionManagerLiteProxy::SetSessionContinueState(const sptr& token, const ContinueState& continueState) { MessageParcel data; @@ -820,7 +820,7 @@ WMError SceneSessionManagerLiteProxy::UnregisterWindowManagerAgent(WindowManager return static_cast(reply.ReadInt32()); } -WMError SceneSessionManagerLiteProxy::CheckWindowId(int32_t windowId, int32_t &pid) +WMError SceneSessionManagerLiteProxy::CheckWindowId(int32_t windowId, int32_t& pid) { MessageParcel data; MessageParcel reply; diff --git a/window_scene/session_manager/src/zidl/scene_session_manager_lite_stub.cpp b/window_scene/session_manager/src/zidl/scene_session_manager_lite_stub.cpp index 08ccda6c26..8cc4dfeec2 100644 --- a/window_scene/session_manager/src/zidl/scene_session_manager_lite_stub.cpp +++ b/window_scene/session_manager/src/zidl/scene_session_manager_lite_stub.cpp @@ -26,7 +26,7 @@ constexpr uint32_t MAX_TOPN_INFO_SIZE = 200; } int SceneSessionManagerLiteStub::OnRemoteRequest(uint32_t code, - MessageParcel &data, MessageParcel &reply, MessageOption &option) + MessageParcel& data, MessageParcel& reply, MessageOption& option) { WLOGFD("Scene session on remote request!, code: %{public}u", code); if (data.ReadInterfaceToken() != GetDescriptor()) { @@ -118,7 +118,7 @@ int SceneSessionManagerLiteStub::ProcessRemoteRequest(uint32_t code, MessageParc } } -int SceneSessionManagerLiteStub::HandleSetSessionLabel(MessageParcel &data, MessageParcel &reply) +int SceneSessionManagerLiteStub::HandleSetSessionLabel(MessageParcel& data, MessageParcel& reply) { WLOGFD("run HandleSetSessionLabel!"); sptr token = data.ReadRemoteObject(); @@ -128,7 +128,7 @@ int SceneSessionManagerLiteStub::HandleSetSessionLabel(MessageParcel &data, Mess return ERR_NONE; } -int SceneSessionManagerLiteStub::HandleSetSessionIcon(MessageParcel &data, MessageParcel &reply) +int SceneSessionManagerLiteStub::HandleSetSessionIcon(MessageParcel& data, MessageParcel& reply) { WLOGFD("run HandleSetSessionIcon!"); sptr token = data.ReadRemoteObject(); @@ -142,7 +142,7 @@ int SceneSessionManagerLiteStub::HandleSetSessionIcon(MessageParcel &data, Messa return ERR_NONE; } -int SceneSessionManagerLiteStub::HandleIsValidSessionIds(MessageParcel &data, MessageParcel &reply) +int SceneSessionManagerLiteStub::HandleIsValidSessionIds(MessageParcel& data, MessageParcel& reply) { WLOGFD("run HandleIsValidSessionIds!"); std::vector sessionIds; @@ -154,7 +154,7 @@ int SceneSessionManagerLiteStub::HandleIsValidSessionIds(MessageParcel &data, Me return ERR_NONE; } -int SceneSessionManagerLiteStub::HandlePendingSessionToForeground(MessageParcel &data, MessageParcel &reply) +int SceneSessionManagerLiteStub::HandlePendingSessionToForeground(MessageParcel& data, MessageParcel& reply) { WLOGFD("run HandlePendingSessionToForeground!"); sptr token = data.ReadRemoteObject(); @@ -163,7 +163,7 @@ int SceneSessionManagerLiteStub::HandlePendingSessionToForeground(MessageParcel return ERR_NONE; } -int SceneSessionManagerLiteStub::HandlePendingSessionToBackgroundForDelegator(MessageParcel &data, MessageParcel &reply) +int SceneSessionManagerLiteStub::HandlePendingSessionToBackgroundForDelegator(MessageParcel& data, MessageParcel& reply) { WLOGFD("run HandlePendingSessionToBackground!"); sptr token = data.ReadRemoteObject(); @@ -271,7 +271,7 @@ int SceneSessionManagerLiteStub::HandleTerminateSessionNew(MessageParcel& data, return ERR_NONE; } -int SceneSessionManagerLiteStub::HandleGetFocusSessionToken(MessageParcel &data, MessageParcel &reply) +int SceneSessionManagerLiteStub::HandleGetFocusSessionToken(MessageParcel& data, MessageParcel& reply) { WLOGFD("run HandleGetFocusSessionToken!"); sptr token = nullptr; @@ -291,7 +291,7 @@ int SceneSessionManagerLiteStub::HandleGetFocusSessionElement(MessageParcel& dat return ERR_NONE; } -int SceneSessionManagerLiteStub::HandleSetSessionContinueState(MessageParcel &data, MessageParcel &reply) +int SceneSessionManagerLiteStub::HandleSetSessionContinueState(MessageParcel& data, MessageParcel& reply) { WLOGFD("HandleSetSessionContinueState"); sptr token = data.ReadRemoteObject(); @@ -301,7 +301,7 @@ int SceneSessionManagerLiteStub::HandleSetSessionContinueState(MessageParcel &da return ERR_NONE; } -int SceneSessionManagerLiteStub::HandleGetSessionSnapshot(MessageParcel &data, MessageParcel &reply) +int SceneSessionManagerLiteStub::HandleGetSessionSnapshot(MessageParcel& data, MessageParcel& reply) { WLOGFD("run HandleGetSessionSnapshot!"); std::string deviceId = Str16ToStr8(data.ReadString16()); @@ -314,7 +314,7 @@ int SceneSessionManagerLiteStub::HandleGetSessionSnapshot(MessageParcel &data, M return ERR_NONE; } -int SceneSessionManagerLiteStub::HandleClearSession(MessageParcel &data, MessageParcel &reply) +int SceneSessionManagerLiteStub::HandleClearSession(MessageParcel& data, MessageParcel& reply) { WLOGFD("run HandleClearSession!"); int32_t persistentId = data.ReadInt32(); @@ -323,7 +323,7 @@ int SceneSessionManagerLiteStub::HandleClearSession(MessageParcel &data, Message return ERR_NONE; } -int SceneSessionManagerLiteStub::HandleClearAllSessions(MessageParcel &data, MessageParcel &reply) +int SceneSessionManagerLiteStub::HandleClearAllSessions(MessageParcel& data, MessageParcel& reply) { WLOGFD("run HandleClearAllSessions!"); WSError ret = ClearAllSessions(); @@ -331,7 +331,7 @@ int SceneSessionManagerLiteStub::HandleClearAllSessions(MessageParcel &data, Mes return ERR_NONE; } -int SceneSessionManagerLiteStub::HandleLockSession(MessageParcel &data, MessageParcel &reply) +int SceneSessionManagerLiteStub::HandleLockSession(MessageParcel& data, MessageParcel& reply) { WLOGFD("run HandleLockSession!"); int32_t sessionId = data.ReadInt32(); @@ -340,7 +340,7 @@ int SceneSessionManagerLiteStub::HandleLockSession(MessageParcel &data, MessageP return ERR_NONE; } -int SceneSessionManagerLiteStub::HandleUnlockSession(MessageParcel &data, MessageParcel &reply) +int SceneSessionManagerLiteStub::HandleUnlockSession(MessageParcel& data, MessageParcel& reply) { WLOGFD("run HandleUnlockSession!"); int32_t sessionId = data.ReadInt32(); @@ -349,7 +349,7 @@ int SceneSessionManagerLiteStub::HandleUnlockSession(MessageParcel &data, Messag return ERR_NONE; } -int SceneSessionManagerLiteStub::HandleMoveSessionsToForeground(MessageParcel &data, MessageParcel &reply) +int SceneSessionManagerLiteStub::HandleMoveSessionsToForeground(MessageParcel& data, MessageParcel& reply) { WLOGFD("run HandleMoveSessionsToForeground!"); std::vector sessionIds; @@ -360,7 +360,7 @@ int SceneSessionManagerLiteStub::HandleMoveSessionsToForeground(MessageParcel &d return ERR_NONE; } -int SceneSessionManagerLiteStub::HandleMoveSessionsToBackground(MessageParcel &data, MessageParcel &reply) +int SceneSessionManagerLiteStub::HandleMoveSessionsToBackground(MessageParcel& data, MessageParcel& reply) { WLOGFD("run HandleMoveSessionsToBackground!"); std::vector sessionIds; @@ -382,7 +382,7 @@ int SceneSessionManagerLiteStub::HandleGetFocusSessionInfo(MessageParcel& data, return ERR_NONE; } -int SceneSessionManagerLiteStub::HandleCheckWindowId(MessageParcel &data, MessageParcel &reply) +int SceneSessionManagerLiteStub::HandleCheckWindowId(MessageParcel& data, MessageParcel& reply) { WLOGFI("run HandleCheckWindowId!"); int32_t windowId = INVALID_WINDOW_ID; @@ -404,7 +404,7 @@ int SceneSessionManagerLiteStub::HandleCheckWindowId(MessageParcel &data, Messag } -int SceneSessionManagerLiteStub::HandleRegisterWindowManagerAgent(MessageParcel &data, MessageParcel &reply) +int SceneSessionManagerLiteStub::HandleRegisterWindowManagerAgent(MessageParcel& data, MessageParcel& reply) { auto type = static_cast(data.ReadUint32()); WLOGFI("run HandleRegisterWindowManagerAgent!, type=%{public}u", static_cast(type)); @@ -416,7 +416,7 @@ int SceneSessionManagerLiteStub::HandleRegisterWindowManagerAgent(MessageParcel return ERR_NONE; } -int SceneSessionManagerLiteStub::HandleUnregisterWindowManagerAgent(MessageParcel &data, MessageParcel &reply) +int SceneSessionManagerLiteStub::HandleUnregisterWindowManagerAgent(MessageParcel& data, MessageParcel& reply) { auto type = static_cast(data.ReadUint32()); WLOGFI("run HandleUnregisterWindowManagerAgent!, type=%{public}u", static_cast(type)); @@ -453,7 +453,7 @@ int SceneSessionManagerLiteStub::HandleGetWindowModeType(MessageParcel& data, Me return ERR_NONE; } -int SceneSessionManagerLiteStub::HandleGetMainWinodowInfo(MessageParcel &data, MessageParcel &reply) +int SceneSessionManagerLiteStub::HandleGetMainWinodowInfo(MessageParcel& data, MessageParcel& reply) { TLOGI(WmsLogTag::WMS_MAIN, "run HandleGetMainWinodowInfo lite"); int32_t topN = 0; diff --git a/window_scene/session_manager/src/zidl/scene_session_manager_proxy.cpp b/window_scene/session_manager/src/zidl/scene_session_manager_proxy.cpp index 8895d0822a..ed5d618441 100644 --- a/window_scene/session_manager/src/zidl/scene_session_manager_proxy.cpp +++ b/window_scene/session_manager/src/zidl/scene_session_manager_proxy.cpp @@ -641,7 +641,7 @@ void SceneSessionManagerProxy::GetFocusWindowInfo(FocusChangeInfo& focusInfo) } } -WSError SceneSessionManagerProxy::SetSessionLabel(const sptr &token, const std::string &label) +WSError SceneSessionManagerProxy::SetSessionLabel(const sptr& token, const std::string& label) { WLOGFI("run SceneSessionManagerProxy::SetSessionLabel"); MessageParcel data; @@ -673,8 +673,8 @@ WSError SceneSessionManagerProxy::SetSessionLabel(const sptr &tok return static_cast(reply.ReadInt32()); } -WSError SceneSessionManagerProxy::SetSessionIcon(const sptr &token, - const std::shared_ptr &icon) +WSError SceneSessionManagerProxy::SetSessionIcon(const sptr& token, + const std::shared_ptr& icon) { WLOGFI("run SceneSessionManagerProxy::SetSessionIcon"); MessageParcel data; @@ -707,7 +707,7 @@ WSError SceneSessionManagerProxy::SetSessionIcon(const sptr &toke } WSError SceneSessionManagerProxy::IsValidSessionIds( - const std::vector &sessionIds, std::vector &results) + const std::vector& sessionIds, std::vector& results) { WLOGFI("run SceneSessionManagerProxy::IsValidSessionIds"); MessageParcel data; @@ -802,7 +802,7 @@ WMError SceneSessionManagerProxy::GetUnreliableWindowInfo(int32_t windowId, return static_cast(reply.ReadInt32()); } -WSError SceneSessionManagerProxy::PendingSessionToForeground(const sptr &token) +WSError SceneSessionManagerProxy::PendingSessionToForeground(const sptr& token) { WLOGFI("run SceneSessionManagerProxy::PendingSessionToForeground"); MessageParcel data; @@ -831,7 +831,7 @@ WSError SceneSessionManagerProxy::PendingSessionToForeground(const sptr(reply.ReadInt32()); } -WSError SceneSessionManagerProxy::PendingSessionToBackgroundForDelegator(const sptr &token) +WSError SceneSessionManagerProxy::PendingSessionToBackgroundForDelegator(const sptr& token) { WLOGFI("run SceneSessionManagerProxy::PendingSessionToBackgroundForDelegator"); MessageParcel data; @@ -1034,7 +1034,7 @@ WSError SceneSessionManagerProxy::GetSessionInfoByContinueSessionId( return static_cast(reply.ReadInt32()); } -WSError SceneSessionManagerProxy::DumpSessionAll(std::vector &infos) +WSError SceneSessionManagerProxy::DumpSessionAll(std::vector& infos) { WLOGFI("run SceneSessionManagerProxy::DumpSessionAll"); MessageParcel data; @@ -1061,7 +1061,7 @@ WSError SceneSessionManagerProxy::DumpSessionAll(std::vector &infos return static_cast(reply.ReadInt32()); } -WSError SceneSessionManagerProxy::DumpSessionWithId(int32_t persistentId, std::vector &infos) +WSError SceneSessionManagerProxy::DumpSessionWithId(int32_t persistentId, std::vector& infos) { WLOGFI("run SceneSessionManagerProxy::DumpSessionWithId"); MessageParcel data; @@ -1150,7 +1150,7 @@ WSError SceneSessionManagerProxy::TerminateSessionNew(const sptr(reply.ReadInt32()); } -WSError SceneSessionManagerProxy::GetFocusSessionToken(sptr &token) +WSError SceneSessionManagerProxy::GetFocusSessionToken(sptr& token) { WLOGFD("run SceneSessionManagerProxy::GetFocusSessionToken"); MessageParcel data; @@ -1207,7 +1207,7 @@ WSError SceneSessionManagerProxy::GetFocusSessionElement(AppExecFwk::ElementName return static_cast(reply.ReadInt32()); } -WMError SceneSessionManagerProxy::CheckWindowId(int32_t windowId, int32_t &pid) +WMError SceneSessionManagerProxy::CheckWindowId(int32_t windowId, int32_t& pid) { MessageParcel data; MessageParcel reply; @@ -1348,7 +1348,7 @@ WSError SceneSessionManagerProxy::GetUIContentRemoteObj(int32_t persistentId, sp return static_cast(reply.ReadUint32()); } -WSError SceneSessionManagerProxy::SetSessionContinueState(const sptr &token, +WSError SceneSessionManagerProxy::SetSessionContinueState(const sptr& token, const ContinueState& continueState) { MessageParcel data; @@ -1595,7 +1595,7 @@ WSError SceneSessionManagerProxy::ClearAllSessions() } WSError SceneSessionManagerProxy::RegisterIAbilityManagerCollaborator(int32_t type, - const sptr &impl) + const sptr& impl) { WLOGFI("run SceneSessionManagerProxy::RegisterIAbilityManagerCollaborator"); if (!impl) { diff --git a/window_scene/session_manager/src/zidl/scene_session_manager_stub.cpp b/window_scene/session_manager/src/zidl/scene_session_manager_stub.cpp index 318a25ccaf..069a189899 100644 --- a/window_scene/session_manager/src/zidl/scene_session_manager_stub.cpp +++ b/window_scene/session_manager/src/zidl/scene_session_manager_stub.cpp @@ -25,7 +25,7 @@ constexpr uint32_t MAX_VECTOR_SIZE = 100; } int SceneSessionManagerStub::OnRemoteRequest(uint32_t code, - MessageParcel &data, MessageParcel &reply, MessageOption &option) + MessageParcel& data, MessageParcel& reply, MessageOption& option) { WLOGFD("Scene session on remote request!, code: %{public}u", code); if (data.ReadInterfaceToken() != GetDescriptor()) { @@ -174,7 +174,7 @@ int SceneSessionManagerStub::ProcessRemoteRequest(uint32_t code, MessageParcel& } } -int SceneSessionManagerStub::HandleCreateAndConnectSpecificSession(MessageParcel &data, MessageParcel &reply) +int SceneSessionManagerStub::HandleCreateAndConnectSpecificSession(MessageParcel& data, MessageParcel& reply) { WLOGFI("run HandleCreateAndConnectSpecificSession!"); sptr sessionStageObject = data.ReadRemoteObject(); @@ -216,7 +216,7 @@ int SceneSessionManagerStub::HandleCreateAndConnectSpecificSession(MessageParcel return ERR_NONE; } -int SceneSessionManagerStub::HandleRecoverAndConnectSpecificSession(MessageParcel &data, MessageParcel &reply) +int SceneSessionManagerStub::HandleRecoverAndConnectSpecificSession(MessageParcel& data, MessageParcel& reply) { TLOGI(WmsLogTag::WMS_RECOVER, "run!"); sptr sessionStageObject = data.ReadRemoteObject(); @@ -310,7 +310,7 @@ int SceneSessionManagerStub::HandleDestroyAndDisconnectSpcificSessionWithDetachC return ERR_NONE; } -int SceneSessionManagerStub::HandleRequestFocusStatus(MessageParcel &data, MessageParcel &reply) +int SceneSessionManagerStub::HandleRequestFocusStatus(MessageParcel& data, MessageParcel& reply) { WLOGFI("run"); int32_t persistentId = data.ReadInt32(); @@ -320,7 +320,7 @@ int SceneSessionManagerStub::HandleRequestFocusStatus(MessageParcel &data, Messa return ERR_NONE; } -int SceneSessionManagerStub::HandleRegisterWindowManagerAgent(MessageParcel &data, MessageParcel &reply) +int SceneSessionManagerStub::HandleRegisterWindowManagerAgent(MessageParcel& data, MessageParcel& reply) { auto type = static_cast(data.ReadUint32()); WLOGFI("run HandleRegisterWindowManagerAgent!, type=%{public}u", static_cast(type)); @@ -332,7 +332,7 @@ int SceneSessionManagerStub::HandleRegisterWindowManagerAgent(MessageParcel &dat return ERR_NONE; } -int SceneSessionManagerStub::HandleUnregisterWindowManagerAgent(MessageParcel &data, MessageParcel &reply) +int SceneSessionManagerStub::HandleUnregisterWindowManagerAgent(MessageParcel& data, MessageParcel& reply) { auto type = static_cast(data.ReadUint32()); WLOGFI("run HandleUnregisterWindowManagerAgent!, type=%{public}u", static_cast(type)); @@ -344,7 +344,7 @@ int SceneSessionManagerStub::HandleUnregisterWindowManagerAgent(MessageParcel &d return ERR_NONE; } -int SceneSessionManagerStub::HandleGetFocusSessionInfo(MessageParcel &data, MessageParcel &reply) +int SceneSessionManagerStub::HandleGetFocusSessionInfo(MessageParcel& data, MessageParcel& reply) { WLOGFI("run HandleGetFocusSessionInfo!"); FocusChangeInfo focusInfo; @@ -353,7 +353,7 @@ int SceneSessionManagerStub::HandleGetFocusSessionInfo(MessageParcel &data, Mess return ERR_NONE; } -int SceneSessionManagerStub::HandleSetSessionLabel(MessageParcel &data, MessageParcel &reply) +int SceneSessionManagerStub::HandleSetSessionLabel(MessageParcel& data, MessageParcel& reply) { WLOGFI("run HandleSetSessionLabel!"); sptr token = data.ReadRemoteObject(); @@ -363,7 +363,7 @@ int SceneSessionManagerStub::HandleSetSessionLabel(MessageParcel &data, MessageP return ERR_NONE; } -int SceneSessionManagerStub::HandleSetSessionIcon(MessageParcel &data, MessageParcel &reply) +int SceneSessionManagerStub::HandleSetSessionIcon(MessageParcel& data, MessageParcel& reply) { WLOGFI("run HandleSetSessionIcon!"); sptr token = data.ReadRemoteObject(); @@ -377,7 +377,7 @@ int SceneSessionManagerStub::HandleSetSessionIcon(MessageParcel &data, MessagePa return ERR_NONE; } -int SceneSessionManagerStub::HandleIsValidSessionIds(MessageParcel &data, MessageParcel &reply) +int SceneSessionManagerStub::HandleIsValidSessionIds(MessageParcel& data, MessageParcel& reply) { WLOGFI("run HandleIsValidSessionIds!"); std::vector sessionIds; @@ -387,7 +387,7 @@ int SceneSessionManagerStub::HandleIsValidSessionIds(MessageParcel &data, Messag return ERR_NONE; } -int SceneSessionManagerStub::HandlePendingSessionToForeground(MessageParcel &data, MessageParcel &reply) +int SceneSessionManagerStub::HandlePendingSessionToForeground(MessageParcel& data, MessageParcel& reply) { WLOGFI("run HandlePendingSessionToForeground!"); sptr token = data.ReadRemoteObject(); @@ -396,7 +396,7 @@ int SceneSessionManagerStub::HandlePendingSessionToForeground(MessageParcel &dat return ERR_NONE; } -int SceneSessionManagerStub::HandlePendingSessionToBackgroundForDelegator(MessageParcel &data, MessageParcel &reply) +int SceneSessionManagerStub::HandlePendingSessionToBackgroundForDelegator(MessageParcel& data, MessageParcel& reply) { WLOGFI("run HandlePendingSessionToBackground!"); sptr token = data.ReadRemoteObject(); @@ -539,7 +539,7 @@ int SceneSessionManagerStub::HandleTerminateSessionNew(MessageParcel& data, Mess return ERR_NONE; } -int SceneSessionManagerStub::HandleGetFocusSessionToken(MessageParcel &data, MessageParcel &reply) +int SceneSessionManagerStub::HandleGetFocusSessionToken(MessageParcel& data, MessageParcel& reply) { WLOGFD("run HandleGetFocusSessionToken!"); sptr token = nullptr; @@ -559,7 +559,7 @@ int SceneSessionManagerStub::HandleGetFocusSessionElement(MessageParcel& data, M return ERR_NONE; } -int SceneSessionManagerStub::HandleCheckWindowId(MessageParcel &data, MessageParcel &reply) +int SceneSessionManagerStub::HandleCheckWindowId(MessageParcel& data, MessageParcel& reply) { WLOGFI("run HandleCheckWindowId!"); int32_t windowId = INVALID_WINDOW_ID; @@ -580,7 +580,7 @@ int SceneSessionManagerStub::HandleCheckWindowId(MessageParcel &data, MessagePar return ERR_NONE; } -int SceneSessionManagerStub::HandleSetGestureNavigationEnabled(MessageParcel &data, MessageParcel &reply) +int SceneSessionManagerStub::HandleSetGestureNavigationEnabled(MessageParcel& data, MessageParcel& reply) { WLOGFI("run HandleSetGestureNavigationEnabled!"); bool enable = data.ReadBool(); @@ -589,7 +589,7 @@ int SceneSessionManagerStub::HandleSetGestureNavigationEnabled(MessageParcel &da return ERR_NONE; } -int SceneSessionManagerStub::HandleGetAccessibilityWindowInfo(MessageParcel &data, MessageParcel &reply) +int SceneSessionManagerStub::HandleGetAccessibilityWindowInfo(MessageParcel& data, MessageParcel& reply) { std::vector> infos; WMError errCode = GetAccessibilityWindowInfo(infos); @@ -619,7 +619,7 @@ int SceneSessionManagerStub::HandleGetUnreliableWindowInfo(MessageParcel& data, return ERR_NONE; } -int SceneSessionManagerStub::HandleSetSessionContinueState(MessageParcel &data, MessageParcel &reply) +int SceneSessionManagerStub::HandleSetSessionContinueState(MessageParcel& data, MessageParcel& reply) { WLOGFI("HandleSetSessionContinueState"); sptr token = data.ReadRemoteObject(); @@ -629,7 +629,7 @@ int SceneSessionManagerStub::HandleSetSessionContinueState(MessageParcel &data, return ERR_NONE; } -int SceneSessionManagerStub::HandleGetSessionDump(MessageParcel &data, MessageParcel &reply) +int SceneSessionManagerStub::HandleGetSessionDump(MessageParcel& data, MessageParcel& reply) { std::vector params; if (!data.ReadStringVector(¶ms)) { @@ -661,7 +661,7 @@ int SceneSessionManagerStub::HandleUpdateSessionAvoidAreaListener(MessageParcel& return ERR_NONE; } -int SceneSessionManagerStub::HandleGetSessionSnapshot(MessageParcel &data, MessageParcel &reply) +int SceneSessionManagerStub::HandleGetSessionSnapshot(MessageParcel& data, MessageParcel& reply) { WLOGFI("run HandleGetSessionSnapshot!"); std::string deviceId = Str16ToStr8(data.ReadString16()); @@ -696,7 +696,7 @@ int SceneSessionManagerStub::HandleGetUIContentRemoteObj(MessageParcel& data, Me return ERR_NONE; } -int SceneSessionManagerStub::HandleBindDialogTarget(MessageParcel &data, MessageParcel &reply) +int SceneSessionManagerStub::HandleBindDialogTarget(MessageParcel& data, MessageParcel& reply) { WLOGFI("run HandleBindDialogTarget!"); uint64_t persistentId = data.ReadUint64(); @@ -706,7 +706,7 @@ int SceneSessionManagerStub::HandleBindDialogTarget(MessageParcel &data, Message return ERR_NONE; } -int SceneSessionManagerStub::HandleNotifyDumpInfoResult(MessageParcel &data, MessageParcel &reply) +int SceneSessionManagerStub::HandleNotifyDumpInfoResult(MessageParcel& data, MessageParcel& reply) { WLOGFI("HandleNotifyDumpInfoResult"); std::vector info; @@ -730,7 +730,7 @@ int SceneSessionManagerStub::HandleNotifyDumpInfoResult(MessageParcel &data, Mes return ERR_NONE; } -int SceneSessionManagerStub::HandleClearSession(MessageParcel &data, MessageParcel &reply) +int SceneSessionManagerStub::HandleClearSession(MessageParcel& data, MessageParcel& reply) { WLOGFI("run HandleClearSession!"); int32_t persistentId = data.ReadInt32(); @@ -739,7 +739,7 @@ int SceneSessionManagerStub::HandleClearSession(MessageParcel &data, MessageParc return ERR_NONE; } -int SceneSessionManagerStub::HandleClearAllSessions(MessageParcel &data, MessageParcel &reply) +int SceneSessionManagerStub::HandleClearAllSessions(MessageParcel& data, MessageParcel& reply) { WLOGFI("run HandleClearAllSessions!"); WSError ret = ClearAllSessions(); @@ -747,7 +747,7 @@ int SceneSessionManagerStub::HandleClearAllSessions(MessageParcel &data, Message return ERR_NONE; } -int SceneSessionManagerStub::HandleLockSession(MessageParcel &data, MessageParcel &reply) +int SceneSessionManagerStub::HandleLockSession(MessageParcel& data, MessageParcel& reply) { WLOGFI("run HandleLockSession!"); int32_t sessionId = data.ReadInt32(); @@ -755,7 +755,7 @@ int SceneSessionManagerStub::HandleLockSession(MessageParcel &data, MessageParce reply.WriteUint32(static_cast(ret)); return ERR_NONE; } -int SceneSessionManagerStub::HandleUnlockSession(MessageParcel &data, MessageParcel &reply) +int SceneSessionManagerStub::HandleUnlockSession(MessageParcel& data, MessageParcel& reply) { WLOGFI("run HandleUnlockSession!"); int32_t sessionId = data.ReadInt32(); @@ -763,7 +763,7 @@ int SceneSessionManagerStub::HandleUnlockSession(MessageParcel &data, MessagePar reply.WriteUint32(static_cast(ret)); return ERR_NONE; } -int SceneSessionManagerStub::HandleMoveSessionsToForeground(MessageParcel &data, MessageParcel &reply) +int SceneSessionManagerStub::HandleMoveSessionsToForeground(MessageParcel& data, MessageParcel& reply) { WLOGFI("run HandleMoveSessionsToForeground!"); std::vector sessionIds; @@ -773,7 +773,7 @@ int SceneSessionManagerStub::HandleMoveSessionsToForeground(MessageParcel &data, reply.WriteUint32(static_cast(ret)); return ERR_NONE; } -int SceneSessionManagerStub::HandleMoveSessionsToBackground(MessageParcel &data, MessageParcel &reply) +int SceneSessionManagerStub::HandleMoveSessionsToBackground(MessageParcel& data, MessageParcel& reply) { WLOGFI("run HandleMoveSessionsToBackground!"); std::vector sessionIds; @@ -786,7 +786,7 @@ int SceneSessionManagerStub::HandleMoveSessionsToBackground(MessageParcel &data, return ERR_NONE; } -int SceneSessionManagerStub::HandleRegisterCollaborator(MessageParcel &data, MessageParcel &reply) +int SceneSessionManagerStub::HandleRegisterCollaborator(MessageParcel& data, MessageParcel& reply) { WLOGFI("run HandleRegisterCollaborator!"); int32_t type = data.ReadInt32(); @@ -797,7 +797,7 @@ int SceneSessionManagerStub::HandleRegisterCollaborator(MessageParcel &data, Mes return ERR_NONE; } -int SceneSessionManagerStub::HandleUnregisterCollaborator(MessageParcel &data, MessageParcel &reply) +int SceneSessionManagerStub::HandleUnregisterCollaborator(MessageParcel& data, MessageParcel& reply) { WLOGFI("run HandleUnregisterCollaborator!"); int32_t type = data.ReadInt32(); diff --git a/window_scene/session_manager_service/include/session_manager_service_stub.h b/window_scene/session_manager_service/include/session_manager_service_stub.h index 35155e2caa..50922f11fe 100644 --- a/window_scene/session_manager_service/include/session_manager_service_stub.h +++ b/window_scene/session_manager_service/include/session_manager_service_stub.h @@ -26,7 +26,7 @@ public: SessionManagerServiceStub() = default; virtual ~SessionManagerServiceStub() = default; - int OnRemoteRequest(uint32_t code, MessageParcel &data, MessageParcel &reply, MessageOption &option) override; + int OnRemoteRequest(uint32_t code, MessageParcel& data, MessageParcel& reply, MessageOption& option) override; }; } // namespace OHOS::Rosen diff --git a/window_scene/session_manager_service/src/session_manager_service_stub.cpp b/window_scene/session_manager_service/src/session_manager_service_stub.cpp index 4feb27683a..5ae760e219 100644 --- a/window_scene/session_manager_service/src/session_manager_service_stub.cpp +++ b/window_scene/session_manager_service/src/session_manager_service_stub.cpp @@ -22,8 +22,8 @@ namespace { constexpr HiviewDFX::HiLogLabel LABEL = { LOG_CORE, HILOG_DOMAIN_WINDOW, "SessionManagerServiceStub" }; } -int SessionManagerServiceStub::OnRemoteRequest(uint32_t code, MessageParcel &data, MessageParcel &reply, - MessageOption &option) +int SessionManagerServiceStub::OnRemoteRequest(uint32_t code, MessageParcel& data, MessageParcel& reply, + MessageOption& option) { WLOGFD("OnRemoteRequest code is %{public}u", code); if (data.ReadInterfaceToken() != GetDescriptor()) { diff --git a/window_scene/test/mock/mock_message_parcel.cpp b/window_scene/test/mock/mock_message_parcel.cpp index 0d6efb5599..e7d605645a 100644 --- a/window_scene/test/mock/mock_message_parcel.cpp +++ b/window_scene/test/mock/mock_message_parcel.cpp @@ -181,7 +181,7 @@ bool Parcel::WriteString16(const std::u16string& value) } #ifdef ENABLE_MOCK_READ_INT32 -bool Parcel::ReadInt32(int32_t &value) +bool Parcel::ReadInt32(int32_t& value) { if (g_setReadInt32ErrorFlag) { return false; @@ -191,7 +191,7 @@ bool Parcel::ReadInt32(int32_t &value) #endif #ifdef ENABLE_MOCK_READ_INT64 -bool Parcel::ReadInt64(int64_t &value) +bool Parcel::ReadInt64(int64_t& value) { if (g_setReadInt64ErrorFlag) { return false; diff --git a/window_scene/test/unittest/extension_session_test.cpp b/window_scene/test/unittest/extension_session_test.cpp index 88b8c13d82..4f4969e6d0 100644 --- a/window_scene/test/unittest/extension_session_test.cpp +++ b/window_scene/test/unittest/extension_session_test.cpp @@ -483,9 +483,9 @@ HWTEST_F(ExtensionSessionTest, TransferKeyEventForConsumed01, Function | SmallTe extensionSession_->channelListener_ = new (std::nothrow) WindowEventChannelListener(); ASSERT_NE(extensionSession_->channelListener_, nullptr); EXPECT_CALL(*mockEventChannel_, TransferKeyEventForConsumedAsync) - .WillOnce([](const std::shared_ptr &keyEvent, + .WillOnce([](const std::shared_ptr& keyEvent, bool isPreImeEvent, - const sptr &listener) { + const sptr& listener) { auto channelListener = iface_cast(listener); channelListener->OnTransferKeyEventForConsumed(keyEvent->GetId(), isPreImeEvent, true, WSError::WS_OK); return WSError::WS_OK; diff --git a/window_scene/test/unittest/scene_session_lifecycle_test.cpp b/window_scene/test/unittest/scene_session_lifecycle_test.cpp index 3d1d598f3f..5e2d2ce38f 100644 --- a/window_scene/test/unittest/scene_session_lifecycle_test.cpp +++ b/window_scene/test/unittest/scene_session_lifecycle_test.cpp @@ -88,7 +88,7 @@ HWTEST_F(SceneSessionLifecycleTest, Foreground01, Function | SmallTest | Level2) auto result = sceneSession->Foreground(property); ASSERT_EQ(result, WSError::WS_OK); - specificCallback->onCreate_ = [&resultValue, specificCallback](const SessionInfo &info, + specificCallback->onCreate_ = [&resultValue, specificCallback](const SessionInfo& info, sptr property) -> sptr { sptr scensessionreturn = new (std::nothrow) SceneSession(info, specificCallback); @@ -270,7 +270,7 @@ HWTEST_F(SceneSessionLifecycleTest, Background01, Function | SmallTest | Level2) sceneSession->isActive_ = true; auto result = sceneSession->Background(); ASSERT_EQ(result, WSError::WS_OK); - specificCallback->onCreate_ = [&resultValue, specificCallback](const SessionInfo &info, + specificCallback->onCreate_ = [&resultValue, specificCallback](const SessionInfo& info, sptr property) -> sptr { sptr scensessionreturn = new (std::nothrow) SceneSession(info, specificCallback); diff --git a/window_scene/test/unittest/scene_session_manager_lite_stub_test.cpp b/window_scene/test/unittest/scene_session_manager_lite_stub_test.cpp index a2c16b2b43..a7d5d62a13 100644 --- a/window_scene/test/unittest/scene_session_manager_lite_stub_test.cpp +++ b/window_scene/test/unittest/scene_session_manager_lite_stub_test.cpp @@ -126,7 +126,7 @@ class MockSceneSessionManagerLiteStub : public SceneSessionManagerLiteStub { void GetFocusWindowInfo(FocusChangeInfo& focusInfo) override { } - WMError CheckWindowId(int32_t windowId, int32_t &pid) override + WMError CheckWindowId(int32_t windowId, int32_t& pid) override { return WMError::WM_OK; } diff --git a/wm/include/window_adapter.h b/wm/include/window_adapter.h index 92a9b27840..76759a9ceb 100644 --- a/wm/include/window_adapter.h +++ b/wm/include/window_adapter.h @@ -64,7 +64,7 @@ public: const sptr& windowManagerAgent); virtual WMError UnregisterWindowManagerAgent(WindowManagerAgentType type, const sptr& windowManagerAgent); - virtual WMError CheckWindowId(int32_t windowId, int32_t &pid); + virtual WMError CheckWindowId(int32_t windowId, int32_t& pid); virtual WMError SetWindowAnimationController(const sptr& controller); virtual WMError NotifyWindowTransition(sptr from, sptr to); @@ -84,8 +84,8 @@ public: virtual WMError SetGestureNavigaionEnabled(bool enable); virtual void DispatchKeyEvent(uint32_t windowId, std::shared_ptr event); virtual void NotifyDumpInfoResult(const std::vector& info); - virtual WMError DumpSessionAll(std::vector &infos); - virtual WMError DumpSessionWithId(int32_t persistentId, std::vector &infos); + virtual WMError DumpSessionAll(std::vector& infos); + virtual WMError DumpSessionWithId(int32_t persistentId, std::vector& infos); virtual WMError GetUIContentRemoteObj(int32_t persistentId, sptr& uiContentRemoteObj); virtual WMError GetWindowAnimationTargets(std::vector missionIds, std::vector>& targets); diff --git a/wm/include/window_adapter_lite.h b/wm/include/window_adapter_lite.h index f8e27dd9e8..99db211077 100644 --- a/wm/include/window_adapter_lite.h +++ b/wm/include/window_adapter_lite.h @@ -41,7 +41,7 @@ public: const sptr& windowManagerAgent); virtual WMError UnregisterWindowManagerAgent(WindowManagerAgentType type, const sptr& windowManagerAgent); - virtual WMError CheckWindowId(int32_t windowId, int32_t &pid); + virtual WMError CheckWindowId(int32_t windowId, int32_t& pid); virtual WMError GetVisibilityWindowInfo(std::vector>& infos); virtual void ClearWindowAdapter(); virtual WMError GetWindowModeType(WindowModeType& windowModeType); diff --git a/wm/include/window_session_impl.h b/wm/include/window_session_impl.h index b50da1b250..ed5a502c41 100644 --- a/wm/include/window_session_impl.h +++ b/wm/include/window_session_impl.h @@ -390,7 +390,7 @@ private: void NotifyRotationAnimationEnd(); void SubmitNoInteractionMonitorTask(int32_t eventId, const IWindowNoInteractionListenerSptr& listener); bool IsUserOrientation(Orientation orientation) const; - void GetTitleButtonVisible(bool isPC, bool &hideMaximizeButton, bool &hideMinimizeButton, bool &hideSplitButton); + void GetTitleButtonVisible(bool isPC, bool& hideMaximizeButton, bool& hideMinimizeButton, bool& hideSplitButton); WMError GetAppForceLandscapeConfig(AppForceLandscapeConfig& config); void SetForceSplitEnable(bool isForceSplit, const std::string& homePage = ""); bool IsNotifyInteractiveDuplicative(bool interactive); diff --git a/wm/include/zidl/window_stub.h b/wm/include/zidl/window_stub.h index 7efcd7edc6..57d9218740 100644 --- a/wm/include/zidl/window_stub.h +++ b/wm/include/zidl/window_stub.h @@ -26,8 +26,8 @@ public: WindowStub() = default; ~WindowStub() = default; - virtual int OnRemoteRequest(uint32_t code, MessageParcel &data, MessageParcel &reply, - MessageOption &option) override; + virtual int OnRemoteRequest(uint32_t code, MessageParcel& data, MessageParcel& reply, + MessageOption& option) override; private: static inline const class StaticDestroyMonitor { diff --git a/wm/src/window_adapter.cpp b/wm/src/window_adapter.cpp index 5cbe527b16..5f06ca3954 100644 --- a/wm/src/window_adapter.cpp +++ b/wm/src/window_adapter.cpp @@ -157,7 +157,7 @@ WMError WindowAdapter::UnregisterWindowManagerAgent(WindowManagerAgentType type, return ret; } -WMError WindowAdapter::CheckWindowId(int32_t windowId, int32_t &pid) +WMError WindowAdapter::CheckWindowId(int32_t windowId, int32_t& pid) { INIT_PROXY_CHECK_RETURN(WMError::WM_ERROR_SAMGR); @@ -613,7 +613,7 @@ void WindowAdapter::NotifyDumpInfoResult(const std::vector& info) wmsProxy->NotifyDumpInfoResult(info); } -WMError WindowAdapter::DumpSessionAll(std::vector &infos) +WMError WindowAdapter::DumpSessionAll(std::vector& infos) { INIT_PROXY_CHECK_RETURN(WMError::WM_ERROR_SAMGR); @@ -622,7 +622,7 @@ WMError WindowAdapter::DumpSessionAll(std::vector &infos) return static_cast(wmsProxy->DumpSessionAll(infos)); } -WMError WindowAdapter::DumpSessionWithId(int32_t persistentId, std::vector &infos) +WMError WindowAdapter::DumpSessionWithId(int32_t persistentId, std::vector& infos) { INIT_PROXY_CHECK_RETURN(WMError::WM_ERROR_SAMGR); diff --git a/wm/src/window_adapter_lite.cpp b/wm/src/window_adapter_lite.cpp index 3cd4cd0e1c..09c51d9b9b 100644 --- a/wm/src/window_adapter_lite.cpp +++ b/wm/src/window_adapter_lite.cpp @@ -112,7 +112,7 @@ void WindowAdapterLite::ReregisterWindowManagerLiteAgent() } } -WMError WindowAdapterLite::CheckWindowId(int32_t windowId, int32_t &pid) +WMError WindowAdapterLite::CheckWindowId(int32_t windowId, int32_t& pid) { INIT_PROXY_CHECK_RETURN(WMError::WM_ERROR_SAMGR); diff --git a/wm/src/window_manager.cpp b/wm/src/window_manager.cpp index d6743a235f..830695c631 100644 --- a/wm/src/window_manager.cpp +++ b/wm/src/window_manager.cpp @@ -581,7 +581,7 @@ WMError WindowManager::SetWindowLayoutMode(WindowLayoutMode mode) return ret; } -WMError WindowManager::RegisterWindowUpdateListener(const sptr &listener) +WMError WindowManager::RegisterWindowUpdateListener(const sptr& listener) { if (listener == nullptr) { WLOGFE("listener could not be null"); @@ -1053,7 +1053,7 @@ WMError WindowManager::GetVisibilityWindowInfo(std::vector &infos) +WMError WindowManager::DumpSessionAll(std::vector& infos) { WMError ret = SingletonContainer::Get().DumpSessionAll(infos); if (ret != WMError::WM_OK) { @@ -1062,7 +1062,7 @@ WMError WindowManager::DumpSessionAll(std::vector &infos) return ret; } -WMError WindowManager::DumpSessionWithId(int32_t persistentId, std::vector &infos) +WMError WindowManager::DumpSessionWithId(int32_t persistentId, std::vector& infos) { WMError ret = SingletonContainer::Get().DumpSessionWithId(persistentId, infos); if (ret != WMError::WM_OK) { diff --git a/wm/src/window_session_impl.cpp b/wm/src/window_session_impl.cpp index 1b861df774..8d8c41596b 100644 --- a/wm/src/window_session_impl.cpp +++ b/wm/src/window_session_impl.cpp @@ -688,8 +688,8 @@ void WindowSessionImpl::NotifyRotationAnimationEnd() uiContent->NotifyRotationAnimationEnd(); } -void WindowSessionImpl::GetTitleButtonVisible(bool isPC, bool &hideMaximizeButton, bool &hideMinimizeButton, - bool &hideSplitButton) +void WindowSessionImpl::GetTitleButtonVisible(bool isPC, bool& hideMaximizeButton, bool& hideMinimizeButton, + bool& hideSplitButton) { if (!isPC) { return; diff --git a/wm/src/zidl/window_stub.cpp b/wm/src/zidl/window_stub.cpp index 1043cd766c..35f803b1d7 100644 --- a/wm/src/zidl/window_stub.cpp +++ b/wm/src/zidl/window_stub.cpp @@ -27,7 +27,7 @@ namespace { constexpr HiviewDFX::HiLogLabel LABEL = {LOG_CORE, HILOG_DOMAIN_WINDOW, "WindowStub"}; } -int WindowStub::OnRemoteRequest(uint32_t code, MessageParcel &data, MessageParcel &reply, MessageOption &option) +int WindowStub::OnRemoteRequest(uint32_t code, MessageParcel& data, MessageParcel& reply, MessageOption& option) { if (staticDestroyMonitor_.IsDestroyed()) { WLOGFE("Main thread finished, static data has been destroyed"); diff --git a/wm/test/unittest/window_extension_session_impl_test.cpp b/wm/test/unittest/window_extension_session_impl_test.cpp index c17f37a5b7..a386e24643 100644 --- a/wm/test/unittest/window_extension_session_impl_test.cpp +++ b/wm/test/unittest/window_extension_session_impl_test.cpp @@ -422,7 +422,7 @@ HWTEST_F(WindowExtensionSessionImplTest, NotifyTransferComponentData02, Function ASSERT_NE(nullptr, window_->hostSession_); ASSERT_NE(nullptr, window_->property_); window_->property_->SetPersistentId(1); - NotifyTransferComponentDataFunc func = [](const AAFwk::WantParams &wantParams) -> AAFwk::WantParams { + NotifyTransferComponentDataFunc func = [](const AAFwk::WantParams& wantParams) -> AAFwk::WantParams { AAFwk::WantParams retWantParams; return retWantParams; }; @@ -456,7 +456,7 @@ HWTEST_F(WindowExtensionSessionImplTest, NotifyTransferComponentDataSync02, Func ASSERT_NE(nullptr, window_->hostSession_); ASSERT_NE(nullptr, window_->property_); window_->property_->SetPersistentId(1); - NotifyTransferComponentDataForResultFunc func = [](const AAFwk::WantParams &wantParams) -> AAFwk::WantParams { + NotifyTransferComponentDataForResultFunc func = [](const AAFwk::WantParams& wantParams) -> AAFwk::WantParams { AAFwk::WantParams retWantParams; return retWantParams; }; diff --git a/wm/test/unittest/window_scene_session_impl_test.cpp b/wm/test/unittest/window_scene_session_impl_test.cpp index 43affc1ece..7a9ef62614 100644 --- a/wm/test/unittest/window_scene_session_impl_test.cpp +++ b/wm/test/unittest/window_scene_session_impl_test.cpp @@ -34,7 +34,7 @@ using Mocker = SingletonMocker; class MockWindowChangeListener : public IWindowChangeListener { public: MOCK_METHOD3(OnSizeChange, - void(Rect rect, WindowSizeChangeReason reason, const std::shared_ptr &rsTransaction)); + void(Rect rect, WindowSizeChangeReason reason, const std::shared_ptr& rsTransaction)); }; class MockWindowLifeCycleListener : public IWindowLifeCycle { diff --git a/wm/test/unittest/window_session_impl_test2.cpp b/wm/test/unittest/window_session_impl_test2.cpp index 9a62c7bb3c..e0c1db031f 100644 --- a/wm/test/unittest/window_session_impl_test2.cpp +++ b/wm/test/unittest/window_session_impl_test2.cpp @@ -1443,7 +1443,7 @@ HWTEST_F(WindowSessionImplTest2, RegisterSubWindowCloseListeners01, Function | S class MockISubWindowCloseListener : public ISubWindowCloseListener { public: - void OnSubWindowClose(bool &terminateCloseProcess) {} + void OnSubWindowClose(bool& terminateCloseProcess) {} }; window_ = GetTestWindowImpl("RegisterSubWindowCloseListeners01"); ASSERT_NE(window_, nullptr); diff --git a/wmserver/include/mock_session_manager_service.h b/wmserver/include/mock_session_manager_service.h index f41ab6ced5..d8c2461cfa 100644 --- a/wmserver/include/mock_session_manager_service.h +++ b/wmserver/include/mock_session_manager_service.h @@ -41,7 +41,7 @@ public: void UnregisterSMSLiteRecoverListener() override; void UnregisterSMSLiteRecoverListener(int32_t userId, int32_t pid); void OnStart() override; - int Dump(int fd, const std::vector &args) override; + int Dump(int fd, const std::vector& args) override; void NotifyWMSConnected(int32_t userId, int32_t screenId, bool isColdStart); void NotifyNotKillService() {} void GetProcessSurfaceNodeIdByPersistentId(const int32_t pid, diff --git a/wmserver/include/window_common_event.h b/wmserver/include/window_common_event.h index 0769c25a75..40fbde49af 100644 --- a/wmserver/include/window_common_event.h +++ b/wmserver/include/window_common_event.h @@ -36,7 +36,7 @@ public: private: class EventSubscriber : public EventFwk::CommonEventSubscriber { public: - EventSubscriber(const EventFwk::CommonEventSubscribeInfo &subscriberInfo, + EventSubscriber(const EventFwk::CommonEventSubscribeInfo& subscriberInfo, const std::shared_ptr& eventHandler) : EventFwk::CommonEventSubscriber(subscriberInfo), eventHandler_(eventHandler) {}; ~EventSubscriber() = default; diff --git a/wmserver/include/window_inner_manager.h b/wmserver/include/window_inner_manager.h index ae1293a966..99e9ddac48 100644 --- a/wmserver/include/window_inner_manager.h +++ b/wmserver/include/window_inner_manager.h @@ -49,11 +49,11 @@ public: EventPriority priority = EventPriority::LOW); // asynchronously calls the functions of AbilityManager - void MinimizeAbility(const wptr &node, bool isFromUser); - void TerminateAbility(const wptr &node); - void CloseAbility(const wptr &node); - void CompleteFirstFrameDrawing(const wptr &node); - void UpdateMissionSnapShot(const wptr &node, std::shared_ptr pixelMap); + void MinimizeAbility(const wptr& node, bool isFromUser); + void TerminateAbility(const wptr& node); + void CloseAbility(const wptr& node); + void CompleteFirstFrameDrawing(const wptr& node); + void UpdateMissionSnapShot(const wptr& node, std::shared_ptr pixelMap); void ConsumePointerEvent(const std::shared_ptr& pointerEvent); void NotifyDisplayLimitRectChange(const std::map& limitRectMap); diff --git a/wmserver/include/window_manager_service.h b/wmserver/include/window_manager_service.h index 3a7035cce2..6a6bf09ebe 100644 --- a/wmserver/include/window_manager_service.h +++ b/wmserver/include/window_manager_service.h @@ -85,7 +85,7 @@ public: using Task = std::function; void OnStart() override; void OnStop() override; - void OnAddSystemAbility(int32_t systemAbilityId, const std::string &deviceId) override; + void OnAddSystemAbility(int32_t systemAbilityId, const std::string& deviceId) override; int Dump(int fd, const std::vector& args) override; WMError CreateWindow(sptr& window, sptr& property, diff --git a/wmserver/include/window_node_container.h b/wmserver/include/window_node_container.h index 5ea5b9d479..dd472a848d 100644 --- a/wmserver/include/window_node_container.h +++ b/wmserver/include/window_node_container.h @@ -84,8 +84,8 @@ public: void SetBelowScreenlockVisible(sptr& node, bool visible); void ProcessWindowStateChange(WindowState state, WindowStateChangeReason reason); void NotifySystemBarTints(std::vector displayIdVec); - WMError MinimizeAppNodeExceptOptions(MinimizeReason reason, const std::vector &exceptionalIds = {}, - const std::vector &exceptionalModes = {}); + WMError MinimizeAppNodeExceptOptions(MinimizeReason reason, const std::vector& exceptionalIds = {}, + const std::vector& exceptionalModes = {}); WMError SetWindowMode(sptr& node, WindowMode dstMode); WMError SwitchLayoutPolicy(WindowLayoutMode mode, DisplayId displayId, bool reorder = false); void RaiseSplitRelatedWindowToTop(sptr& node); diff --git a/wmserver/include/window_snapshot/snapshot_controller.h b/wmserver/include/window_snapshot/snapshot_controller.h index 440eb747b8..7de2d23975 100644 --- a/wmserver/include/window_snapshot/snapshot_controller.h +++ b/wmserver/include/window_snapshot/snapshot_controller.h @@ -35,7 +35,7 @@ public: : windowRoot_(root), handler_(handler), performReport_(new PerformReporter("GET_SNAPSHOT_TIME", {25, 35, 50, 200})) {}; ~SnapshotController() = default; - int32_t GetSnapshot(const sptr &token, AAFwk::Snapshot& snapshot) override; + int32_t GetSnapshot(const sptr& token, AAFwk::Snapshot& snapshot) override; private: sptr windowRoot_; diff --git a/wmserver/include/window_snapshot/snapshot_proxy.h b/wmserver/include/window_snapshot/snapshot_proxy.h index cf433d53c2..d99c002055 100644 --- a/wmserver/include/window_snapshot/snapshot_proxy.h +++ b/wmserver/include/window_snapshot/snapshot_proxy.h @@ -27,7 +27,7 @@ class SnapshotProxy : public IRemoteProxy { public: explicit SnapshotProxy(const sptr& impl) : IRemoteProxy(impl) {}; ~SnapshotProxy() = default; - int32_t GetSnapshot(const sptr &token, AAFwk::Snapshot& snapshot) override; + int32_t GetSnapshot(const sptr& token, AAFwk::Snapshot& snapshot) override; private: static inline BrokerDelegator delegator_; diff --git a/wmserver/include/window_snapshot/snapshot_stub.h b/wmserver/include/window_snapshot/snapshot_stub.h index 76dc374a21..a22e8fe453 100644 --- a/wmserver/include/window_snapshot/snapshot_stub.h +++ b/wmserver/include/window_snapshot/snapshot_stub.h @@ -27,8 +27,8 @@ class SnapshotStub : public IRemoteStub { public: SnapshotStub() = default; ~SnapshotStub() = default; - virtual int32_t OnRemoteRequest(uint32_t code, MessageParcel &data, MessageParcel &reply, - MessageOption &option) override; + virtual int32_t OnRemoteRequest(uint32_t code, MessageParcel& data, MessageParcel& reply, + MessageOption& option) override; }; } } diff --git a/wmserver/include/zidl/mock_session_manager_service_stub.h b/wmserver/include/zidl/mock_session_manager_service_stub.h index 35c5c21fa1..a147693de6 100644 --- a/wmserver/include/zidl/mock_session_manager_service_stub.h +++ b/wmserver/include/zidl/mock_session_manager_service_stub.h @@ -25,8 +25,8 @@ class MockSessionManagerServiceStub : public IRemoteStub event) = 0; virtual void NotifyDumpInfoResult(const std::vector& info) {}; - virtual WSError DumpSessionAll(std::vector &infos) { return WSError::WS_OK; } - virtual WSError DumpSessionWithId(int32_t persistentId, std::vector &infos) { return WSError::WS_OK; } + virtual WSError DumpSessionAll(std::vector& infos) { return WSError::WS_OK; } + virtual WSError DumpSessionWithId(int32_t persistentId, std::vector& infos) { return WSError::WS_OK; } virtual WSError GetUIContentRemoteObj(int32_t persistentId, sptr& uiContentRemoteObj) { return WSError::WS_OK; @@ -147,7 +147,7 @@ public: virtual void SetMaximizeMode(MaximizeMode maximizeMode) = 0; virtual MaximizeMode GetMaximizeMode() = 0; virtual void GetFocusWindowInfo(FocusChangeInfo& focusInfo) = 0; - virtual WMError CheckWindowId(int32_t windowId, int32_t &pid) { return WMError::WM_OK; } + virtual WMError CheckWindowId(int32_t windowId, int32_t& pid) { return WMError::WM_OK; } virtual WSError UpdateSessionAvoidAreaListener(int32_t& persistentId, bool haveListener) { return WSError::WS_OK; } virtual WSError UpdateSessionTouchOutsideListener(int32_t& persistentId, bool haveListener) { diff --git a/wmserver/include/zidl/window_manager_lite_interface.h b/wmserver/include/zidl/window_manager_lite_interface.h index ea7ebd21cb..b04ccd83c2 100644 --- a/wmserver/include/zidl/window_manager_lite_interface.h +++ b/wmserver/include/zidl/window_manager_lite_interface.h @@ -39,7 +39,7 @@ public: const sptr& windowManagerAgent) = 0; virtual WMError GetVisibilityWindowInfo(std::vector>& infos) { return WMError::WM_OK; }; virtual void GetFocusWindowInfo(FocusChangeInfo& focusInfo) = 0; - virtual WMError CheckWindowId(int32_t windowId, int32_t &pid) = 0; + virtual WMError CheckWindowId(int32_t windowId, int32_t& pid) = 0; virtual WMError GetWindowModeType(WindowModeType& windowModeType) { return WMError::WM_OK; } virtual WMError GetMainWindowInfos(int32_t topNum, std::vector& topNInfo) = 0; virtual WMError GetAllMainWindowInfos(std::vector& infos) = 0; diff --git a/wmserver/include/zidl/window_manager_stub.h b/wmserver/include/zidl/window_manager_stub.h index ca2e6294e4..8480dcd234 100644 --- a/wmserver/include/zidl/window_manager_stub.h +++ b/wmserver/include/zidl/window_manager_stub.h @@ -26,8 +26,8 @@ class WindowManagerStub : public IRemoteStub { public: WindowManagerStub() = default; ~WindowManagerStub() = default; - virtual int32_t OnRemoteRequest(uint32_t code, MessageParcel &data, MessageParcel &reply, - MessageOption &option) override; + virtual int32_t OnRemoteRequest(uint32_t code, MessageParcel& data, MessageParcel& reply, + MessageOption& option) override; }; } } diff --git a/wmserver/src/input_window_monitor.cpp b/wmserver/src/input_window_monitor.cpp index dca2e3d584..061f29be79 100644 --- a/wmserver/src/input_window_monitor.cpp +++ b/wmserver/src/input_window_monitor.cpp @@ -163,7 +163,7 @@ void InputWindowMonitor::TransformWindowRects(const sptr& windowNode } } -void InputWindowMonitor::TraverseWindowNodes(const std::vector> &windowNodes, +void InputWindowMonitor::TraverseWindowNodes(const std::vector>& windowNodes, std::vector& windowsInfo) { std::map> dialogWindowMap; diff --git a/wmserver/src/mock_session_manager_service.cpp b/wmserver/src/mock_session_manager_service.cpp index 54e49d25ad..59d870c5bc 100644 --- a/wmserver/src/mock_session_manager_service.cpp +++ b/wmserver/src/mock_session_manager_service.cpp @@ -158,7 +158,7 @@ static std::string Str16ToStr8(const std::u16string& str) return result == DEFAULT_STRING ? "" : result; } -int MockSessionManagerService::Dump(int fd, const std::vector &args) +int MockSessionManagerService::Dump(int fd, const std::vector& args) { WLOGI("dump begin fd: %{public}d", fd); if (fd < 0) { diff --git a/wmserver/src/window_inner_manager.cpp b/wmserver/src/window_inner_manager.cpp index b5a3b99129..6d38ba03ed 100644 --- a/wmserver/src/window_inner_manager.cpp +++ b/wmserver/src/window_inner_manager.cpp @@ -136,7 +136,7 @@ void WindowInnerManager::UpdateInnerWindow(DisplayId displayId, WindowType type, return; } -void WindowInnerManager::MinimizeAbility(const wptr &node, bool isFromUser) +void WindowInnerManager::MinimizeAbility(const wptr& node, bool isFromUser) { // asynchronously calls the MinimizeAbility of AbilityManager auto weakNode = node.promote(); @@ -157,7 +157,7 @@ void WindowInnerManager::MinimizeAbility(const wptr &node, bool isFr PostTask(task, "MinimizeAbility"); } -void WindowInnerManager::TerminateAbility(const wptr &node) +void WindowInnerManager::TerminateAbility(const wptr& node) { // asynchronously calls the TerminateAbility of AbilityManager auto weakNode = node.promote(); @@ -179,7 +179,7 @@ void WindowInnerManager::TerminateAbility(const wptr &node) PostTask(task, "TerminateAbility"); } -void WindowInnerManager::CloseAbility(const wptr &node) +void WindowInnerManager::CloseAbility(const wptr& node) { // asynchronously calls the CloseAbility of AbilityManager auto weakNode = node.promote(); @@ -201,7 +201,7 @@ void WindowInnerManager::CloseAbility(const wptr &node) PostTask(task, "CloseAbility"); } -void WindowInnerManager::CompleteFirstFrameDrawing(const wptr &node) +void WindowInnerManager::CompleteFirstFrameDrawing(const wptr& node) { // asynchronously calls the CloseAbility of AbilityManager auto weakNode = node.promote(); @@ -222,7 +222,7 @@ void WindowInnerManager::CompleteFirstFrameDrawing(const wptr &node) PostTask(task, "CompleteFirstFrameDrawing"); } -void WindowInnerManager::UpdateMissionSnapShot(const wptr &node, std::shared_ptr pixelMap) +void WindowInnerManager::UpdateMissionSnapShot(const wptr& node, std::shared_ptr pixelMap) { // asynchronously calls the UpdateMissionSnapShot of AbilityManager auto weakNode = node.promote(); @@ -343,7 +343,7 @@ void WindowInnerManager::StartWindowInfoReportLoop() isReportTaskStart_ = true; } -void WindowInnerManager::SetWindowRoot(const sptr &windowRoot) +void WindowInnerManager::SetWindowRoot(const sptr& windowRoot) { if (moveDragController_ != nullptr) { moveDragController_->SetWindowRoot(windowRoot); diff --git a/wmserver/src/window_manager_service.cpp b/wmserver/src/window_manager_service.cpp index 3a498eb424..225b597d8d 100644 --- a/wmserver/src/window_manager_service.cpp +++ b/wmserver/src/window_manager_service.cpp @@ -142,7 +142,7 @@ void WindowManagerService::PostVoidSyncTask(Task task, const std::string& taskNa } } -void WindowManagerService::OnAddSystemAbility(int32_t systemAbilityId, const std::string &deviceId) +void WindowManagerService::OnAddSystemAbility(int32_t systemAbilityId, const std::string& deviceId) { WLOGI("systemAbilityId: %{public}d, start", systemAbilityId); switch (systemAbilityId) { diff --git a/wmserver/src/window_node_container.cpp b/wmserver/src/window_node_container.cpp index 42d26a9416..08fec8dcfe 100644 --- a/wmserver/src/window_node_container.cpp +++ b/wmserver/src/window_node_container.cpp @@ -2155,7 +2155,7 @@ bool WindowNodeContainer::IsAppWindowsEmpty() const } WMError WindowNodeContainer::MinimizeAppNodeExceptOptions(MinimizeReason reason, - const std::vector &exceptionalIds, const std::vector &exceptionalModes) + const std::vector& exceptionalIds, const std::vector& exceptionalModes) { if (appWindowNode_->children_.empty()) { return WMError::WM_OK; diff --git a/wmserver/src/window_root.cpp b/wmserver/src/window_root.cpp index 45c56234e1..bf1e6c2ee9 100644 --- a/wmserver/src/window_root.cpp +++ b/wmserver/src/window_root.cpp @@ -41,7 +41,7 @@ namespace OHOS { namespace Rosen { namespace { constexpr HiviewDFX::HiLogLabel LABEL = {LOG_CORE, HILOG_DOMAIN_WINDOW, "Root"}; - int Comp(const std::pair &a, const std::pair &b) + int Comp(const std::pair& a, const std::pair& b) { return a.first < b.first; } diff --git a/wmserver/src/window_snapshot/snapshot_controller.cpp b/wmserver/src/window_snapshot/snapshot_controller.cpp index d5319232c6..3490a6512c 100644 --- a/wmserver/src/window_snapshot/snapshot_controller.cpp +++ b/wmserver/src/window_snapshot/snapshot_controller.cpp @@ -28,7 +28,7 @@ namespace { constexpr HiviewDFX::HiLogLabel LABEL = {LOG_CORE, HILOG_DOMAIN_DISPLAY, "SnapshotController"}; } -int32_t SnapshotController::GetSnapshot(const sptr &token, Snapshot& snapshot) +int32_t SnapshotController::GetSnapshot(const sptr& token, Snapshot& snapshot) { HITRACE_METER_FMT(HITRACE_TAG_WINDOW_MANAGER, "wms:GetSnapshot"); if (token == nullptr) { diff --git a/wmserver/src/window_snapshot/snapshot_proxy.cpp b/wmserver/src/window_snapshot/snapshot_proxy.cpp index 1e28d0051e..de4ddb05b6 100644 --- a/wmserver/src/window_snapshot/snapshot_proxy.cpp +++ b/wmserver/src/window_snapshot/snapshot_proxy.cpp @@ -25,7 +25,7 @@ namespace { constexpr HiviewDFX::HiLogLabel LABEL = {LOG_CORE, HILOG_DOMAIN_DISPLAY, "SnapshotProxy"}; } -int32_t SnapshotProxy::GetSnapshot(const sptr &token, AAFwk::Snapshot& snapshot) +int32_t SnapshotProxy::GetSnapshot(const sptr& token, AAFwk::Snapshot& snapshot) { MessageParcel data; MessageParcel reply; diff --git a/wmserver/src/window_snapshot/snapshot_stub.cpp b/wmserver/src/window_snapshot/snapshot_stub.cpp index 31071598bc..1271af05bb 100644 --- a/wmserver/src/window_snapshot/snapshot_stub.cpp +++ b/wmserver/src/window_snapshot/snapshot_stub.cpp @@ -24,8 +24,8 @@ namespace { constexpr HiviewDFX::HiLogLabel LABEL = {LOG_CORE, HILOG_DOMAIN_DISPLAY, "SnapshotStub"}; } -int32_t SnapshotStub::OnRemoteRequest(uint32_t code, MessageParcel &data, MessageParcel &reply, - MessageOption &option) +int32_t SnapshotStub::OnRemoteRequest(uint32_t code, MessageParcel& data, MessageParcel& reply, + MessageOption& option) { WLOGI("SnapshotStub::OnRemoteRequest code is %{public}u", code); if (data.ReadInterfaceToken() != GetDescriptor()) { diff --git a/wmserver/src/zidl/mock_session_manager_service_stub.cpp b/wmserver/src/zidl/mock_session_manager_service_stub.cpp index 08e6bd515a..2bfc308d5e 100644 --- a/wmserver/src/zidl/mock_session_manager_service_stub.cpp +++ b/wmserver/src/zidl/mock_session_manager_service_stub.cpp @@ -24,8 +24,8 @@ namespace { constexpr HiviewDFX::HiLogLabel LABEL = {LOG_CORE, HILOG_DOMAIN_WINDOW, "MockSessionManagerServiceStub"}; } -int32_t MockSessionManagerServiceStub::OnRemoteRequest(uint32_t code, MessageParcel &data, MessageParcel &reply, - MessageOption &option) +int32_t MockSessionManagerServiceStub::OnRemoteRequest(uint32_t code, MessageParcel& data, MessageParcel& reply, + MessageOption& option) { if (data.ReadInterfaceToken() != GetDescriptor()) { WLOGFE("InterfaceToken check failed"); diff --git a/wmserver/src/zidl/window_manager_stub.cpp b/wmserver/src/zidl/window_manager_stub.cpp index 832f9b28f1..8436efe4c4 100644 --- a/wmserver/src/zidl/window_manager_stub.cpp +++ b/wmserver/src/zidl/window_manager_stub.cpp @@ -29,8 +29,8 @@ namespace { constexpr HiviewDFX::HiLogLabel LABEL = {LOG_CORE, HILOG_DOMAIN_WINDOW, "WindowManagerStub"}; } -int32_t WindowManagerStub::OnRemoteRequest(uint32_t code, MessageParcel &data, MessageParcel &reply, - MessageOption &option) +int32_t WindowManagerStub::OnRemoteRequest(uint32_t code, MessageParcel& data, MessageParcel& reply, + MessageOption& option) { MemoryGuard cacheGuard; if (data.ReadInterfaceToken() != GetDescriptor()) {