From 69089f0d4ea3d25b22eb26d35f5d8317b06dab31 Mon Sep 17 00:00:00 2001 From: huangshiwei Date: Fri, 11 Nov 2022 15:47:25 +0800 Subject: [PATCH] huangshiwei4@huawei.com Signed-off-by: huangshiwei --- frameworks/js/napi/featureAbility/napi_context.cpp | 2 +- .../napi/featureAbility/napi_data_ability_helper.h | 8 ++++---- .../napi/inner/napi_common/napi_common_ability.cpp | 3 ++- frameworks/native/ability/native/ability.cpp | 6 +++--- .../native/ability/native/ability_process.cpp | 6 +++--- .../native/form_runtime/js_form_extension.cpp | 4 ++-- .../native/js_service_extension_context.cpp | 8 ++++---- .../ability/native/static_subscriber_proxy.cpp | 4 ++-- frameworks/native/runtime/source_map.cpp | 2 +- frameworks/native/runtime/utils/include/zip_file.h | 2 +- .../app_manager/include/appmgr/app_launch_data.h | 10 +++++----- .../include/connection_observer_proxy.h | 8 ++++---- .../include/dlp_connection_info.h | 8 ++++---- .../connectionobs_manager/include/dlp_state_data.h | 8 ++++---- interfaces/inner_api/runtime/include/source_map.h | 4 ++-- .../wantagent/include/want_agent_client.h | 4 ++-- interfaces/kits/native/ability/native/ability.h | 6 +++--- .../appkit/ability_runtime/app/js_ability_stage.h | 2 +- interfaces/kits/native/appkit/app/main_thread.h | 2 +- .../abilitymgr/include/ability_scheduler_proxy.h | 4 ++-- services/abilitymgr/include/app_scheduler.h | 6 +++--- .../abilitymgr/src/stop_user_callback_proxy.cpp | 14 +++++++------- .../abilitymgr/src/system_dialog_scheduler.cpp | 4 ++-- .../abilityattachtimeout_fuzzer.cpp | 2 +- .../abilityconnectionstub_fuzzer.cpp | 2 +- 25 files changed, 65 insertions(+), 64 deletions(-) diff --git a/frameworks/js/napi/featureAbility/napi_context.cpp b/frameworks/js/napi/featureAbility/napi_context.cpp index cdbe146f0d..10ae1f5340 100644 --- a/frameworks/js/napi/featureAbility/napi_context.cpp +++ b/frameworks/js/napi/featureAbility/napi_context.cpp @@ -3219,7 +3219,7 @@ void NapiJsContext::JsGetSelfPermissionsState(PermissionRequestTask &&task, permissionsState.emplace_back(permState.state); } HILOG_DEBUG("permissions size: %{public}zu. permissionsState size: %{public}zu", - permissionList.size(), permissionsState.size()); + permissionList.size(), permissionsState.size()); if (ret != TypePermissionOper::DYNAMIC_OPER) { HILOG_DEBUG("No dynamic popup required."); diff --git a/frameworks/js/napi/featureAbility/napi_data_ability_helper.h b/frameworks/js/napi/featureAbility/napi_data_ability_helper.h index 262b46dcf9..eaa1279537 100644 --- a/frameworks/js/napi/featureAbility/napi_data_ability_helper.h +++ b/frameworks/js/napi/featureAbility/napi_data_ability_helper.h @@ -209,12 +209,12 @@ napi_value RegisterWrap(napi_env env, napi_callback_info info, DAHelperOnOffCB * * @param env The environment that the Node-API call is invoked under. * @param args Indicates the arguments passed into the callback. * @param argcPromise Asynchronous data processing. - * @param insertCB Process data asynchronously. + * @param onCB Process data asynchronously. * * @return Return JS data successfully, otherwise return nullptr. */ napi_value RegisterAsync( - napi_env env, napi_value *args, size_t argcAsync, const size_t argcPromise, DAHelperOnOffCB *insertCB); + napi_env env, napi_value *args, size_t argcAsync, const size_t argcPromise, DAHelperOnOffCB *onCB); /** * @brief On asynchronous processing function. @@ -249,11 +249,11 @@ napi_value UnRegisterWrap(napi_env env, napi_callback_info info, DAHelperOnOffCB * @brief Off Async. * * @param env The environment that the Node-API call is invoked under. - * @param insertCB Process data asynchronously. + * @param offCB Process data asynchronously. * * @return Return JS data successfully, otherwise return nullptr. */ -napi_value UnRegisterSync(napi_env env, DAHelperOnOffCB *insertCB); +napi_value UnRegisterSync(napi_env env, DAHelperOnOffCB *offCB); /** * @brief Off asynchronous processing function. diff --git a/frameworks/js/napi/inner/napi_common/napi_common_ability.cpp b/frameworks/js/napi/inner/napi_common/napi_common_ability.cpp index ebc8dc23af..81ece4fabc 100644 --- a/frameworks/js/napi/inner/napi_common/napi_common_ability.cpp +++ b/frameworks/js/napi/inner/napi_common/napi_common_ability.cpp @@ -4982,7 +4982,8 @@ void JsNapiCommon::ChangeAbilityConnection(napi_ref *callbackArray, const napi_e napi_create_reference(env, jsMethod, 1, &callbackArray[PARAM2]); } -NativeValue* JsNapiCommon::JsGetContext(NativeEngine &engine, const NativeCallbackInfo &info, const AbilityType abilityType) +NativeValue* JsNapiCommon::JsGetContext( + NativeEngine &engine, const NativeCallbackInfo &info, const AbilityType abilityType) { if (!CheckAbilityType(abilityType)) { HILOG_ERROR("ability type error"); diff --git a/frameworks/native/ability/native/ability.cpp b/frameworks/native/ability/native/ability.cpp index 6bed49e86b..f1d0cdc1d9 100644 --- a/frameworks/native/ability/native/ability.cpp +++ b/frameworks/native/ability/native/ability.cpp @@ -508,14 +508,14 @@ void Ability::OnConfigurationUpdated(const Configuration &configuration) HILOG_DEBUG("%{public}s called.", __func__); } -void Ability::OnConfigurationUpdatedNotify(const Configuration &changeConfiguration) +void Ability::OnConfigurationUpdatedNotify(const Configuration &configuration) { HILOG_DEBUG("%{public}s begin.", __func__); std::string language; std::string colormode; std::string hasPointerDevice; - InitConfigurationProperties(changeConfiguration, language, colormode, hasPointerDevice); + InitConfigurationProperties(configuration, language, colormode, hasPointerDevice); // Notify ResourceManager std::unique_ptr resConfig(Global::Resource::CreateResConfig()); if (resConfig == nullptr) { @@ -550,7 +550,7 @@ void Ability::OnConfigurationUpdatedNotify(const Configuration &changeConfigurat abilityContext_->SetConfiguration(application_->GetConfiguration()); } // Notify Ability Subclass - OnConfigurationUpdated(changeConfiguration); + OnConfigurationUpdated(configuration); HILOG_DEBUG("%{public}s Notify Ability Subclass.", __func__); } diff --git a/frameworks/native/ability/native/ability_process.cpp b/frameworks/native/ability/native/ability_process.cpp index d2635da23f..5cfaca6692 100644 --- a/frameworks/native/ability/native/ability_process.cpp +++ b/frameworks/native/ability/native/ability_process.cpp @@ -61,7 +61,7 @@ AbilityProcess::AbilityProcess() AbilityProcess::~AbilityProcess() {} -ErrCode AbilityProcess::StartAbility(Ability *ability, CallAbilityParam param, CallbackInfo callback) +ErrCode AbilityProcess::StartAbility(Ability *ability, CallAbilityParam param, CallbackInfo callbackInfo) { HILOG_INFO("AbilityProcess::StartAbility begin"); if (ability == nullptr) { @@ -98,8 +98,8 @@ ErrCode AbilityProcess::StartAbility(Ability *ability, CallAbilityParam param, C HILOG_INFO("AbilityProcess::StartAbility ability: is in the abilityResultMap_"); map = it->second; } - callback.errCode = err; - map[param.requestCode] = callback; + callbackInfo.errCode = err; + map[param.requestCode] = callbackInfo; abilityResultMap_[ability] = map; } else { if (param.setting == nullptr) { diff --git a/frameworks/native/ability/native/form_runtime/js_form_extension.cpp b/frameworks/native/ability/native/form_runtime/js_form_extension.cpp index 193a0cb65d..a2a5ad6595 100644 --- a/frameworks/native/ability/native/form_runtime/js_form_extension.cpp +++ b/frameworks/native/ability/native/form_runtime/js_form_extension.cpp @@ -377,8 +377,8 @@ FormState JsFormExtension::OnAcquireFormState(const Want &want) } HILOG_INFO("%{public}s, state: %{public}d", __func__, state); - if (state <= static_cast(AppExecFwk::FormState::UNKNOWN) - || state > static_cast(AppExecFwk::FormState::READY)) { + if (state <= static_cast(AppExecFwk::FormState::UNKNOWN) || + state > static_cast(AppExecFwk::FormState::READY)) { return AppExecFwk::FormState::UNKNOWN; } else { return static_cast(state); diff --git a/frameworks/native/ability/native/js_service_extension_context.cpp b/frameworks/native/ability/native/js_service_extension_context.cpp index 7f4af264db..2034c39582 100644 --- a/frameworks/native/ability/native/js_service_extension_context.cpp +++ b/frameworks/native/ability/native/js_service_extension_context.cpp @@ -805,15 +805,15 @@ private: }; } // namespace -NativeValue* CreateJsMetadata(NativeEngine& engine, const AppExecFwk::Metadata &Info) +NativeValue* CreateJsMetadata(NativeEngine& engine, const AppExecFwk::Metadata &info) { HILOG_INFO("CreateJsMetadata"); NativeValue* objValue = engine.CreateObject(); NativeObject* object = ConvertNativeValueTo(objValue); - object->SetProperty("name", CreateJsValue(engine, Info.name)); - object->SetProperty("value", CreateJsValue(engine, Info.value)); - object->SetProperty("resource", CreateJsValue(engine, Info.resource)); + object->SetProperty("name", CreateJsValue(engine, info.name)); + object->SetProperty("value", CreateJsValue(engine, info.value)); + object->SetProperty("resource", CreateJsValue(engine, info.resource)); return objValue; } diff --git a/frameworks/native/ability/native/static_subscriber_proxy.cpp b/frameworks/native/ability/native/static_subscriber_proxy.cpp index e1640f71a8..0ecfd79c89 100644 --- a/frameworks/native/ability/native/static_subscriber_proxy.cpp +++ b/frameworks/native/ability/native/static_subscriber_proxy.cpp @@ -17,7 +17,7 @@ namespace OHOS { namespace AppExecFwk { -ErrCode StaticSubscriberProxy::OnReceiveEvent(CommonEventData* inData) +ErrCode StaticSubscriberProxy::OnReceiveEvent(CommonEventData* data) { MessageParcel data; MessageParcel reply; @@ -27,7 +27,7 @@ ErrCode StaticSubscriberProxy::OnReceiveEvent(CommonEventData* inData) return ERR_INVALID_VALUE; } - data.WriteParcelable(inData); + data.WriteParcelable(data); int32_t st = Remote()->SendRequest(COMMAND_ON_RECEIVE_EVENT, data, reply, option); if (st != ERR_NONE) { diff --git a/frameworks/native/runtime/source_map.cpp b/frameworks/native/runtime/source_map.cpp index d8a0b3feac..b7941c798c 100644 --- a/frameworks/native/runtime/source_map.cpp +++ b/frameworks/native/runtime/source_map.cpp @@ -454,7 +454,7 @@ std::string ModSourceMap::TranslateBySourceMap(const std::string& stackStr, ModS break; } static SourceMapData curMapData; - if(!bindSourceMaps.isStageModel) { + if (!bindSourceMaps.isStageModel) { if (i == 1) { // The non module scenario initializes curmapdata only at the first traversal if (!bindSourceMaps.nonModularMap_) { return NOT_FOUNDMAP + stackStr; diff --git a/frameworks/native/runtime/utils/include/zip_file.h b/frameworks/native/runtime/utils/include/zip_file.h index a2f88ad35e..5584b05b37 100755 --- a/frameworks/native/runtime/utils/include/zip_file.h +++ b/frameworks/native/runtime/utils/include/zip_file.h @@ -167,7 +167,7 @@ public: * @param start Indicates the zip content location start position. * @param length Indicates the zip content length. */ - void SetContentLocation(ZipPos start, size_t length); + void SetContentLocation(const ZipPos start, const size_t length); /** * @brief Get all entries in the zip file. * @param start Indicates the zip content location start position. diff --git a/interfaces/inner_api/app_manager/include/appmgr/app_launch_data.h b/interfaces/inner_api/app_manager/include/appmgr/app_launch_data.h index 26faf68e34..b86ca701eb 100644 --- a/interfaces/inner_api/app_manager/include/appmgr/app_launch_data.h +++ b/interfaces/inner_api/app_manager/include/appmgr/app_launch_data.h @@ -48,35 +48,35 @@ public: * * @param ApplicationInfo&, the current application info. */ - void SetApplicationInfo(const ApplicationInfo &); + void SetApplicationInfo(const ApplicationInfo &info); /** * @brief Setting information for the profile. * * @param Profile&, the current profile. */ - void SetProfile(const Profile &); + void SetProfile(const Profile &profile); /** * @brief Setting information for the process. * * @param Profile&, the current process info. */ - void SetProcessInfo(const ProcessInfo &); + void SetProcessInfo(const ProcessInfo &info); /** * @brief Setting id for app record. * * @param int32_t, the current app record id. */ - void SetRecordId(const int32_t); + void SetRecordId(const int32_t recordId); /** * @brief Setting id for User. * * @param int32_t, the current app User. */ - void SetUId(const int32_t); + void SetUId(const int32_t uId); /** * @brief set user test info. diff --git a/interfaces/inner_api/connectionobs_manager/include/connection_observer_proxy.h b/interfaces/inner_api/connectionobs_manager/include/connection_observer_proxy.h index 9d7b017dba..a66bc87ea6 100644 --- a/interfaces/inner_api/connectionobs_manager/include/connection_observer_proxy.h +++ b/interfaces/inner_api/connectionobs_manager/include/connection_observer_proxy.h @@ -32,13 +32,13 @@ public: virtual ~ConnectionObserverProxy() = default; - virtual void OnExtensionConnected(const ConnectionData &data) override; + virtual void OnExtensionConnected(const ConnectionData &connectionData) override; - virtual void OnExtensionDisconnected(const ConnectionData &data) override; + virtual void OnExtensionDisconnected(const ConnectionData &connectionData) override; - virtual void OnDlpAbilityOpened(const DlpStateData &data) override; + virtual void OnDlpAbilityOpened(const DlpStateData &dlpData) override; - virtual void OnDlpAbilityClosed(const DlpStateData &data) override; + virtual void OnDlpAbilityClosed(const DlpStateData &dlpData) override; private: static inline BrokerDelegator delegator_; diff --git a/interfaces/inner_api/connectionobs_manager/include/dlp_connection_info.h b/interfaces/inner_api/connectionobs_manager/include/dlp_connection_info.h index 153e0dd84a..4e49f20e82 100644 --- a/interfaces/inner_api/connectionobs_manager/include/dlp_connection_info.h +++ b/interfaces/inner_api/connectionobs_manager/include/dlp_connection_info.h @@ -32,16 +32,16 @@ struct DlpConnectionInfo : public Parcelable { /** * @brief Marshals this Sequenceable object into a Parcel. * - * @param outParcel Indicates the Parcel object to which the Sequenceable object will be marshaled. + * @param parcel Indicates the Parcel object to which the Sequenceable object will be marshaled. */ - virtual bool Marshalling(Parcel &outParcel) const override; + virtual bool Marshalling(Parcel &parcel) const override; /** * @brief Unmarshals this Sequenceable object from a Parcel. * - * @param inParcel Indicates the Parcel object into which the Sequenceable object has been marshaled. + * @param parcel Indicates the Parcel object into which the Sequenceable object has been marshaled. */ - static DlpConnectionInfo *Unmarshalling(Parcel &inParcel); + static DlpConnectionInfo *Unmarshalling(Parcel &parcel); int32_t dlpUid = 0; int32_t openedAbilityCount = 0; diff --git a/interfaces/inner_api/connectionobs_manager/include/dlp_state_data.h b/interfaces/inner_api/connectionobs_manager/include/dlp_state_data.h index d7fb9841b0..42d59b9789 100644 --- a/interfaces/inner_api/connectionobs_manager/include/dlp_state_data.h +++ b/interfaces/inner_api/connectionobs_manager/include/dlp_state_data.h @@ -32,16 +32,16 @@ struct DlpStateData : public Parcelable { /** * @brief Marshals this Sequenceable object into a Parcel. * - * @param outParcel Indicates the Parcel object to which the Sequenceable object will be marshaled. + * @param parcel Indicates the Parcel object to which the Sequenceable object will be marshaled. */ - virtual bool Marshalling(Parcel &outParcel) const override; + virtual bool Marshalling(Parcel &parcel) const override; /** * @brief Unmarshals this Sequenceable object from a Parcel. * - * @param inParcel Indicates the Parcel object into which the Sequenceable object has been marshaled. + * @param parcel Indicates the Parcel object into which the Sequenceable object has been marshaled. */ - static DlpStateData *Unmarshalling(Parcel &inParcel); + static DlpStateData *Unmarshalling(Parcel &parcel); int32_t targetPid = 0; int32_t targetUid = 0; diff --git a/interfaces/inner_api/runtime/include/source_map.h b/interfaces/inner_api/runtime/include/source_map.h index b52b4f096b..4a62e766d8 100644 --- a/interfaces/inner_api/runtime/include/source_map.h +++ b/interfaces/inner_api/runtime/include/source_map.h @@ -67,8 +67,8 @@ class ModSourceMap final { public: explicit ModSourceMap() = default; explicit ModSourceMap(const bool isStageModel) : isStageModel(isStageModel) {}; - explicit ModSourceMap(const std::string& bundleCodeDir, const bool isStageModel) : - isStageModel(isStageModel), bundleCodeDir_(bundleCodeDir) {}; + explicit ModSourceMap(const std::string& bundleCodeDir, const bool isStageModel) : isStageModel(isStageModel), + bundleCodeDir_(bundleCodeDir) {}; ~ModSourceMap() = default; static std::string TranslateBySourceMap(const std::string& stackStr, ModSourceMap& targetMaps, diff --git a/interfaces/inner_api/wantagent/include/want_agent_client.h b/interfaces/inner_api/wantagent/include/want_agent_client.h index 6b0bb90d2a..d96d5eeee6 100644 --- a/interfaces/inner_api/wantagent/include/want_agent_client.h +++ b/interfaces/inner_api/wantagent/include/want_agent_client.h @@ -50,9 +50,9 @@ public: ErrCode GetPendingWantType(const sptr &target, int32_t &type); - void RegisterCancelListener(const sptr &sender, const sptr &recevier); + void RegisterCancelListener(const sptr &sender, const sptr &receiver); - void UnregisterCancelListener(const sptr &sender, const sptr &recevier); + void UnregisterCancelListener(const sptr &sender, const sptr &receiver); ErrCode GetPendingRequestWant(const sptr &target, std::shared_ptr &want); diff --git a/interfaces/kits/native/ability/native/ability.h b/interfaces/kits/native/ability/native/ability.h index ef2c746f72..c43e530263 100644 --- a/interfaces/kits/native/ability/native/ability.h +++ b/interfaces/kits/native/ability/native/ability.h @@ -362,13 +362,13 @@ public: * code to identify the results returned by abilities. The value ranges from 0 to 65535. * @param resultCode Indicates the result code returned after the ability is started. You can define the result code * to identify an error. - * @param resultData Indicates the data returned after the ability is started. You can define the data returned. The + * @param want Indicates the data returned after the ability is started. You can define the data returned. The * value can be null. * */ - virtual void OnAbilityResult(int requestCode, int resultCode, const Want &resultData); + virtual void OnAbilityResult(int requestCode, int resultCode, const Want &want); - virtual void OnFeatureAbilityResult(int requestCode, int resultCode, const Want &resultData); + virtual void OnFeatureAbilityResult(int requestCode, int resultCode, const Want &want); /** * @brief Called back when the Back key is pressed. diff --git a/interfaces/kits/native/appkit/ability_runtime/app/js_ability_stage.h b/interfaces/kits/native/appkit/ability_runtime/app/js_ability_stage.h index 2a3f8db3e6..935d282da8 100644 --- a/interfaces/kits/native/appkit/ability_runtime/app/js_ability_stage.h +++ b/interfaces/kits/native/appkit/ability_runtime/app/js_ability_stage.h @@ -42,7 +42,7 @@ public: void OnConfigurationUpdated(const AppExecFwk::Configuration& configuration) override; - void OnMemoryLevel(int level) override; + void OnMemoryLevel(int32_t level) override; private: NativeValue* CallObjectMethod(const char* name, NativeValue * const * argv = nullptr, size_t argc = 0); diff --git a/interfaces/kits/native/appkit/app/main_thread.h b/interfaces/kits/native/appkit/app/main_thread.h index bb3456d10c..3bb46fa377 100644 --- a/interfaces/kits/native/appkit/app/main_thread.h +++ b/interfaces/kits/native/appkit/app/main_thread.h @@ -150,7 +150,7 @@ public: * * @param level Indicates the memory trim level, which shows the current memory usage status. */ - void ScheduleMemoryLevel(int level) override; + void ScheduleMemoryLevel(const int level) override; /** * diff --git a/services/abilitymgr/include/ability_scheduler_proxy.h b/services/abilitymgr/include/ability_scheduler_proxy.h index 5ef4d832c4..80e8fcedff 100644 --- a/services/abilitymgr/include/ability_scheduler_proxy.h +++ b/services/abilitymgr/include/ability_scheduler_proxy.h @@ -45,9 +45,9 @@ public: * ScheduleAbilityTransaction, schedule ability to transform life state. * * @param Want, Special Want for service type's ability. - * @param targetState, The lifecycle state to be transformed + * @param stateInfo, The lifecycle state to be transformed */ - void ScheduleAbilityTransaction(const Want &want, const LifeCycleStateInfo &targetState) override; + void ScheduleAbilityTransaction(const Want &want, const LifeCycleStateInfo &stateInfo) override; /* * SendResult, Send result to app when ability is terminated with result want. diff --git a/services/abilitymgr/include/app_scheduler.h b/services/abilitymgr/include/app_scheduler.h index caa72a1012..ee5b2d5026 100644 --- a/services/abilitymgr/include/app_scheduler.h +++ b/services/abilitymgr/include/app_scheduler.h @@ -113,13 +113,13 @@ public: * * @param token, the token of ability. * @param preToken, the token of ability's caller. - * @param abilityinfo, ability info. - * @param application, application info. + * @param abilityInfo, ability info. + * @param applicationInfo, application info. * @param want ability want * @return true on success ,false on failure. */ int LoadAbility(const sptr &token, const sptr &preToken, - const AppExecFwk::AbilityInfo &abilityinfo, const AppExecFwk::ApplicationInfo &application, + const AppExecFwk::AbilityInfo &abilityInfo, const AppExecFwk::ApplicationInfo &applicationInfo, const Want &want); /** diff --git a/services/abilitymgr/src/stop_user_callback_proxy.cpp b/services/abilitymgr/src/stop_user_callback_proxy.cpp index 49900108cc..99e1c2bf4d 100644 --- a/services/abilitymgr/src/stop_user_callback_proxy.cpp +++ b/services/abilitymgr/src/stop_user_callback_proxy.cpp @@ -21,26 +21,26 @@ namespace OHOS { namespace AAFwk { -void StopUserCallbackProxy::OnStopUserDone(int accountId, int errcode) +void StopUserCallbackProxy::OnStopUserDone(int userId, int errcode) { - SendRequestCommon(accountId, errcode, IStopUserCallback::StopUserCallbackCmd::ON_STOP_USER_DONE); + SendRequestCommon(userId, errcode, IStopUserCallback::StopUserCallbackCmd::ON_STOP_USER_DONE); } -void StopUserCallbackProxy::SendRequestCommon(int accountId, int errcode, IStopUserCallback::StopUserCallbackCmd cmd) +void StopUserCallbackProxy::SendRequestCommon(int userId, int errcode, IStopUserCallback::StopUserCallbackCmd cmd) { MessageParcel data; MessageParcel reply; MessageOption option; - HILOG_INFO("StopUserCallbackProxy, sendrequest, cmd:%{public}d, accountId:%{public}d, errcode:%{public}d", - cmd, accountId, errcode); + HILOG_INFO("StopUserCallbackProxy, sendrequest, cmd:%{public}d, userId:%{public}d, errcode:%{public}d", + cmd, userId, errcode); if (!data.WriteInterfaceToken(IStopUserCallback::GetDescriptor())) { HILOG_ERROR("Write interface token failed."); return; } - if (!data.WriteInt32(accountId)) { - HILOG_ERROR("Write accountId error."); + if (!data.WriteInt32(userId)) { + HILOG_ERROR("Write userId error."); return; } diff --git a/services/abilitymgr/src/system_dialog_scheduler.cpp b/services/abilitymgr/src/system_dialog_scheduler.cpp index 6cd51fa6a4..b625e384bc 100644 --- a/services/abilitymgr/src/system_dialog_scheduler.cpp +++ b/services/abilitymgr/src/system_dialog_scheduler.cpp @@ -279,8 +279,8 @@ void SystemDialogScheduler::GetDialogPositionAndSize(DialogType type, DialogPosi position.offsetX = (display->GetWidth() - position.width) / UI_HALF; position.offsetY = (display->GetHeight() - position.height) / UI_HALF; } else { - position.window_width = position.window_width/UI_HALF; - position.window_height = position.window_height/UI_HALF; + position.window_width = position.window_width / UI_HALF; + position.window_height = position.window_height / UI_HALF; position.offsetX = LINE_NUMS_ZERO; position.offsetY = LINE_NUMS_ZERO; } diff --git a/test/fuzztest/abilityattachtimeout_fuzzer/abilityattachtimeout_fuzzer.cpp b/test/fuzztest/abilityattachtimeout_fuzzer/abilityattachtimeout_fuzzer.cpp index 4201d4e0f9..df9da19438 100755 --- a/test/fuzztest/abilityattachtimeout_fuzzer/abilityattachtimeout_fuzzer.cpp +++ b/test/fuzztest/abilityattachtimeout_fuzzer/abilityattachtimeout_fuzzer.cpp @@ -31,7 +31,7 @@ namespace OHOS { namespace { constexpr size_t FOO_MAX_LEN = 1024; constexpr size_t U32_AT_SIZE = 4; -} +} sptr GetFuzzAbilityToken() { diff --git a/test/fuzztest/abilityconnectionstub_fuzzer/abilityconnectionstub_fuzzer.cpp b/test/fuzztest/abilityconnectionstub_fuzzer/abilityconnectionstub_fuzzer.cpp index 45e28b6a46..554637ea4b 100755 --- a/test/fuzztest/abilityconnectionstub_fuzzer/abilityconnectionstub_fuzzer.cpp +++ b/test/fuzztest/abilityconnectionstub_fuzzer/abilityconnectionstub_fuzzer.cpp @@ -28,7 +28,7 @@ namespace OHOS { namespace { constexpr size_t FOO_MAX_LEN = 1024; constexpr size_t U32_AT_SIZE = 4; -} +} const std::u16string ABILITYMGR_INTERFACE_TOKEN = u"ohos.abilityshell.DistributedConnection"; class AbilityConnectionStubFuzzTest : public AbilityConnectionStub {