From f110f1aa80e42e2db456e306d33ebde1121a8c28 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E2=80=9Cwwx1139321=E2=80=9D?= Date: Tue, 22 Apr 2025 21:19:05 +0800 Subject: [PATCH] =?UTF-8?q?=E9=BB=84=E8=93=9D5.1=E5=B7=AE=E5=BC=82?= =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: “wwx1139321” --- .../js_get_input_method_setting.cpp | 1 + .../js/napi/inputmethodclient/js_utils.cpp | 42 +++++++++---------- .../js/napi/inputmethodclient/js_utils.h | 2 +- .../include/input_method_ability.h | 9 ++-- .../include/input_method_panel.h | 2 +- .../src/input_method_ability.cpp | 10 ++--- .../src/input_method_agent_stub.cpp | 12 +++--- .../include/input_method_engine_listener.h | 2 +- .../include/ime_system_channel.h | 9 ++-- .../include/input_method_controller.h | 4 +- .../kits/c/inputmethod_attach_options_capi.h | 6 +-- .../c/inputmethod_inputmethod_proxy_capi.h | 4 +- interfaces/kits/c/inputmethod_types_capi.h | 2 +- .../common/include/settings_data_utils.h | 2 +- .../common/src/settings_data_utils.cpp | 8 ++-- .../include/enable_ime_data_parser.h | 4 +- services/json/src/serializable.cpp | 2 +- services/src/ime_info_inquirer.cpp | 10 ++--- .../src/input_method_system_ability_stub.cpp | 4 +- services/src/peruser_session.cpp | 2 +- .../unittest/resource/ohos_test/ohos_test.xml | 4 -- 21 files changed, 70 insertions(+), 71 deletions(-) diff --git a/frameworks/js/napi/inputmethodclient/js_get_input_method_setting.cpp b/frameworks/js/napi/inputmethodclient/js_get_input_method_setting.cpp index 9afc339d5..37eaa1da0 100644 --- a/frameworks/js/napi/inputmethodclient/js_get_input_method_setting.cpp +++ b/frameworks/js/napi/inputmethodclient/js_get_input_method_setting.cpp @@ -710,6 +710,7 @@ void JsGetInputMethodSetting::OnPanelStatusChange(const std::string &type, const IMSA_HILOGE("eventHandler is nullptr!"); return; } + IMSA_HILOGI("type: %{public}s", type.c_str()); auto task = [entry]() { auto getWindowInfo = [entry](napi_env env, napi_value *args, uint8_t argc) -> bool { if (argc < 1) { diff --git a/frameworks/js/napi/inputmethodclient/js_utils.cpp b/frameworks/js/napi/inputmethodclient/js_utils.cpp index d8446aa23..b2849b020 100644 --- a/frameworks/js/napi/inputmethodclient/js_utils.cpp +++ b/frameworks/js/napi/inputmethodclient/js_utils.cpp @@ -467,6 +467,26 @@ napi_value JsUtils::GetJsPrivateCommand(napi_env env, const std::unordered_map &in) { void *data = nullptr; @@ -491,7 +511,7 @@ napi_status JsUtils::GetValue(napi_env env, napi_value in, std::vector return status; } if (data == nullptr && length == 0) { - IMSA_HILOGE("Empty ArrayBuffer."); + IMSA_HILOGI("Empty ArrayBuffer!"); out.clear(); return napi_ok; } @@ -539,25 +559,5 @@ napi_status JsUtils::GetMessageHandlerCallbackParam(napi_value *argv, } return napi_ok; } - -napi_status JsUtils::GetValue(napi_env env, napi_value in, Rosen::Rect &out) -{ - bool ret = JsUtil::Object::ReadProperty(env, in, "left", out.posX_); - ret = ret && JsUtil::Object::ReadProperty(env, in, "top", out.posY_); - ret = ret && JsUtil::Object::ReadProperty(env, in, "width", out.width_); - ret = ret && JsUtil::Object::ReadProperty(env, in, "height", out.height_); - return ret ? napi_ok : napi_generic_failure; -} - -napi_value JsUtils::GetValue(napi_env env, const Rosen::Rect &in) -{ - napi_value jsObject = nullptr; - napi_create_object(env, &jsObject); - bool ret = JsUtil::Object::WriteProperty(env, jsObject, "left", in.posX_); - ret = ret && JsUtil::Object::WriteProperty(env, jsObject, "top", in.posY_); - ret = ret && JsUtil::Object::WriteProperty(env, jsObject, "width", in.width_); - ret = ret && JsUtil::Object::WriteProperty(env, jsObject, "height", in.height_); - return ret ? jsObject : JsUtil::Const::Null(env); -} } // namespace MiscServices } // namespace OHOS \ No newline at end of file diff --git a/frameworks/js/napi/inputmethodclient/js_utils.h b/frameworks/js/napi/inputmethodclient/js_utils.h index bb8894563..79992c6f7 100644 --- a/frameworks/js/napi/inputmethodclient/js_utils.h +++ b/frameworks/js/napi/inputmethodclient/js_utils.h @@ -167,8 +167,8 @@ public: static napi_status GetValue(napi_env env, napi_value in, PrivateDataValue &out); static napi_status GetValue(napi_env env, napi_value in, const std::string &type, napi_value &out); static napi_status GetValue(napi_env env, napi_value in, PanelInfo &out); - static napi_status GetValue(napi_env env, napi_value in, std::vector &out); static napi_status GetValue(napi_env env, napi_value in, Rosen::Rect &out); + static napi_status GetValue(napi_env env, napi_value in, std::vector &out); static napi_value GetValue(napi_env env, const std::vector &in); static napi_value GetValue(napi_env env, const InputWindowInfo &in); static napi_value GetValue(napi_env env, const Rosen::Rect &in); diff --git a/frameworks/native/inputmethod_ability/include/input_method_ability.h b/frameworks/native/inputmethod_ability/include/input_method_ability.h index f6632af3d..606acf276 100644 --- a/frameworks/native/inputmethod_ability/include/input_method_ability.h +++ b/frameworks/native/inputmethod_ability/include/input_method_ability.h @@ -185,12 +185,13 @@ private: sptr coreStub_ { nullptr }; sptr agentStub_ { nullptr }; sptr systemAgentStub_ { nullptr }; - std::mutex imeCheckMutex_; - bool isCurrentIme_ = false; double positionY_ = 0; double height_ = 0; + std::mutex imeCheckMutex_; + bool isCurrentIme_ = false; + std::mutex defaultImeCheckMutex_; bool isDefaultIme_ = false; std::mutex inputAttrLock_; @@ -201,14 +202,14 @@ private: std::mutex inputTypeLock_; InputType inputType_ = InputType::NONE; std::atomic isImeTerminating = false; - std::atomic_bool isShowAfterCreate_ { false }; + std::atomic_bool isShowAfterCreate_{ false }; std::atomic securityMode_ = -1; std::mutex msgHandlerMutex_; std::shared_ptr msgHandler_; std::mutex systemAppCheckMutex_; bool isSystemApp_ = false; - + std::mutex bindClientInfoLock_; HiSysEventClientInfo bindClientInfo_; }; diff --git a/frameworks/native/inputmethod_ability/include/input_method_panel.h b/frameworks/native/inputmethod_ability/include/input_method_panel.h index bc243f073..5d8d916d1 100644 --- a/frameworks/native/inputmethod_ability/include/input_method_panel.h +++ b/frameworks/native/inputmethod_ability/include/input_method_panel.h @@ -81,6 +81,7 @@ public: int32_t GetCallingWindowInfo(CallingWindowInfo &windowInfo); int32_t SetPrivacyMode(bool isPrivacyMode); bool IsShowing(); + bool IsDisplayPortrait(); int32_t SetTextFieldAvoidInfo(double positionY, double height); void SetPanelHeightCallback(CallbackFunc heightCallback); int32_t IsEnhancedParamValid(PanelFlag panelFlag, EnhancedLayoutParams ¶ms); @@ -156,7 +157,6 @@ private: int32_t MovePanelRect(int32_t x, int32_t y); int32_t MoveEnhancedPanelRect(int32_t x, int32_t y); - bool IsDisplayPortrait(); bool IsDisplayUnfolded(); int32_t GetDisplaySize(DisplaySize &size); int32_t GetDensityDpi(float &densityDpi); diff --git a/frameworks/native/inputmethod_ability/src/input_method_ability.cpp b/frameworks/native/inputmethod_ability/src/input_method_ability.cpp index b0d7d43f2..bbb8232a5 100644 --- a/frameworks/native/inputmethod_ability/src/input_method_ability.cpp +++ b/frameworks/native/inputmethod_ability/src/input_method_ability.cpp @@ -33,9 +33,9 @@ #include "string_ex.h" #include "sys/prctl.h" #include "system_ability_definition.h" -#include "task_manager.h" #include "tasks/task.h" #include "tasks/task_imsa.h" +#include "task_manager.h" namespace OHOS { namespace MiscServices { @@ -893,8 +893,8 @@ int32_t InputMethodAbility::CreatePanel(const std::shared_ptr(); TaskManager::GetInstance().PostTask(task); @@ -936,8 +936,8 @@ int32_t InputMethodAbility::HidePanel(const std::shared_ptr &i IMSA_HILOGI("Current Ime is terminating, no need to hide keyboard."); return ErrorCode::NO_ERROR; } - if (isShowAfterCreate_.load() && inputMethodPanel->GetPanelType() == PanelType::SOFT_KEYBOARD && - inputMethodPanel->GetPanelFlag() != PanelFlag::FLG_CANDIDATE_COLUMN) { + if (isShowAfterCreate_.load() && inputMethodPanel->GetPanelType() == PanelType::SOFT_KEYBOARD + && inputMethodPanel->GetPanelFlag() != PanelFlag::FLG_CANDIDATE_COLUMN) { isShowAfterCreate_.store(false); } std::lock_guard lock(keyboardCmdLock_); diff --git a/frameworks/native/inputmethod_ability/src/input_method_agent_stub.cpp b/frameworks/native/inputmethod_ability/src/input_method_agent_stub.cpp index c7adf9458..596d30a46 100644 --- a/frameworks/native/inputmethod_ability/src/input_method_agent_stub.cpp +++ b/frameworks/native/inputmethod_ability/src/input_method_agent_stub.cpp @@ -30,8 +30,8 @@ InputMethodAgentStub::InputMethodAgentStub() { } InputMethodAgentStub::~InputMethodAgentStub() { } -int32_t InputMethodAgentStub::OnRemoteRequest( - uint32_t code, MessageParcel &data, MessageParcel &reply, MessageOption &option) +int32_t InputMethodAgentStub::OnRemoteRequest(uint32_t code, MessageParcel &data, MessageParcel &reply, + MessageOption &option) { IMSA_HILOGD("InputMethodAgentStub, code = %{public}u, callingPid: %{public}d, callingUid: %{public}d.", code, IPCSkeleton::GetCallingPid(), IPCSkeleton::GetCallingUid()); @@ -132,8 +132,8 @@ int32_t InputMethodAgentStub::OnAttributeChangeOnRemote(MessageParcel &data, Mes return ErrorCode::NO_ERROR; } -int32_t InputMethodAgentStub::DispatchKeyEvent( - const std::shared_ptr &keyEvent, sptr &consumer) +int32_t InputMethodAgentStub::DispatchKeyEvent(const std::shared_ptr &keyEvent, + sptr &consumer) { return false; } @@ -149,8 +149,8 @@ void InputMethodAgentStub::OnCursorUpdate(int32_t positionX, int32_t positionY, TaskManager::GetInstance().PostTask(task); } -void InputMethodAgentStub::OnSelectionChange( - std::u16string text, int32_t oldBegin, int32_t oldEnd, int32_t newBegin, int32_t newEnd) +void InputMethodAgentStub::OnSelectionChange(std::u16string text, int32_t oldBegin, int32_t oldEnd, int32_t newBegin, + int32_t newEnd) { auto task = std::make_shared(text, oldBegin, oldEnd, newBegin, newEnd); TaskManager::GetInstance().PostTask(task); diff --git a/interfaces/inner_api/inputmethod_ability/include/input_method_engine_listener.h b/interfaces/inner_api/inputmethod_ability/include/input_method_engine_listener.h index 21cdfa4fe..2366ebf36 100644 --- a/interfaces/inner_api/inputmethod_ability/include/input_method_engine_listener.h +++ b/interfaces/inner_api/inputmethod_ability/include/input_method_engine_listener.h @@ -29,7 +29,7 @@ public: virtual int32_t OnInputStop() = 0; virtual void OnSecurityChange(int32_t security) { - }; + } virtual void OnSetCallingWindow(uint32_t windowId) = 0; virtual void OnSetSubtype(const SubProperty &property) = 0; virtual void ReceivePrivateCommand(const std::unordered_map &privateCommand) = 0; diff --git a/interfaces/inner_api/inputmethod_controller/include/ime_system_channel.h b/interfaces/inner_api/inputmethod_controller/include/ime_system_channel.h index e3630448b..ffeefd76f 100644 --- a/interfaces/inner_api/inputmethod_controller/include/ime_system_channel.h +++ b/interfaces/inner_api/inputmethod_controller/include/ime_system_channel.h @@ -75,15 +75,16 @@ public: const std::unordered_map &privateCommand) override; /** - * @brief Get smart menu config from default input method. - * - * This function is used to get smart menu config from default input method. + * @brief Get smart menue config from default input method. * + * This function is used to get smart menue config from default input method. + *. * @return string. * @since 12 */ IMF_API std::string GetSmartMenuCfg(); - int32_t ReceivePrivateCommand(const std::unordered_map &privateCommand) override; + int32_t ReceivePrivateCommand( + const std::unordered_map &privateCommand) override; int32_t NotifyPanelStatus(const SysPanelStatus &sysPanelStatus); void OnConnectCmdReady(const sptr &agentObject); IMF_API int32_t GetDefaultImeCfg(std::shared_ptr &property); diff --git a/interfaces/inner_api/inputmethod_controller/include/input_method_controller.h b/interfaces/inner_api/inputmethod_controller/include/input_method_controller.h index 400a54911..bf4fe6fa6 100644 --- a/interfaces/inner_api/inputmethod_controller/include/input_method_controller.h +++ b/interfaces/inner_api/inputmethod_controller/include/input_method_controller.h @@ -204,7 +204,7 @@ public: * text selection,windowId. * @param type Indicates the type of caller. * @return Returns 0 for success, others for failure. - * @since 15 + * @since 16 */ IMF_API int32_t Attach(sptr listener, const AttachOptions &attachOptions, const TextConfig &textConfig, ClientType type = ClientType::INNER_KIT); @@ -225,7 +225,7 @@ public: * * @param attachOptions Indicates the attachOptions, such as requestKeyboardReason * @return Returns 0 for success, others for failure. - * @since 15 + * @since 16 */ IMF_API int32_t ShowTextInput(const AttachOptions &attachOptions, ClientType type = ClientType::INNER_KIT); /** diff --git a/interfaces/kits/c/inputmethod_attach_options_capi.h b/interfaces/kits/c/inputmethod_attach_options_capi.h index 268e3cb02..3fbb7df5d 100644 --- a/interfaces/kits/c/inputmethod_attach_options_capi.h +++ b/interfaces/kits/c/inputmethod_attach_options_capi.h @@ -63,7 +63,7 @@ InputMethod_AttachOptions *OH_AttachOptions_Create(bool showKeyboard); * @param requestKeyboardReason the reason for showKeyboard. * @return If the creation succeeds, a pointer to the newly created {@link InputMethod_AttachOptions} * instance is returned. If the creation fails, NULL is returned, possible cause is insufficient memory. - * @since 15 + * @since 16 */ InputMethod_AttachOptions *OH_AttachOptions_CreateWithRequestKeyboardReason( bool showKeyboard, InputMethod_RequestKeyboardReason requestKeyboardReason); @@ -96,9 +96,9 @@ InputMethod_ErrorCode OH_AttachOptions_IsShowKeyboard(InputMethod_AttachOptions * be get value from * @return Returns a specific error code. * {@link IME_ERR_OK} - success. - * {@link IME_ERR_NULL_POINTER} - unexpected null pointer. If options is NULL, or requestKeyboardReason is NULL. + * {@link IME_ERR_NULL_POINTER} - unexpected null pointer. * Specific error codes can be referenced {@link InputMethod_ErrorCode}. - * @since 15 + * @since 19 */ InputMethod_ErrorCode OH_AttachOptions_GetRequestKeyboardReason( InputMethod_AttachOptions *options, int *requestKeyboardReason); diff --git a/interfaces/kits/c/inputmethod_inputmethod_proxy_capi.h b/interfaces/kits/c/inputmethod_inputmethod_proxy_capi.h index 61e3e4a91..f608dd9d3 100644 --- a/interfaces/kits/c/inputmethod_inputmethod_proxy_capi.h +++ b/interfaces/kits/c/inputmethod_inputmethod_proxy_capi.h @@ -79,9 +79,9 @@ InputMethod_ErrorCode OH_InputMethodProxy_ShowKeyboard(InputMethod_InputMethodPr * {@link IME_ERR_IMCLIENT} - input method client error. * {@link IME_ERR_IMMS} - input method manager service error. * {@link IME_ERR_DETACHED} - input method client detached. - * {@link IME_ERR_NULL_POINTER} - unexpected null pointer. If inputMethodProxy is NULL, or options is NULL. + * {@link IME_ERR_NULL_POINTER} - unexpected null pointer. * Specific error codes can be referenced {@link InputMethod_ErrorCode}. - * @since 15 + * @since 16 */ InputMethod_ErrorCode OH_InputMethodProxy_ShowTextInput( InputMethod_InputMethodProxy *inputMethodProxy, InputMethod_AttachOptions *options); diff --git a/interfaces/kits/c/inputmethod_types_capi.h b/interfaces/kits/c/inputmethod_types_capi.h index cde9f3525..8dd117e44 100644 --- a/interfaces/kits/c/inputmethod_types_capi.h +++ b/interfaces/kits/c/inputmethod_types_capi.h @@ -317,7 +317,7 @@ typedef enum InputMethod_ErrorCode { /** * @brief The value type of request keyboard. * - * @since 15 + * @since 16 */ typedef enum InputMethod_RequestKeyboardReason { /** diff --git a/services/adapter/settings_data_provider/common/include/settings_data_utils.h b/services/adapter/settings_data_provider/common/include/settings_data_utils.h index 602cae5ba..74d4f47b5 100644 --- a/services/adapter/settings_data_provider/common/include/settings_data_utils.h +++ b/services/adapter/settings_data_provider/common/include/settings_data_utils.h @@ -62,7 +62,7 @@ private: int32_t RegisterObserver(const sptr &observer); int32_t UnregisterObserver(const sptr &observer); sptr GetToken(); - std::vector Split(const std::string &text, char separator); + std::vector split(const std::string &text, char separator); std::string SetSettingValues(const std::string &settingValue, const std::string &bundleName); private: diff --git a/services/adapter/settings_data_provider/common/src/settings_data_utils.cpp b/services/adapter/settings_data_provider/common/src/settings_data_utils.cpp index 26a9308e3..cb7847105 100644 --- a/services/adapter/settings_data_provider/common/src/settings_data_utils.cpp +++ b/services/adapter/settings_data_provider/common/src/settings_data_utils.cpp @@ -240,8 +240,8 @@ bool SettingsDataUtils::EnableIme(int32_t userId, const std::string &bundleName) IMSA_HILOGI("value: %{public}s", value.c_str()); return SetStringValue(std::string(SETTING_URI_PROXY), settingKey, value); } - -std::vector SettingsDataUtils::Split(const std::string &text, char delim) + +std::vector SettingsDataUtils::split(const std::string &text, char delim) { std::vector tokens; std::stringstream ss(text); @@ -253,11 +253,11 @@ std::vector SettingsDataUtils::Split(const std::string &text, char } return tokens; } - + std::string SettingsDataUtils::SetSettingValues(const std::string &settingValue, const std::string &bundleName) { std::string value = ""; - std::vector settingValues = Split(settingValue, ']'); + std::vector settingValues = split(settingValue, ']'); for (uint32_t i = 0; i < settingValues.size(); ++i) { if (i == 0) { if (settingValues[0].back() == '[') { diff --git a/services/adapter/settings_data_provider/include/enable_ime_data_parser.h b/services/adapter/settings_data_provider/include/enable_ime_data_parser.h index 5e0f97344..0e561243f 100644 --- a/services/adapter/settings_data_provider/include/enable_ime_data_parser.h +++ b/services/adapter/settings_data_provider/include/enable_ime_data_parser.h @@ -93,8 +93,8 @@ private: bool ParseEnableIme(const std::string &valueStr, int32_t userId, std::vector &enableVec); bool ParseEnableKeyboard(const std::string &valueStr, int32_t userId, std::vector &enableVec); bool ParseTempIme(const std::string &valueStr, int32_t userId, std::vector &tempVector); - bool CheckTargetEnableName(const std::string &key, const std::string &targetName, std::string &nextIme, - const int32_t userId); + bool CheckTargetEnableName( + const std::string &key, const std::string &targetName, std::string &nextIme, const int32_t userId); std::shared_ptr GetDefaultIme(); void OnBackgroundPackageAdded(int32_t userId, const std::string &bundleName, const std::string &globalContent); void OnForegroundPackageAdded(int32_t userId, const std::string &bundleName, const std::string &globalContent); diff --git a/services/json/src/serializable.cpp b/services/json/src/serializable.cpp index 44bbee266..ba9808510 100644 --- a/services/json/src/serializable.cpp +++ b/services/json/src/serializable.cpp @@ -21,7 +21,7 @@ bool Serializable::Unmarshall(const std::string &content) { auto root = cJSON_Parse(content.c_str()); if (root == NULL) { - IMSA_HILOGE("content parse failed!"); + IMSA_HILOGE("%{public}s: parse failed!", content.c_str()); return false; } auto ret = Unmarshal(root); diff --git a/services/src/ime_info_inquirer.cpp b/services/src/ime_info_inquirer.cpp index 6cfdebc43..5aacbd6e1 100644 --- a/services/src/ime_info_inquirer.cpp +++ b/services/src/ime_info_inquirer.cpp @@ -51,12 +51,12 @@ void ImeInfoInquirer::InitSystemConfig() return; } } - + bool ImeInfoInquirer::IsEnableInputMethod() { return systemConfig_.enableInputMethodFeature; } - + bool ImeInfoInquirer::IsEnableSecurityMode() { return systemConfig_.enableFullExperienceFeature; @@ -145,8 +145,8 @@ std::shared_ptr ImeInfoInquirer::GetImeInfoFromCache(const int32_t user return info; } -std::shared_ptr ImeInfoInquirer::GetImeInfoFromBundleMgr( - const int32_t userId, const std::string &bundleName, const std::string &subName) +std::shared_ptr ImeInfoInquirer::GetImeInfoFromBundleMgr(const int32_t userId, const std::string &bundleName, + const std::string &subName) { IMSA_HILOGD("userId: %{public}d, bundleName: %{public}s, subName: %{public}s.", userId, bundleName.c_str(), subName.c_str()); @@ -1081,7 +1081,7 @@ bool ImeInfoInquirer::IsInputMethod(int32_t userId, const std::string &bundleNam } return false; } - + bool ImeInfoInquirer::IsTempInputMethod(const ExtensionAbilityInfo &extInfo) { auto iter = std::find_if(extInfo.metadata.begin(), extInfo.metadata.end(), diff --git a/services/src/input_method_system_ability_stub.cpp b/services/src/input_method_system_ability_stub.cpp index 0fe2948bf..2054f80a5 100644 --- a/services/src/input_method_system_ability_stub.cpp +++ b/services/src/input_method_system_ability_stub.cpp @@ -26,8 +26,8 @@ using namespace std::chrono; using namespace HiviewDFX; constexpr uint32_t FATAL_TIMEOUT = 30; // 30s constexpr int64_t WARNING_TIMEOUT = 5000; // 5s -int32_t InputMethodSystemAbilityStub::OnRemoteRequest(uint32_t code, MessageParcel &data, MessageParcel &reply, - MessageOption &option) +int32_t InputMethodSystemAbilityStub::OnRemoteRequest( + uint32_t code, MessageParcel &data, MessageParcel &reply, MessageOption &option) { if (code != static_cast(InputMethodInterfaceCode::RELEASE_INPUT)) { IMSA_HILOGI("IMSA, code = %{public}u, callingPid/Uid/timestamp: %{public}d/%{public}d/%{public}lld", code, diff --git a/services/src/peruser_session.cpp b/services/src/peruser_session.cpp index f0e56eb03..d03b6a417 100644 --- a/services/src/peruser_session.cpp +++ b/services/src/peruser_session.cpp @@ -1486,7 +1486,7 @@ bool PerUserSession::IsCurrentImeByPid(int32_t pid) int32_t PerUserSession::IsPanelShown(const PanelInfo &panelInfo, bool &isShown) { if (GetCurrentClient() == nullptr) { - IMSA_HILOGD("not in bound state."); + IMSA_HILOGI("not in bound state."); isShown = false; return ErrorCode::NO_ERROR; } diff --git a/test/unittest/resource/ohos_test/ohos_test.xml b/test/unittest/resource/ohos_test/ohos_test.xml index cb9987d54..173f6ed1c 100644 --- a/test/unittest/resource/ohos_test/ohos_test.xml +++ b/test/unittest/resource/ohos_test/ohos_test.xml @@ -16,8 +16,6 @@ - - -- Gitee