openharmony/device_profile_core
1
0
Fork 0
mirror of https://gitee.com/openharmony/device_profile_core synced 2025-03-01 09:36:41 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

!55 fix ipc return value when write back by reply

Browse Source 
Merge pull request !55 from Gymee/bugfix
This commit is contained in:
openharmony_ci 2022-04-08 11:14:48 +00:00 committed by Gitee
commit 6191bf5196
No known key found for this signature in database
GPG Key ID: 173E9B9CA92EEF8F
2 changed files with 47 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

47
interfaces/innerkits/core/src/distributed_device_profile_proxy.cpp
View File

@ -1,5 +1,5 @@
/*
* Copyright (c) 2021 Huawei Device Co., Ltd.
* Copyright (c) 2021-2022 Huawei Device Co., Ltd.
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
@ -54,13 +54,18 @@ int32_t DistributedDeviceProfileProxy::GetDeviceProfile(const std::string& udid,
PARCEL_WRITE_HELPER(data, String, serviceId);
MessageParcel reply;
MessageOption option;
int32_t error = remote->SendRequest(GET_DEVICE_PROFILE, data, reply, option);
if (error != ERR_NONE) {
HILOGE("transact failed, error: %{public}d", error);
return error;
int32_t errCode = remote->SendRequest(GET_DEVICE_PROFILE, data, reply, option);
if (errCode != ERR_NONE) {
HILOGE("transact failed, errCode = %{public}d", errCode);
return errCode;
}
profile.Unmarshalling(reply);
return ERR_OK;
int32_t ret = reply.ReadInt32();
if (!profile.Unmarshalling(reply)) {
HILOGE("profile unmarshall failed");
return ERR_FLATTEN_OBJECT;
}
HILOGI("ret = %{public}d", ret);
return ret;
}
int32_t DistributedDeviceProfileProxy::DeleteDeviceProfile(const std::string& serviceId)
@ -99,13 +104,17 @@ int32_t DistributedDeviceProfileProxy::SubscribeProfileEvents(
MessageParcel reply;
MessageOption option;
int32_t errCode = remote->SendRequest(SUBSCRIBE_PROFILE_EVENT, data, reply, option);
if (errCode != ERR_OK) {
if (errCode != ERR_NONE) {
HILOGE("transact failed, errCode = %{public}d", errCode);
if (!DeviceProfileUtils::ReadProfileEvents(reply, failedEvents)) {
HILOGW("read profile events failed");
}
return errCode;
}
return errCode;
int32_t ret = reply.ReadInt32();
if ((ret != ERR_OK) && !DeviceProfileUtils::ReadProfileEvents(reply, failedEvents)) {
HILOGE("read profile events failed");
return ERR_FLATTEN_OBJECT;
}
HILOGI("ret = %{public}d", ret);
return ret;
}
int32_t DistributedDeviceProfileProxy::UnsubscribeProfileEvents(
@ -127,13 +136,17 @@ int32_t DistributedDeviceProfileProxy::UnsubscribeProfileEvents(
MessageParcel reply;
MessageOption option;
int32_t errCode = remote->SendRequest(UNSUBSCRIBE_PROFILE_EVENT, data, reply, option);
if (errCode != ERR_OK) {
if (errCode != ERR_NONE) {
HILOGE("transact failed, errCode = %{public}d", errCode);
if (!DeviceProfileUtils::ReadProfileEvents(reply, failedEvents)) {
HILOGW("read profile events failed");
}
return errCode;
}
return errCode;
int32_t ret = reply.ReadInt32();
if ((ret != ERR_OK) && !DeviceProfileUtils::ReadProfileEvents(reply, failedEvents)) {
HILOGW("read profile events failed");
return ERR_FLATTEN_OBJECT;
}
HILOGI("ret = %{public}d", ret);
return ret;
}
int32_t DistributedDeviceProfileProxy::SyncDeviceProfile(const SyncOptions& syncOptions,

30
services/core/src/distributed_device_profile_stub.cpp
View File

@ -1,5 +1,5 @@
/*
* Copyright (c) 2021 Huawei Device Co., Ltd.
* Copyright (c) 2021-2022 Huawei Device Co., Ltd.
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
@ -89,11 +89,11 @@ int32_t DistributedDeviceProfileStub::GetDeviceProfileInner(MessageParcel& data,
PARCEL_READ_HELPER(data, String, udid);
PARCEL_READ_HELPER(data, String, serviceId);
int32_t ret = GetDeviceProfile(udid, serviceId, profile);
if (!profile.Marshalling(reply)) {
if (!(reply.WriteInt32(ret) && profile.Marshalling(reply))) {
HILOGE("marshall profile failed");
return ERR_FLATTEN_OBJECT;
}
return ret;
return ERR_NONE;
}
int32_t DistributedDeviceProfileStub::DeleteDeviceProfileInner(MessageParcel& data, MessageParcel& reply)
@ -124,12 +124,14 @@ int32_t DistributedDeviceProfileStub::SubscribeProfileEventInner(MessageParcel&
int32_t errCode = SubscribeProfileEvents(subscribeInfos, eventNotifier, failedEvents);
HILOGI("errCode = %{public}d", errCode);
if (errCode != ERR_OK) {
if (!DeviceProfileUtils::WriteProfileEvents(failedEvents, reply)) {
HILOGW("write profile events failed");
}
if (!reply.WriteInt32(errCode)) {
return ERR_FLATTEN_OBJECT;
}
return errCode;
if ((errCode != ERR_OK) && !DeviceProfileUtils::WriteProfileEvents(failedEvents, reply)) {
HILOGE("write profile events failed");
return ERR_FLATTEN_OBJECT;
}
return ERR_NONE;
}
int32_t DistributedDeviceProfileStub::UnsubscribeProfileEventInner(MessageParcel& data, MessageParcel& reply)
@ -153,12 +155,14 @@ int32_t DistributedDeviceProfileStub::UnsubscribeProfileEventInner(MessageParcel
int32_t errCode = UnsubscribeProfileEvents(profileEvents, eventNotifier, failedEvents);
HILOGI("errCode = %{public}d", errCode);
if (errCode != ERR_OK) {
if (!DeviceProfileUtils::WriteProfileEvents(failedEvents, reply)) {
HILOGW("write profile events failed");
}
if (!reply.WriteInt32(errCode)) {
return ERR_FLATTEN_OBJECT;
}
return errCode;
if ((errCode != ERR_OK) && !DeviceProfileUtils::WriteProfileEvents(failedEvents, reply)) {
HILOGE("write profile events failed");
return ERR_FLATTEN_OBJECT;
}
return ERR_NONE;
}
int32_t DistributedDeviceProfileStub::SyncDeviceProfileInner(MessageParcel& data, MessageParcel& reply)