From 349ab98913f62948be72a98210c48b55e397d34c Mon Sep 17 00:00:00 2001 From: yuanhao Date: Tue, 29 Apr 2025 15:39:11 +0800 Subject: [PATCH] =?UTF-8?q?code=20check=20modify=20Signed-off-by:=20?= =?UTF-8?q?=E8=A2=81=E6=B5=A9=20?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../inputmethod_ability/src/input_method_ability.cpp | 12 ++++++++++-- services/include/ime_info_inquirer.h | 2 +- services/src/ime_info_inquirer.cpp | 2 +- services/src/input_method_system_ability.cpp | 2 +- 4 files changed, 13 insertions(+), 5 deletions(-) diff --git a/frameworks/native/inputmethod_ability/src/input_method_ability.cpp b/frameworks/native/inputmethod_ability/src/input_method_ability.cpp index b7db884db..167d3ac9b 100644 --- a/frameworks/native/inputmethod_ability/src/input_method_ability.cpp +++ b/frameworks/native/inputmethod_ability/src/input_method_ability.cpp @@ -315,9 +315,17 @@ bool InputMethodAbility::IsDisplayChanged(uint64_t oldDisplayId, uint64_t newDis return false; } bool ret = false; - proxy->IsDefaultImeScreen(oldDisplayId, ret); + int32_t result = proxy->IsDefaultImeScreen(oldDisplayId, ret); + if (result != ErrorCode::NO_ERROR) { + IMSA_HILOGE("failed to get oldDisplay info , result is %{public}d!", result); + return false; + } if (!ret) { - proxy->IsDefaultImeScreen(newDisplayId, ret); + result = proxy->IsDefaultImeScreen(newDisplayId, ret); + if (result != ErrorCode::NO_ERROR) { + IMSA_HILOGE("failed to get newDisplay info , result is %{public}d!", result); + return false; + } } return ret; } diff --git a/services/include/ime_info_inquirer.h b/services/include/ime_info_inquirer.h index 9fb807384..2c8e0aa76 100644 --- a/services/include/ime_info_inquirer.h +++ b/services/include/ime_info_inquirer.h @@ -102,7 +102,7 @@ public: bool IsDefaultImeSet(int32_t userId); bool IsImeInstalled(const int32_t userId, const std::string &bundleName, const std::string &extName); bool IsInputMethodExtension(pid_t pid); - bool IsDefaultImeScreen(std::string screenName); + bool IsDefaultImeScreen(const std::string &screenName); private: ImeInfoInquirer() = default; diff --git a/services/src/ime_info_inquirer.cpp b/services/src/ime_info_inquirer.cpp index ca903adfb..da9d643ba 100644 --- a/services/src/ime_info_inquirer.cpp +++ b/services/src/ime_info_inquirer.cpp @@ -1231,7 +1231,7 @@ bool ImeInfoInquirer::IsInputMethodExtension(pid_t pid) return info.extensionType_ == ExtensionAbilityType::INPUTMETHOD; } -bool ImeInfoInquirer::IsDefaultImeScreen(std::string screenName) +bool ImeInfoInquirer::IsDefaultImeScreen(const std::string &screenName) { return systemConfig_.defaultImeScreenList.find(screenName) != systemConfig_.defaultImeScreenList.end(); } diff --git a/services/src/input_method_system_ability.cpp b/services/src/input_method_system_ability.cpp index fe93c0964..779446f4f 100644 --- a/services/src/input_method_system_ability.cpp +++ b/services/src/input_method_system_ability.cpp @@ -755,7 +755,7 @@ bool InputMethodSystemAbility::IsDefaultImeScreen(uint64_t displayId) ErrCode InputMethodSystemAbility::IsDefaultImeScreen(uint64_t displayId, bool &resultValue) { resultValue = IsDefaultImeScreen(displayId); - return ERR_OK; + return ErrorCode::NO_ERROR; } int32_t InputMethodSystemAbility::ShowInputInner(sptr client, int32_t requestKeyboardReason) -- Gitee