!81 回合,轻量级上配合ipc修复多次重启后概率性蓝屏

Merge pull request !81 from chen/cherry-pick-1653640421
This commit is contained in:
openharmony_ci
2022-05-27 11:21:41 +00:00
committed by Gitee
2 changed files with 8 additions and 0 deletions
+1
View File
@@ -27,6 +27,7 @@ shared_library("server") {
"//third_party/bounds_checking_function/include",
"//base/security/permission/interfaces/innerkits/permission_lite",
"//base/security/permission/services/permission_lite/pms_base/include",
"//foundation/communication/ipc_lite/frameworks/liteipc/include",
]
public_deps = [
+7
View File
@@ -20,6 +20,7 @@
#include <ohos_init.h>
#include <ohos_types.h>
#include <ohos_errno.h>
#include <liteipc.h>
#include <liteipc_adapter.h>
#include <log.h>
#include "cJSON.h"
@@ -167,6 +168,12 @@ static int ProcEndpoint(SamgrServer *server, int32 option, void *origin, IpcIo *
SvcIdentity identity = {(uint32)INVALID_INDEX, (uint32)INVALID_INDEX, (uint32)INVALID_INDEX};
(void)GenServiceHandle(&identity, GetCallingTid(origin));
#ifdef __LINUX__
IpcMsg* data = (IpcMsg*)origin;
if (data == NULL) {
HILOG_ERROR(HILOG_MODULE_SAMGR, "Register Endpoint origin null pointer!");
return EC_FAILURE;
}
identity.handle = data->target.handle;
BinderAcquire(g_server.samgr->context, identity.handle);
#endif