diff --git a/frameworks/inputmethod_ability/include/i_input_method_core.h b/frameworks/inputmethod_ability/include/i_input_method_core.h index a9b2bc6..112aaac 100644 --- a/frameworks/inputmethod_ability/include/i_input_method_core.h +++ b/frameworks/inputmethod_ability/include/i_input_method_core.h @@ -56,7 +56,7 @@ namespace MiscServices { virtual bool showKeyboard(const sptr& inputDataChannel) = 0; virtual bool hideKeyboard(int32_t flags) = 0; virtual int32_t setKeyboardType(const KeyboardType& type) = 0; - virtual int32_t getKeyboardWindowHeight(int32_t retHeight) = 0; + virtual int32_t getKeyboardWindowHeight(int32_t &retHeight) = 0; virtual int32_t InitInputControlChannel(sptr &inputControlChannel) = 0; virtual void SetClientState(bool state) = 0; virtual void StopInputService(std::string imeId) = 0; diff --git a/frameworks/inputmethod_ability/include/input_method_core_stub.h b/frameworks/inputmethod_ability/include/input_method_core_stub.h index 5d10014..0e68056 100644 --- a/frameworks/inputmethod_ability/include/input_method_core_stub.h +++ b/frameworks/inputmethod_ability/include/input_method_core_stub.h @@ -52,7 +52,7 @@ namespace MiscServices { bool showKeyboard(const sptr& inputDataChannel) override; bool hideKeyboard(int32_t flags)override; int32_t setKeyboardType(const KeyboardType& type) override; - int32_t getKeyboardWindowHeight(int32_t retHeight) override; + int32_t getKeyboardWindowHeight(int32_t &retHeight) override; int32_t InitInputControlChannel(sptr &inputControlChannel) override; void SetClientState(bool state) override; void StopInputService(std::string imeId) override; diff --git a/frameworks/inputmethod_ability/src/input_method_core_stub.cpp b/frameworks/inputmethod_ability/src/input_method_core_stub.cpp index 8c0484d..e117853 100644 --- a/frameworks/inputmethod_ability/src/input_method_core_stub.cpp +++ b/frameworks/inputmethod_ability/src/input_method_core_stub.cpp @@ -287,7 +287,7 @@ namespace MiscServices { msgHandler_->SendMessage(msg); } - int32_t InputMethodCoreStub::getKeyboardWindowHeight(int32_t retHeight) + int32_t InputMethodCoreStub::getKeyboardWindowHeight(int32_t &retHeight) { IMSA_HILOGI("InputMethodCoreStub::getKeyboardWindowHeight"); if (!msgHandler_) { diff --git a/frameworks/inputmethod_controller/include/input_method_system_ability_proxy.h b/frameworks/inputmethod_controller/include/input_method_system_ability_proxy.h index 531cfc3..df30d91 100644 --- a/frameworks/inputmethod_controller/include/input_method_system_ability_proxy.h +++ b/frameworks/inputmethod_controller/include/input_method_system_ability_proxy.h @@ -50,8 +50,8 @@ namespace MiscServices { int32_t Stop(sptr &client); void displayOptionalInputMethod(MessageParcel& data) override; - int32_t getDisplayMode(int32_t retMode) override; - int32_t getKeyboardWindowHeight(int32_t retHeight) override; + int32_t getDisplayMode(int32_t &retMode) override; + int32_t getKeyboardWindowHeight(int32_t &retHeight) override; int32_t getCurrentKeyboardType(KeyboardType *retType) override; int32_t listInputMethodEnabled(std::vector *properties) override; int32_t listInputMethod(std::vector *properties) override; diff --git a/frameworks/inputmethod_controller/src/input_method_system_ability_proxy.cpp b/frameworks/inputmethod_controller/src/input_method_system_ability_proxy.cpp index 540861f..c639b6a 100644 --- a/frameworks/inputmethod_controller/src/input_method_system_ability_proxy.cpp +++ b/frameworks/inputmethod_controller/src/input_method_system_ability_proxy.cpp @@ -255,7 +255,7 @@ namespace MiscServices { return NO_ERROR; } - int32_t InputMethodSystemAbilityProxy::getDisplayMode(int32_t retMode) + int32_t InputMethodSystemAbilityProxy::getDisplayMode(int32_t &retMode) { MessageParcel data, reply; MessageOption option; @@ -280,7 +280,7 @@ namespace MiscServices { return NO_ERROR; } - int32_t InputMethodSystemAbilityProxy::getKeyboardWindowHeight(int32_t retHeight) + int32_t InputMethodSystemAbilityProxy::getKeyboardWindowHeight(int32_t &retHeight) { MessageParcel data, reply; MessageOption option; diff --git a/services/include/i_input_method_system_ability.h b/services/include/i_input_method_system_ability.h index 8319cd3..53ea3ef 100644 --- a/services/include/i_input_method_system_ability.h +++ b/services/include/i_input_method_system_ability.h @@ -59,8 +59,8 @@ namespace MiscServices { virtual void HideCurrentInput(MessageParcel& data) = 0; virtual void displayOptionalInputMethod(MessageParcel& data) = 0; - virtual int32_t getDisplayMode(int32_t retMode) = 0; - virtual int32_t getKeyboardWindowHeight(int32_t retHeight) = 0; + virtual int32_t getDisplayMode(int32_t &retMode) = 0; + virtual int32_t getKeyboardWindowHeight(int32_t &retHeight) = 0; virtual int32_t getCurrentKeyboardType(KeyboardType *retType) = 0; virtual int32_t listInputMethodEnabled(std::vector *properties) = 0; virtual int32_t listInputMethod(std::vector *properties) = 0; diff --git a/services/include/input_method_system_ability.h b/services/include/input_method_system_ability.h index 1bf67a7..784d2d4 100644 --- a/services/include/input_method_system_ability.h +++ b/services/include/input_method_system_ability.h @@ -48,7 +48,7 @@ namespace MiscServices { int32_t OnRemoteRequest(uint32_t code, MessageParcel &data, MessageParcel &reply, MessageOption &option) override; int32_t getDisplayMode(int32_t &retMode) override; - int32_t getKeyboardWindowHeight(int32_t retHeight) override; + int32_t getKeyboardWindowHeight(int32_t &retHeight) override; int32_t getCurrentKeyboardType(KeyboardType *retType) override; int32_t listInputMethodEnabled(std::vector *properties) override; int32_t listInputMethod(std::vector *properties) override; diff --git a/services/include/peruser_session.h b/services/include/peruser_session.h index 10c992e..7d36c80 100644 --- a/services/include/peruser_session.h +++ b/services/include/peruser_session.h @@ -107,7 +107,7 @@ namespace MiscServices { void OnPackageRemoved(const std::u16string& packageName); int GetDisplayMode(); - int GetKeyboardWindowHeight(int retHeight); + int GetKeyboardWindowHeight(int &retHeight); KeyboardType *GetCurrentKeyboardType(); int OnSettingChanged(const std::u16string& key, const std::u16string& value); diff --git a/services/src/input_method_system_ability.cpp b/services/src/input_method_system_ability.cpp index e24eb26..7c7c6e8 100644 --- a/services/src/input_method_system_ability.cpp +++ b/services/src/input_method_system_ability.cpp @@ -309,7 +309,7 @@ namespace MiscServices { \return ErrorCode::NO_ERROR no error \return ErrorCode::ERROR_USER_NOT_UNLOCKED user not unlocked */ - int32_t InputMethodSystemAbility::getKeyboardWindowHeight(int32_t retHeight) + int32_t InputMethodSystemAbility::getKeyboardWindowHeight(int32_t &retHeight) { int32_t uid = IPCSkeleton::GetCallingUid(); int32_t userId = getUserId(uid); diff --git a/services/src/peruser_session.cpp b/services/src/peruser_session.cpp index 39ea66f..1f87733 100644 --- a/services/src/peruser_session.cpp +++ b/services/src/peruser_session.cpp @@ -546,7 +546,7 @@ namespace MiscServices { \param[out] retHeight the height of keyboard window showing or showed returned to caller \return ErrorCode */ - int PerUserSession::GetKeyboardWindowHeight(int retHeight) + int PerUserSession::GetKeyboardWindowHeight(int &retHeight) { if (imsCore[lastImeIndex]) { int ret = imsCore[lastImeIndex]->getKeyboardWindowHeight(retHeight);