openharmony/accessibility
1
0
Fork 0
mirror of https://gitee.com/openharmony/accessibility synced 2024-11-23 06:50:30 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

!1538 修复返回节点数量为0时，不能正常SetResult的问题

Browse Source 
Merge pull request !1538 from taojuncun/bug_1113_01
This commit is contained in:
openharmony_ci 2024-11-15 07:21:54 +00:00 committed by Gitee
commit 641ff87923
No known key found for this signature in database
GPG Key ID: 173E9B9CA92EEF8F
2 changed files with 40 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
common/interface/src/accessibility_element_operator_callback_proxy.cpp
View File

@ -81,25 +81,27 @@ void AccessibilityElementOperatorCallbackProxy::SetSearchElementInfoByAccessibil
return;
}
MessageParcel tmpParcel;
tmpParcel.SetMaxCapacity(MAX_RAWDATA_SIZE);
// when set pracel's max capacity, it won't alloc memory immediately
// MessageParcel will expand memory dynamiclly
for (const auto &info : infos) {
AccessibilityElementInfoParcel infoParcel(info);
if (!tmpParcel.WriteParcelable(&infoParcel)) {
HILOG_ERROR("write accessibilityElementInfoParcel failed");
if (infos.size() != 0) {
MessageParcel tmpParcel;
tmpParcel.SetMaxCapacity(MAX_RAWDATA_SIZE);
// when set pracel's max capacity, it won't alloc memory immediately
// MessageParcel will expand memory dynamiclly
for (const auto &info : infos) {
AccessibilityElementInfoParcel infoParcel(info);
if (!tmpParcel.WriteParcelable(&infoParcel)) {
HILOG_ERROR("write accessibilityElementInfoParcel failed");
return;
}
}
size_t tmpParcelSize = tmpParcel.GetDataSize();
if (!data.WriteUint32(tmpParcelSize)) {
HILOG_ERROR("write rawData size failed");
return;
}
if (!data.WriteRawData(reinterpret_cast<uint8_t *>(tmpParcel.GetData()), tmpParcelSize)) {
HILOG_ERROR("write rawData failed");
return;
}
}
size_t tmpParcelSize = tmpParcel.GetDataSize();
if (!data.WriteUint32(tmpParcelSize)) {
HILOG_ERROR("write rawData size failed");
return;
}
if (!data.WriteRawData(reinterpret_cast<uint8_t *>(tmpParcel.GetData()), tmpParcelSize)) {
HILOG_ERROR("write rawData failed");
return;
}
if (!SendTransactCmd(AccessibilityInterfaceCode::SET_RESULT_BY_ACCESSIBILITY_ID, data, reply, option)) {

39
common/interface/src/accessibility_element_operator_callback_stub.cpp
View File

@ -110,27 +110,30 @@ ErrCode AccessibilityElementOperatorCallbackStub::HandleSetSearchElementInfoByAc
std::vector<AccessibilityElementInfo> storeData;
int32_t requestId = data.ReadInt32();
size_t infoSize = data.ReadUint32();
size_t rawDataSize = data.ReadUint32();
MessageParcel tmpParcel;
void *buffer = nullptr;
// memory alloced in GetData will be released when tmpParcel destruct
if (!GetData(rawDataSize, data.ReadRawData(rawDataSize), buffer)) {
reply.WriteInt32(RET_ERR_FAILED);
return TRANSACTION_ERR;
}
if (!tmpParcel.ParseFrom(reinterpret_cast<uintptr_t>(buffer), rawDataSize)) {
reply.WriteInt32(RET_ERR_FAILED);
return TRANSACTION_ERR;
}
for (size_t i = 0; i < infoSize; i++) {
sptr<AccessibilityElementInfoParcel> info = tmpParcel.ReadStrongParcelable<AccessibilityElementInfoParcel>();
if (info == nullptr) {
if (infoSize != 0) {
size_t rawDataSize = data.ReadUint32();
MessageParcel tmpParcel;
void *buffer = nullptr;
// memory alloced in GetData will be released when tmpParcel destruct
if (!GetData(rawDataSize, data.ReadRawData(rawDataSize), buffer)) {
reply.WriteInt32(RET_ERR_FAILED);
return TRANSACTION_ERR;
}
storeData.emplace_back(*info);
if (!tmpParcel.ParseFrom(reinterpret_cast<uintptr_t>(buffer), rawDataSize)) {
reply.WriteInt32(RET_ERR_FAILED);
return TRANSACTION_ERR;
}
for (size_t i = 0; i < infoSize; i++) {
sptr<AccessibilityElementInfoParcel> info =
tmpParcel.ReadStrongParcelable<AccessibilityElementInfoParcel>();
if (info == nullptr) {
reply.WriteInt32(RET_ERR_FAILED);
return TRANSACTION_ERR;
}
storeData.emplace_back(*info);
}
}
reply.WriteInt32(RET_OK);
SetSearchElementInfoByAccessibilityIdResult(storeData, requestId);