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 9afc339d509b7090c68a4b49f18e0425151cd4a2..37eaa1da02d62e3a0335533fc2145cafda378093 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 d8446aa23ad35f57e4f58cba3d025f89fd081f74..b2849b0209a497d780d2ca0934a81f88c7ea93ca 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<s
     return jsPrivateCommand;
 }
 
+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);
+}
+
 napi_value JsUtils::GetValue(napi_env env, const std::vector<uint8_t> &in)
 {
     void *data = nullptr;
@@ -491,7 +511,7 @@ napi_status JsUtils::GetValue(napi_env env, napi_value in, std::vector<uint8_t>
         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 bb8894563b6cd3ae7083e77b92ac9e66f6f04129..79992c6f7187adac28909ba787e59194cc43836c 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<uint8_t> &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<uint8_t> &out);
     static napi_value GetValue(napi_env env, const std::vector<InputWindowInfo> &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 f6632af3d90809ba44d68dce215d3d61f338d07e..606acf276ea05bd068eceb3d5941aff189a76a36 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<IInputMethodCore> coreStub_ { nullptr };
     sptr<IInputMethodAgent> agentStub_ { nullptr };
     sptr<IInputMethodAgent> 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<bool> isImeTerminating = false;
-    std::atomic_bool isShowAfterCreate_ { false };
+    std::atomic_bool isShowAfterCreate_{ false };
     std::atomic<int32_t> securityMode_ = -1;
     std::mutex msgHandlerMutex_;
     std::shared_ptr<MsgHandlerCallbackInterface> 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 bc243f07309e15c06a82ba031d8832fd7dce1512..5d8d916d1cd0d396ea6fccc5d6123ef43435ad3b 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 &params);
@@ -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 b0d7d43f23131d62469c53105ee826d5bf3600cb..bbb8232a59440d42f0d4af425b0e6abb11fb2874 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<AbilityRuntime::Co
             inputMethodPanel = nullptr;
             return false;
         });
