Merge pull request !176 from 符子坤/master
This commit is contained in:
openharmony_ci
2022-03-12 08:54:58 +00:00
committed by Gitee
2 changed files with 2 additions and 5 deletions
+1
View File
@@ -1349,6 +1349,7 @@ int32_t AddDevAuthServiceToManager(uintptr_t *serviceCtx)
ret = sysMgr->AddSystemAbility(DEVICE_AUTH_SERVICE_ID, sPtr);
if (ret != ERR_OK) {
LOGE("add service failed");
delete sPtr;
return HC_ERROR;
}
*serviceCtx = reinterpret_cast<uintptr_t>(sPtr);
@@ -58,11 +58,7 @@ static int ExchangeRequest(AsyBaseCurTask *task, PakeParams *params, const CJson
}
// execute
res = ClientRequestStandardBindExchange(params, &(realTask->params));
if (res != HC_SUCCESS) {
LOGE("ClientRequestStandardBindExchange failed");
return res;
}
GOTO_ERR_AND_SET_RET(ClientRequestStandardBindExchange(params, &(realTask->params)), res);
// package message
GOTO_ERR_AND_SET_RET(AddIntToJson(sendToPeer, FIELD_MESSAGE, PAKE_BIND_EXCHANGE_REQUEST), res);