diff --git a/services/include/input_method_system_ability.h b/services/include/input_method_system_ability.h index 09243a7..95db58a 100644 --- a/services/include/input_method_system_ability.h +++ b/services/include/input_method_system_ability.h @@ -56,7 +56,7 @@ namespace MiscServices { int32_t listInputMethod(std::vector *properties) override; int32_t listInputMethodByUserId(int32_t userId, std::vector *properties) override; int32_t listKeyboardType(const std::u16string& imeId, std::vector *types) override; - void GetInputMethodParam(std::vector properties_, std::string ¶ms_); + void GetInputMethodParam(std::vector properties, std::string ¶ms); int Dump(int fd, const std::vector &args) override; void DumpAllMethod(int fd); diff --git a/services/src/input_method_system_ability.cpp b/services/src/input_method_system_ability.cpp index ebf703c..f11fe4c 100644 --- a/services/src/input_method_system_ability.cpp +++ b/services/src/input_method_system_ability.cpp @@ -140,27 +140,27 @@ namespace MiscServices { } void InputMethodSystemAbility::GetInputMethodParam( - std::vector properties_, std::string ¶ms_) + std::vector properties, std::string ¶ms) { std::string defaultIme = ParaHandle::GetDefaultIme(userId_); std::vector::iterator it; - for (it = properties_.begin(); it < properties_.end(); ++it) { - if (it == properties_.begin()) { + for (it = properties.begin(); it < properties.end(); ++it) { + if (it == properties.begin()) { params_ += "{\"imeList\":["; } else { - params_ += "},"; + params += "},"; } InputMethodProperty *property = (InputMethodProperty *)*it; std::string imeId = Str16ToStr8(property->mPackageName) + "/" + Str16ToStr8(property->mAbilityName); - params_ += "{\"ime\": \"" + imeId + "\","; - params_ += "\"labelId\": \"" + std::to_string(property->labelId) + "\","; - params_ += "\"descriptionId\": \"" + std::to_string(property->descriptionId) + "\","; + params += "{\"ime\": \"" + imeId + "\","; + params += "\"labelId\": \"" + std::to_string(property->labelId) + "\","; + params += "\"descriptionId\": \"" + std::to_string(property->descriptionId) + "\","; std::string isDefaultIme = defaultIme == imeId ? "true" : "false"; - params_ += "\"isDefaultIme\": \"" + isDefaultIme + "\","; - params_ += "\"label\": \"" + Str16ToStr8(property->label) + "\","; - params_ += "\"description\": \"" + Str16ToStr8(property->description) + "\""; + params += "\"isDefaultIme\": \"" + isDefaultIme + "\","; + params += "\"label\": \"" + Str16ToStr8(property->label) + "\","; + params += "\"description\": \"" + Str16ToStr8(property->description) + "\""; } - params_ += "}]}"; + params += "}]}"; } void InputMethodSystemAbility::DumpAllMethod(int fd)