-    if (flag && isShowAfterCreate_.load() && panelInfo.panelType == SOFT_KEYBOARD &&
-        panelInfo.panelFlag != FLG_CANDIDATE_COLUMN) {
+    if (flag && isShowAfterCreate_.load() && panelInfo.panelType == SOFT_KEYBOARD
+        && panelInfo.panelFlag != FLG_CANDIDATE_COLUMN) {
         isShowAfterCreate_.store(false);
         auto task = std::make_shared<TaskImsaShowKeyboard>();
         TaskManager::GetInstance().PostTask(task);
@@ -936,8 +936,8 @@ int32_t InputMethodAbility::HidePanel(const std::shared_ptr<InputMethodPanel> &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<std::recursive_mutex> 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 c7adf94588998a9a7d72d5225bd00020f728b039..596d30a46cc1796e4ad2ddd3b0e101aa170afa84 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<MMI::KeyEvent> &keyEvent, sptr<IKeyEventConsumer> &consumer)
+int32_t InputMethodAgentStub::DispatchKeyEvent(const std::shared_ptr<MMI::KeyEvent> &keyEvent,
+    sptr<IKeyEventConsumer> &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<TaskImsaOnSelectionChange>(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 21cdfa4fe44d2b970b0dff1636dc6322134a8972..2366ebf36815e4e2dc854150462817cec59b2b4c 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<std::string, PrivateDataValue> &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 e3630448b1261f28ed0768770d22aec8761bd885..ffeefd76f765247d31d2043f6ed589b6799063de 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<std::string, PrivateDataValue> &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<std::string, PrivateDataValue> &privateCommand) override;
+    int32_t ReceivePrivateCommand(
+        const std::unordered_map<std::string, PrivateDataValue> &privateCommand) override;
     int32_t NotifyPanelStatus(const SysPanelStatus &sysPanelStatus);
     void OnConnectCmdReady(const sptr<IRemoteObject> &agentObject);
     IMF_API int32_t GetDefaultImeCfg(std::shared_ptr<Property> &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 400a54911b2e14a9483727dea535dcc49a67c268..bf4fe6fa6291065eaa64f63fc474ec5f09411fab 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<OnTextChangedListener> 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 268e3cb0283ec23c7e45cc2c37b0093adfe47931..3fbb7df5d27e9b581a7069135c9df1c1405b1c34 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 61e3e4a91826a9c3fbfa058e35ba0e1060a0f67f..f608dd9d3529b04cf3515fc4ac33b9cd8b480293 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 cde9f352581f8c67e6b56e8c7b964c0f90a6ebc5..8dd117e4402896f951ab00ff8eb6cbc5b6908349 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 602cae5ba1f9f12f3917e70d6ab2b6149afb4252..74d4f47b5231b4be08f866f92bdbf5988b6ac38b 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<SettingsDataObserver> &observer);
     int32_t UnregisterObserver(const sptr<SettingsDataObserver> &observer);
     sptr<IRemoteObject> GetToken();
-    std::vector<std::string> Split(const std::string &text, char separator);
+    std::vector<std::string> 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 26a9308e3df02620cbf4180096f20d1ad08588c1..cb784710522e5eca448b75442695f61e4d2e5bed 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<std::string> SettingsDataUtils::Split(const std::string &text, char delim)
+
+std::vector<std::string> SettingsDataUtils::split(const std::string &text, char delim)
 {
     std::vector<std::string> tokens;
     std::stringstream ss(text);
@@ -253,11 +253,11 @@ std::vector<std::string> 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<std::string> settingValues = Split(settingValue, ']');
+    std::vector<std::string> 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 5e0f97344d00d3dc88755b94b1407d387689f7da..0e561243f1ee9838d4a0eee3f2bd524b6f82ee5c 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<std::string> &enableVec);
     bool ParseEnableKeyboard(const std::string &valueStr, int32_t userId, std::vector<std::string> &enableVec);
     bool ParseTempIme(const std::string &valueStr, int32_t userId, std::vector<std::string> &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<Property> 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 44bbee266fd02e58ad752b7f5c4fa2a0d1b7e29d..ba980851086e5856f84a2d0516a4f83432440ff2 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 6cfdebc43696b844823e5015fcf5ca700fec839e..5aacbd6e160d5209b0a94811ff9afddffff84898 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<ImeInfo> ImeInfoInquirer::GetImeInfoFromCache(const int32_t user
     return info;
 }
 
-std::shared_ptr<ImeInfo> ImeInfoInquirer::GetImeInfoFromBundleMgr(
-    const int32_t userId, const std::string &bundleName, const std::string &subName)
+std::shared_ptr<ImeInfo> 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 0fe2948bfab9087c3657e1042a11e9057e3a62fc..2054f80a5a74ac97a67dcb5b8314838c10dcc152 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<uint32_t>(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 f0e56eb0390f765ece71ff58d767dc6fc1099369..d03b6a417ca5f25ce01ffadd8f48d499677d6167 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 cb9987d5402bf3c1bd762da81992065e83f232d6..173f6ed1cfe02f1fe953185fd2a301b82a1d5ad5 100644
--- a/test/unittest/resource/ohos_test/ohos_test.xml
+++ b/test/unittest/resource/ohos_test/ohos_test.xml
@@ -16,8 +16,6 @@
 <configuration ver="2.0">
     <target name="InputMethodSwitchTest">
         <preparer>
-            <option name="shell" value="power-shell wakeup"/>
-            <option name="shell" value="power-shell setmode 602"/>
             <option name="push" value="extImfBundle/extImf.hap -> /data/test/resource/imf" src="res"/>
             <option name="shell" value="bm install -r -p /data/test/resource/imf/extImf.hap"/>
             <option name="push" value="newTestIme/newTestIme.hap -> /data/test/resource/imf" src="res"/>
@@ -44,8 +42,6 @@
     </target>
     <target name="NewImeSwitchTest">
         <preparer>
-            <option name="shell" value="power-shell wakeup"/>
-            <option name="shell" value="power-shell setmode 602"/>
             <option name="push" value="newTestIme/newTestIme.hap -> /data/test/resource/imf" src="res"/>
             <option name="shell" value="bm install -r -p /data/test/resource/imf/newTestIme.hap"/>
         </preparer>