diff --git a/interfaces/kits/napi/src/napi_accessibility_utils.cpp b/interfaces/kits/napi/src/napi_accessibility_utils.cpp index a28d20ae98ea883b927abf5aba4cf954fd8b7e10..4f38de15ea7a920a7df28fde9b3e67793c2ec648 100644 --- a/interfaces/kits/napi/src/napi_accessibility_utils.cpp +++ b/interfaces/kits/napi/src/napi_accessibility_utils.cpp @@ -818,7 +818,6 @@ std::string ConvertStringJSToNAPI(napi_env env, napi_value object, napi_value pr void ConvertStringArrayJSToNAPI(napi_env env, napi_value object, napi_value propertyNameValue, bool &hasProperty, std::vector &stringArray) { - std::string str = ""; napi_has_property(env, object, propertyNameValue, &hasProperty); if (hasProperty) { napi_value contentsValue = nullptr; @@ -828,7 +827,7 @@ void ConvertStringArrayJSToNAPI(napi_env env, napi_value object, napi_get_array_length(env, contentsValue, &dataLen); for (uint32_t i = 0; i < dataLen; i++) { napi_get_element(env, contentsValue, i, &data); - str = GetStringFromNAPI(env, data); + std::string str = GetStringFromNAPI(env, data); stringArray.push_back(str); } } @@ -941,7 +940,6 @@ bool ConvertEventInfoJSToNAPIPart3( { bool hasProperty = false; int32_t dataValue = 0; - std::string str = ""; napi_value propertyNameValue = nullptr; napi_create_string_utf8(env, "contents", NAPI_AUTO_LENGTH, &propertyNameValue); std::vector stringArray {}; @@ -953,9 +951,9 @@ bool ConvertEventInfoJSToNAPIPart3( } napi_create_string_utf8(env, "lastContent", NAPI_AUTO_LENGTH, &propertyNameValue); - str = ConvertStringJSToNAPI(env, object, propertyNameValue, hasProperty); + std::string strNapi = ConvertStringJSToNAPI(env, object, propertyNameValue, hasProperty); if (hasProperty) { - eventInfo.SetLatestContent(str); + eventInfo.SetLatestContent(strNapi); } napi_create_string_utf8(env, "beginIndex", NAPI_AUTO_LENGTH, &propertyNameValue); diff --git a/services/aams/src/accessibility_account_data.cpp b/services/aams/src/accessibility_account_data.cpp index 624352aff0e731a57fb305a5a83a01e88e98dbdc..a4506c5b0d5f4bc7e71963bca79c9c4f52559230 100644 --- a/services/aams/src/accessibility_account_data.cpp +++ b/services/aams/src/accessibility_account_data.cpp @@ -267,13 +267,13 @@ void AccessibilityAccountData::RemoveInstalledAbility(const std::string &bundleN for (auto it = installedAbilities_.begin(); it != installedAbilities_.end();) { if (it->GetPackageName() == bundleName) { HILOG_DEBUG("Removed %{public}s from InstalledAbility: ", bundleName.c_str()); - std::string targetName = ""; if (!config_) { it = installedAbilities_.erase(it); continue; } std::string name = config_->GetShortkeyTarget(); if (it->GetId() == name) { + std::string targetName = ""; config_->SetShortkeyTarget(targetName); config_->SetShortKeyState(false); }