From 4b9c4f0dacc993110cd5ddee78b93779bff5da7b Mon Sep 17 00:00:00 2001 From: GlaryCastle Date: Tue, 5 Jul 2022 17:59:05 +0800 Subject: [PATCH] Signed-off-by: GlaryCastle Changes to be committed: modified: frameworks/inputmethod_controller/include/input_method_controller.h modified: frameworks/inputmethod_controller/src/input_method_controller.cpp modified: services/dfx/include/inputmethod_trace.h modified: services/src/input_method_system_ability.cpp --- .../include/input_method_controller.h | 17 +++++++++-------- .../src/input_method_controller.cpp | 4 +--- services/dfx/include/inputmethod_trace.h | 1 - services/src/input_method_system_ability.cpp | 1 - 4 files changed, 10 insertions(+), 13 deletions(-) diff --git a/frameworks/inputmethod_controller/include/input_method_controller.h b/frameworks/inputmethod_controller/include/input_method_controller.h index 57582a7..99af3ca 100644 --- a/frameworks/inputmethod_controller/include/input_method_controller.h +++ b/frameworks/inputmethod_controller/include/input_method_controller.h @@ -17,19 +17,20 @@ #ifndef FRAMEWORKS_INPUTMETHOD_CONTROLLER_INCLUDE_INPUT_METHOD_CONTROLLER_H #define FRAMEWORKS_INPUTMETHOD_CONTROLLER_INCLUDE_INPUT_METHOD_CONTROLLER_H -#include "global.h" #include #include -#include "input_data_channel_stub.h" -#include "input_client_stub.h" -#include "input_method_system_ability_proxy.h" -#include "input_method_agent_proxy.h" + +#include "global.h" #include "i_input_method_agent.h" -#include "message_handler.h" -#include "iremote_object.h" +#include "input_client_stub.h" +#include "input_data_channel_stub.h" +#include "input_method_agent_proxy.h" +#include "input_method_system_ability_proxy.h" #include "input_method_utils.h" -#include "key_event.h" #include "ipc_skeleton.h" +#include "iremote_object.h" +#include "key_event.h" +#include "message_handler.h" namespace OHOS { namespace MiscServices { diff --git a/frameworks/inputmethod_controller/src/input_method_controller.cpp b/frameworks/inputmethod_controller/src/input_method_controller.cpp index aca548f..e8f0241 100644 --- a/frameworks/inputmethod_controller/src/input_method_controller.cpp +++ b/frameworks/inputmethod_controller/src/input_method_controller.cpp @@ -85,9 +85,7 @@ using namespace MessageID; } int32_t uid = IPCSkeleton::GetCallingUid(); - std::string strBundleName; - strBundleName = "com.inputmethod.default"; - + std::string strBundleName = "com.inputmethod.default"; auto systemAbility = systemAbilityManager->GetSystemAbility(INPUT_METHOD_SYSTEM_ABILITY_ID, ""); if (!systemAbility) { IMSA_HILOGI("InputMethodController::GetImsaProxy systemAbility is nullptr"); diff --git a/services/dfx/include/inputmethod_trace.h b/services/dfx/include/inputmethod_trace.h index dcab05d..19f6c55 100644 --- a/services/dfx/include/inputmethod_trace.h +++ b/services/dfx/include/inputmethod_trace.h @@ -20,7 +20,6 @@ namespace OHOS { namespace MiscServices { - void InitHiTrace(); void ValueTrace(const std::string &name, int64_t count); class InputmethodTrace { diff --git a/services/src/input_method_system_ability.cpp b/services/src/input_method_system_ability.cpp index d56364c..b97abc7 100644 --- a/services/src/input_method_system_ability.cpp +++ b/services/src/input_method_system_ability.cpp @@ -144,7 +144,6 @@ namespace MiscServices { void InputMethodSystemAbility::DumpAllMethod(int fd) { IMSA_HILOGI("InputMethodSystemAbility::DumpAllMethod"); - // dprintf(fd, "\n - dump all method:\n"); int32_t uid = IPCSkeleton::GetCallingUid(); int32_t userId = getUserId(uid); std::vector properties;