openharmony/distributedschedule_samgr
1
0
Fork 0
mirror of https://github.com/openharmony/distributedschedule_samgr.git synced 2026-07-20 22:47:20 -04:00
Code Issues Packages Projects Releases Wiki Activity

fix code review warning

Browse Source 
Signed-off-by: zmx <1029211721@qq.com>
Change-Id: Iae2b67eb28ce251bf9fd6d63435677af3a2607e1
This commit is contained in:
zmx
2022-03-08 16:11:15 +08:00
parent 669ce7a23b
commit 5cfdc9eafb
7 changed files with 15 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files
services/dtbschedmgr/include/dtbschedmgr_log.h
+2 -2
View File
@@ -153,11 +153,11 @@ enum {
*/
IPC_CALL_NORESPONSE_ERR = 29360149,
/**
* Result(29360150) for DistributedSched Service call bundle manger service error.
* Result(29360150) for DistributedSched Service call bundle manager service error.
*/
BUNDLE_MANAGER_SERVICE_ERR = 29360150,
/**
* Result(29360151) for DistributedSched Service call distributed manger error.
* Result(29360151) for DistributedSched Service call distributed manager error.
*/
DISTRIBUTED_MANAGER_ERR = 29360151,
/**
services/dtbschedmgr/src/ability_connection_wrapper_stub.cpp
+1 -1
View File
@@ -43,7 +43,7 @@ AbilityConnectionWrapperStub::AbilityConnectionWrapperStub(sptr<IRemoteObject> c
int32_t AbilityConnectionWrapperStub::OnRemoteRequest(uint32_t code, MessageParcel& data,
MessageParcel& reply, MessageOption& option)
{
HILOGD("AbilityConnectionWrapperStub::OnRemoteRequest code = %{public}d", code);
HILOGD("AbilityConnectionWrapperStub::OnRemoteRequest code = %{public}u", code);
std::u16string descriptor = IAbilityConnection::GetDescriptor();
std::u16string remoteDescriptor = data.ReadInterfaceToken();
if (descriptor != remoteDescriptor) {
services/dtbschedmgr/src/distributed_sched_permission.cpp
+3 -3
View File
@@ -45,7 +45,7 @@ int32_t DistributedSchedPermission::CheckDPermission(const AAFwk::Want& want, co
HILOGD("target ability info bundleName:%{public}s abilityName:%{public}s uri:%{private}s visible:%{public}d",
targetAbility.bundleName.c_str(), targetAbility.name.c_str(), targetAbility.uri.c_str(),
targetAbility.visible);
HILOGD("callerType:%{public}d accountType:%{public}d callerUid:%{public}d AccessTokenID:%{public}d",
HILOGD("callerType:%{public}d accountType:%{public}d callerUid:%{public}d AccessTokenID:%{public}u",
callerInfo.callerType, accountInfo.accountType, callerInfo.uid, callerInfo.accessToken);
// 2.check component access permission, when the ability is not visible.
if (!CheckComponentAccessPermission(targetAbility, callerInfo, accountInfo, want)) {
@@ -133,10 +133,10 @@ bool DistributedSchedPermission::CheckCustomPermission(const AppExecFwk::Ability
}
int32_t result = AccessToken::AccessTokenKit::VerifyAccessToken(dAccessToken, permission);
if (result == AccessToken::PermissionState::PERMISSION_DENIED) {
HILOGD("dAccessTokenID:%{public}d, permission:%{public}s denied!", dAccessToken, permission.c_str());
HILOGD("dAccessTokenID:%{public}u, permission:%{public}s denied!", dAccessToken, permission.c_str());
return false;
}
HILOGD("dAccessTokenID:%{public}d, permission:%{public}s matched!", dAccessToken, permission.c_str());
HILOGD("dAccessTokenID:%{public}u, permission:%{public}s matched!", dAccessToken, permission.c_str());
}
return true;
}
services/dtbschedmgr/src/distributed_sched_service.cpp
+1 -1
View File
@@ -870,7 +870,7 @@ int32_t DistributedSchedService::ConnectAbilityFromRemote(const OHOS::AAFwk::Wan
HILOGE("ConnectAbilityFromRemote connect is null");
return INVALID_REMOTE_PARAMETERS_ERR;
}
HILOGD("ConnectAbilityFromRemote uid is %{public}d, pid is %{public}d, AccessTokenID is %{public}d",
HILOGD("ConnectAbilityFromRemote uid is %{public}d, pid is %{public}d, AccessTokenID is %{public}u",
callerInfo.uid, callerInfo.pid, callerInfo.accessToken);
std::string localDeviceId;
std::string destinationDeviceId = want.GetElement().GetDeviceID();
services/dtbschedmgr/src/distributed_sched_stub.cpp
+6 -6
View File
@@ -131,7 +131,7 @@ int32_t DistributedSchedStub::StartRemoteAbilityInner(MessageParcel& data, Messa
PARCEL_READ_HELPER(data, Int32, requestCode);
uint32_t accessToken = 0;
PARCEL_READ_HELPER(data, Uint32, accessToken);
HILOGI("get AccessTokenID = %{public}d", accessToken);
HILOGI("get AccessTokenID = %{public}u", accessToken);
int32_t result = StartRemoteAbility(*want, callerUid, requestCode, accessToken);
HILOGI("StartRemoteAbilityInner result = %{public}d", result);
PARCEL_WRITE_REPLY_NOERROR(reply, Int32, result);
@@ -172,7 +172,7 @@ int32_t DistributedSchedStub::StartAbilityFromRemoteInner(MessageParcel& data, M
if (!extraInfoJson.is_discarded()) {
uint32_t accessToken = extraInfoJson[EXTRO_INFO_JSON_KEY_ACCESS_TOKEN];
callerInfo.accessToken = accessToken;
HILOGD("parse extra info, accessTokenID = %{public}d", accessToken);
HILOGD("parse extra info, accessTokenID = %{public}u", accessToken);
}
int32_t result = StartAbilityFromRemote(*want, abilityInfo, requestCode, callerInfo, accountInfo);
HILOGI("result = %{public}d", result);
@@ -219,7 +219,7 @@ int32_t DistributedSchedStub::StartContinuationInner(MessageParcel& data, Messag
int32_t status = data.ReadInt32();
uint32_t accessToken = 0;
PARCEL_READ_HELPER(data, Uint32, accessToken);
HILOGI("get AccessTokenID = %{public}d", accessToken);
HILOGI("get AccessTokenID = %{public}u", accessToken);
int32_t result = StartContinuation(*want, missionId, callerUid, status, accessToken);
HILOGI("result = %{public}d", result);
PARCEL_WRITE_REPLY_NOERROR(reply, Int32, result);
@@ -272,7 +272,7 @@ int32_t DistributedSchedStub::ConnectRemoteAbilityInner(MessageParcel& data, Mes
HILOGI("get callerPid = %{public}d", callerPid);
uint32_t accessToken = 0;
PARCEL_READ_HELPER(data, Uint32, accessToken);
HILOGI("get AccessTokenID = %{public}d", accessToken);
HILOGI("get AccessTokenID = %{public}u", accessToken);
int32_t result = ConnectRemoteAbility(*want, connect, callerUid, callerPid, accessToken);
HILOGI("result = %{public}d", result);
PARCEL_WRITE_REPLY_NOERROR(reply, Int32, result);
@@ -323,7 +323,7 @@ int32_t DistributedSchedStub::ConnectAbilityFromRemoteInner(MessageParcel& data,
if (!extraInfoJson.is_discarded()) {
uint32_t accessToken = extraInfoJson[EXTRO_INFO_JSON_KEY_ACCESS_TOKEN];
callerInfo.accessToken = accessToken;
HILOGD("parse extra info, accessTokenID = %{public}d", accessToken);
HILOGD("parse extra info, accessTokenID = %{public}u", accessToken);
}
std::string package = abilityInfo.bundleName;
std::string deviceId = abilityInfo.deviceId;
@@ -753,7 +753,7 @@ int32_t DistributedSchedStub::StartAbilityByCallFromRemoteInner(MessageParcel& d
if (!extraInfoJson.is_discarded()) {
uint32_t accessToken = extraInfoJson[EXTRO_INFO_JSON_KEY_ACCESS_TOKEN];
callerInfo.accessToken = accessToken;
HILOGD("parse extra info, accessToken = %{public}d", accessToken);
HILOGD("parse extra info, accessToken = %{public}u", accessToken);
}
shared_ptr<AAFwk::Want> want(data.ReadParcelable<AAFwk::Want>());
if (want == nullptr) {
services/dtbschedmgr/src/mission/snapshot.cpp
+1 -1
View File
@@ -152,7 +152,7 @@ unique_ptr<PixelMap> Snapshot::CreatePixelMap(const uint8_t* buffer, uint32_t bu
unique_ptr<PixelMap> pixelMap = imageSource->CreatePixelMap(decodeOpt, errCode);
HILOGI("[PerformanceTest] Create PixelMap spend %{public}" PRId64 " ms", GetTickCount() - begin);
if (pixelMap == nullptr || errCode != 0) {
HILOGW("Snapshot: CreatePixelMap failed, errCode:%{public}d!", errCode);
HILOGW("Snapshot: CreatePixelMap failed, errCode:%{public}u!", errCode);
return nullptr;
}
return pixelMap;
services/dtbschedmgr/test/unittest/distributed_sched_connect_test.cpp
+1 -1
View File
@@ -202,7 +202,7 @@ HWTEST_F(DistributedSchedConnectTest, DumpConnectInfo_001, TestSize.Level1)
if (samgr == nullptr) {
DTEST_LOG << "DistributedSchedServiceTest DumpConnectInfo_001 samgr null" << std::endl;
} else {
DTEST_LOG << "DistributedSchedServiceTest DumpConnectInfo_001 avaiable" << std::endl;
DTEST_LOG << "DistributedSchedServiceTest DumpConnectInfo_001 available" << std::endl;
}
auto dms = samgr->GetSystemAbility(DISTRIBUTED_SCHED_SA_ID);