提交 d1886c5e 编写于 作者: L liubb_0516

Merge branch 'master' of gitee.com:liubb940516/communication_ipc_1

Signed-off-by: Nliubb_0516 <liubeibei8@huawei.com>
...@@ -50,7 +50,6 @@ public: ...@@ -50,7 +50,6 @@ public:
{ {
needCloseFd_ = true; needCloseFd_ = true;
}; };
bool MessageParcelAppend(MessageParcel &data);
private: private:
#ifndef CONFIG_IPC_SINGLE #ifndef CONFIG_IPC_SINGLE
......
...@@ -428,7 +428,7 @@ int TestServiceProxy::TestAccessTokenID(int32_t ftoken_expected) ...@@ -428,7 +428,7 @@ int TestServiceProxy::TestAccessTokenID(int32_t ftoken_expected)
int TestServiceProxy::TestMessageParcelAppend(MessageParcel &dst, MessageParcel &src) int TestServiceProxy::TestMessageParcelAppend(MessageParcel &dst, MessageParcel &src)
{ {
bool res = dst.MessageParcelAppend(src); bool res = dst.ParcelAppend(src);
if (!res) { if (!res) {
ZLOGE(LABEL, "TestMessageParcelAppend without ipc failed"); ZLOGE(LABEL, "TestMessageParcelAppend without ipc failed");
return -1; return -1;
...@@ -439,7 +439,7 @@ int TestServiceProxy::TestMessageParcelAppend(MessageParcel &dst, MessageParcel ...@@ -439,7 +439,7 @@ int TestServiceProxy::TestMessageParcelAppend(MessageParcel &dst, MessageParcel
int TestServiceProxy::TestMessageParcelAppendWithIpc(MessageParcel &dst, MessageParcel &src, int TestServiceProxy::TestMessageParcelAppendWithIpc(MessageParcel &dst, MessageParcel &src,
MessageParcel &reply, bool withObject) MessageParcel &reply, bool withObject)
{ {
bool res = dst.MessageParcelAppend(src); bool res = dst.ParcelAppend(src);
if (!res) { if (!res) {
ZLOGE(LABEL, "TestMessageParcelAppend with ipc failed"); ZLOGE(LABEL, "TestMessageParcelAppend with ipc failed");
return -1; return -1;
...@@ -685,6 +685,7 @@ int TestServiceStub::OnRemoteRequest(uint32_t code, ...@@ -685,6 +685,7 @@ int TestServiceStub::OnRemoteRequest(uint32_t code,
reply.WriteInt32(data.ReadInt32()); reply.WriteInt32(data.ReadInt32());
reply.WriteString(data.ReadString()); reply.WriteString(data.ReadString());
reply.WriteRemoteObject(data.ReadRemoteObject()); reply.WriteRemoteObject(data.ReadRemoteObject());
reply.WriteFileDescriptor(data.ReadFileDescriptor());
break; break;
} }
default: default:
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册