openharmony/inputmethod_imf
1
0
Fork 0
mirror of https://gitee.com/openharmony/inputmethod_imf synced 2024-11-27 17:01:21 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

!568 告警清零

Browse Source 
Merge pull request !568 from mashaoyin/master
This commit is contained in:
openharmony_ci 2023-02-02 13:55:26 +00:00 committed by Gitee
commit 90c2d57e6f
No known key found for this signature in database
GPG Key ID: 173E9B9CA92EEF8F
6 changed files with 40 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
frameworks/inputmethod_ability/src/input_method_agent_proxy.cpp
View File

@ -41,7 +41,8 @@ bool InputMethodAgentProxy::DispatchKeyEvent(MessageParcel &data)
void InputMethodAgentProxy::OnCursorUpdate(int32_t positionX, int32_t positionY, int32_t height)
{
MessageParcel data, reply;
MessageParcel data;
MessageParcel reply;
MessageOption option;
if (!data.WriteInterfaceToken(GetDescriptor())) {
IMSA_HILOGE("InputMethodAgentProxy::OnCursorUpdate descriptor is not match");
@ -58,7 +59,8 @@ void InputMethodAgentProxy::OnCursorUpdate(int32_t positionX, int32_t positionY,
void InputMethodAgentProxy::OnSelectionChange(
std::u16string text, int32_t oldBegin, int32_t oldEnd, int32_t newBegin, int32_t newEnd)
{
MessageParcel data, reply;
MessageParcel data;
MessageParcel reply;
MessageOption option;
if (!data.WriteInterfaceToken(GetDescriptor())) {
IMSA_HILOGE("InputMethodAgentProxy::OnSelectionChange descriptor is not match");
@ -75,7 +77,8 @@ void InputMethodAgentProxy::OnSelectionChange(
void InputMethodAgentProxy::SetCallingWindow(uint32_t windowId)
{
MessageParcel data, reply;
MessageParcel data;
MessageParcel reply;
MessageOption option;
if (!data.WriteInterfaceToken(GetDescriptor())) {
IMSA_HILOGE("InputMethodAgentProxy::SetCallingWindow descriptor is not match");

3
frameworks/inputmethod_ability/src/input_method_core_proxy.cpp
View File

@ -44,7 +44,8 @@ int32_t InputMethodCoreProxy::InitInputControlChannel(
IMSA_HILOGI("InputMethodCoreProxy::InitInputControlChannel inputControlChannel is nullptr");
return ErrorCode::ERROR_EX_NULL_POINTER;
}
MessageParcel data, reply;
MessageParcel data;
MessageParcel reply;
data.WriteInterfaceToken(GetDescriptor());
sptr<IRemoteObject> channelObject = inputControlChannel->AsObject();
if (!channelObject) {

3
frameworks/inputmethod_controller/src/input_client_proxy.cpp
View File

@ -30,7 +30,8 @@ InputClientProxy::InputClientProxy(const sptr<IRemoteObject> &object) : IRemoteP
int32_t InputClientProxy::onInputReady(const sptr<IInputMethodAgent> &agent)
{
IMSA_HILOGI("InputClientProxy::onInputReady");
MessageParcel data, reply;
MessageParcel data;
MessageParcel reply;
MessageOption option;
if (!data.WriteInterfaceToken(GetDescriptor())) {
return ERROR_EX_PARCELABLE;

40
frameworks/inputmethod_controller/src/input_data_channel_proxy.cpp
View File

@ -30,7 +30,8 @@ InputDataChannelProxy::InputDataChannelProxy(const sptr<IRemoteObject> &object)
int32_t InputDataChannelProxy::InsertText(const std::u16string &text)
{
IMSA_HILOGI("InputDataChannelProxy::InsertText");
MessageParcel data, reply;
MessageParcel data;
MessageParcel reply;
MessageOption option;
data.WriteInterfaceToken(GetDescriptor());
data.WriteString16(text);
@ -46,7 +47,8 @@ int32_t InputDataChannelProxy::InsertText(const std::u16string &text)
int32_t InputDataChannelProxy::DeleteForward(int32_t length)
{
IMSA_HILOGI("InputDataChannelProxy::DeleteForward");
MessageParcel data, reply;
MessageParcel data;
MessageParcel reply;
MessageOption option;
data.WriteInterfaceToken(GetDescriptor());
data.WriteInt32(length);
@ -62,7 +64,8 @@ int32_t InputDataChannelProxy::DeleteForward(int32_t length)
int32_t InputDataChannelProxy::DeleteBackward(int32_t length)
{
IMSA_HILOGI("InputDataChannelProxy::DeleteBackward");
MessageParcel data, reply;
MessageParcel data;
MessageParcel reply;
MessageOption option;
data.WriteInterfaceToken(GetDescriptor());
data.WriteInt32(length);
@ -78,7 +81,8 @@ int32_t InputDataChannelProxy::DeleteBackward(int32_t length)
int32_t InputDataChannelProxy::GetTextBeforeCursor(int32_t number, std::u16string &text)
{
IMSA_HILOGI("InputDataChannelProxy::GetTextBeforeCursor");
MessageParcel data, reply;
MessageParcel data;
MessageParcel reply;
MessageOption option;
data.WriteInterfaceToken(GetDescriptor());
data.WriteInt32(number);
@ -92,7 +96,8 @@ int32_t InputDataChannelProxy::GetTextBeforeCursor(int32_t number, std::u16strin
int32_t InputDataChannelProxy::GetTextAfterCursor(int32_t number, std::u16string &text)
{
IMSA_HILOGI("InputDataChannelProxy::GetTextAfterCursor");
MessageParcel data, reply;
MessageParcel data;
MessageParcel reply;
MessageOption option;
data.WriteInterfaceToken(GetDescriptor());
data.WriteInt32(number);
@ -106,7 +111,8 @@ int32_t InputDataChannelProxy::GetTextAfterCursor(int32_t number, std::u16string
void InputDataChannelProxy::SendKeyboardStatus(int32_t status)
{
IMSA_HILOGI("InputDataChannelProxy::SendKeyboardStatus");
MessageParcel data, reply;
MessageParcel data;
MessageParcel reply;
MessageOption option;
data.WriteInterfaceToken(GetDescriptor());
data.WriteInt32(status);
@ -117,7 +123,8 @@ void InputDataChannelProxy::SendKeyboardStatus(int32_t status)
int32_t InputDataChannelProxy::SendFunctionKey(int32_t funcKey)
{
IMSA_HILOGI("InputDataChannelProxy::SendFunctionKey");
MessageParcel data, reply;
MessageParcel data;
MessageParcel reply;
MessageOption option;
data.WriteInterfaceToken(GetDescriptor());
data.WriteInt32(funcKey);
@ -130,8 +137,8 @@ int32_t InputDataChannelProxy::SendFunctionKey(int32_t funcKey)
int32_t InputDataChannelProxy::MoveCursor(int32_t keyCode)
{
IMSA_HILOGI("InputDataChannelProxy::MoveCursor");
MessageParcel data, reply;
MessageParcel data;
MessageParcel reply;
MessageOption option;
data.WriteInterfaceToken(GetDescriptor());
data.WriteInt32(keyCode);
@ -144,7 +151,8 @@ int32_t InputDataChannelProxy::MoveCursor(int32_t keyCode)
int32_t InputDataChannelProxy::GetEnterKeyType(int32_t &keyType)
{
IMSA_HILOGI("InputDataChannelProxy::GetEnterKeyType");
MessageParcel data, reply;
MessageParcel data;
MessageParcel reply;
MessageOption option;
data.WriteInterfaceToken(GetDescriptor());
@ -157,7 +165,8 @@ int32_t InputDataChannelProxy::GetEnterKeyType(int32_t &keyType)
int32_t InputDataChannelProxy::GetInputPattern(int32_t &inputPattern)
{
IMSA_HILOGI("InputDataChannelProxy::GetInputPattern");
MessageParcel data, reply;
MessageParcel data;
MessageParcel reply;
MessageOption option;
data.WriteInterfaceToken(GetDescriptor());
@ -170,7 +179,8 @@ int32_t InputDataChannelProxy::GetInputPattern(int32_t &inputPattern)
void InputDataChannelProxy::HandleSetSelection(int32_t start, int32_t end)
{
IMSA_HILOGI("InputDataChannelProxy::HandleSetSelection");
MessageParcel data, reply;
MessageParcel data;
MessageParcel reply;
MessageOption option;
data.WriteInterfaceToken(GetDescriptor());
data.WriteInt32(start);
@ -182,7 +192,8 @@ void InputDataChannelProxy::HandleSetSelection(int32_t start, int32_t end)
void InputDataChannelProxy::HandleExtendAction(int32_t action)
{
IMSA_HILOGI("InputDataChannelProxy::HandleExtendAction");
MessageParcel data, reply;
MessageParcel data;
MessageParcel reply;
MessageOption option;
data.WriteInterfaceToken(GetDescriptor());
data.WriteInt32(action);
@ -193,7 +204,8 @@ void InputDataChannelProxy::HandleExtendAction(int32_t action)
void InputDataChannelProxy::HandleSelect(int32_t keyCode, int32_t cursorMoveSkip)
{
IMSA_HILOGI("InputDataChannelProxy::HandleSelect");
MessageParcel data, reply;
MessageParcel data;
MessageParcel reply;
MessageOption option;
data.WriteInterfaceToken(GetDescriptor());
data.WriteInt32(keyCode);

3
services/src/input_control_channel_proxy.cpp
View File

@ -43,7 +43,8 @@ InputControlChannelProxy::~InputControlChannelProxy()
int32_t InputControlChannelProxy::HideKeyboardSelf(int flags)
{
IMSA_HILOGI("InputControlChannelProxy::HideKeyboardSelf");
MessageParcel data, reply;
MessageParcel data;
MessageParcel reply;
MessageOption option;
data.WriteInterfaceToken(GetDescriptor());
data.WriteInt32(flags);

4
services/src/input_method_system_ability.cpp
View File

@ -485,8 +485,8 @@ int32_t InputMethodSystemAbility::ListSubtypeByBundleName(
if (subtypeInfo.bundleName == name) {
std::vector<Metadata> extends = subtypeInfo.metadata;
auto property = GetExtends(extends);
auto label =
bundleMgr->GetStringById(subtypeInfo.bundleName, subtypeInfo.moduleName, subtypeInfo.labelId, userId);
auto label = bundleMgr->GetStringById(subtypeInfo.bundleName, subtypeInfo.moduleName,
subtypeInfo.labelId, userId);
subProps.push_back({ .id = subtypeInfo.bundleName,
.label = subtypeInfo.name,
.name = label,