diff --git a/interfaces/innerkits/accesstoken/src/accesstoken_kit.cpp b/interfaces/innerkits/accesstoken/src/accesstoken_kit.cpp index 61fa47abb6a6c91dd96f17dadf1acea8409884a4..323e6fdb9afe0c1414e3515c6d746d331c56cf0f 100644 --- a/interfaces/innerkits/accesstoken/src/accesstoken_kit.cpp +++ b/interfaces/innerkits/accesstoken/src/accesstoken_kit.cpp @@ -130,7 +130,6 @@ int AccessTokenKit::DeleteToken(AccessTokenID tokenID) { ACCESSTOKEN_LOG_INFO(LABEL, "TokenID=%{public}d.", tokenID); if (tokenID == INVALID_TOKENID) { - ACCESSTOKEN_LOG_ERROR(LABEL, "TokenID is invalid"); return AccessTokenError::ERR_PARAM_INVALID; } return AccessTokenManagerClient::GetInstance().DeleteToken(tokenID); diff --git a/services/accesstokenmanager/main/cpp/src/permission/permission_manager.cpp b/services/accesstokenmanager/main/cpp/src/permission/permission_manager.cpp index 09a353c789fdaf237c22f512ee0e0d8fdf246572..7fe33bcb1a61e54ac8fcc4a28faff29df868f51c 100644 --- a/services/accesstokenmanager/main/cpp/src/permission/permission_manager.cpp +++ b/services/accesstokenmanager/main/cpp/src/permission/permission_manager.cpp @@ -570,7 +570,7 @@ int32_t PermissionManager::UpdateTokenPermissionState( { std::shared_ptr infoPtr = AccessTokenInfoManager::GetInstance().GetHapTokenInfoInner(id); if (infoPtr == nullptr) { - ACCESSTOKEN_LOG_ERROR(LABEL, "tokenInfo is null, tokenId=%{public}d", id); + ACCESSTOKEN_LOG_ERROR(LABEL, "tokenInfo is null, tokenId=%{public}u", id); return AccessTokenError::ERR_TOKENID_NOT_EXIST; } if (infoPtr->IsRemote()) { @@ -1128,7 +1128,7 @@ bool PermissionManager::InitDlpPermissionList(const std::string& bundleName, int bool PermissionManager::InitPermissionList(const std::string& appDistributionType, const HapPolicyParams& policy, std::vector& initializedList) { - ACCESSTOKEN_LOG_INFO(LABEL, "Before, request perm list size: %{public}zu, preAuthorizationInfo size %{public}zu," + ACCESSTOKEN_LOG_INFO(LABEL, "Before, request perm list size: %{public}zu, preAuthorizationInfo size %{public}zu, " "ACLRequestedList size %{public}zu.", policy.permStateList.size(), policy.preAuthorizationInfo.size(), policy.aclRequestedList.size()); diff --git a/services/accesstokenmanager/main/cpp/src/service/accesstoken_manager_service.cpp b/services/accesstokenmanager/main/cpp/src/service/accesstoken_manager_service.cpp index 18ed6c44df8765bd3f1dd09d6152d87e3fe7c67b..5cba2f1aa32ca371a37bbb25b528f2df2e596811 100644 --- a/services/accesstokenmanager/main/cpp/src/service/accesstoken_manager_service.cpp +++ b/services/accesstokenmanager/main/cpp/src/service/accesstoken_manager_service.cpp @@ -87,9 +87,9 @@ void AccessTokenManagerService::OnStart() ACCESSTOKEN_LOG_INFO(LABEL, "AccessTokenManagerService has already started!"); return; } - ACCESSTOKEN_LOG_INFO(LABEL, "AccessTokenManagerService is starting"); + ACCESSTOKEN_LOG_INFO(LABEL, "AccessTokenManagerService is starting."); if (!Initialize()) { - ACCESSTOKEN_LOG_ERROR(LABEL, "Failed to initialize"); + ACCESSTOKEN_LOG_ERROR(LABEL, "Failed to initialize."); return; } state_ = ServiceRunningState::STATE_RUNNING; @@ -99,6 +99,7 @@ void AccessTokenManagerService::OnStart() ReportSysEventServiceStartError(SA_PUBLISH_FAILED, "Publish accesstoken_service fail.", -1); return; } + AccessTokenServiceParamSet(); (void)AddSystemAbilityListener(SECURITY_COMPONENT_SERVICE_ID); ACCESSTOKEN_LOG_INFO(LABEL, "Congratulations, AccessTokenManagerService start successfully!"); } @@ -163,8 +164,6 @@ int AccessTokenManagerService::GetDefPermissions(AccessTokenID tokenID, std::vec int AccessTokenManagerService::GetReqPermissions( AccessTokenID tokenID, std::vector& reqPermList, bool isSystemGrant) { - ACCESSTOKEN_LOG_DEBUG(LABEL, "TokenID: %{public}d, isSystemGrant: %{public}d", tokenID, isSystemGrant); - std::vector permList; int ret = PermissionManager::GetInstance().GetReqPermissions(tokenID, permList, isSystemGrant); @@ -237,7 +236,7 @@ PermissionOper AccessTokenManagerService::GetPermissionsState(AccessTokenID toke if (static_cast(reqPermList[i].permsState.state) == DYNAMIC_OPER) { needRes = true; } - ACCESSTOKEN_LOG_DEBUG(LABEL, "Perm: 0x%{public}s, state: 0x%{public}d", + ACCESSTOKEN_LOG_DEBUG(LABEL, "Perm: %{public}s, state: %{public}d", reqPermList[i].permsState.permissionName.c_str(), reqPermList[i].permsState.state); } if (GetTokenType(tokenID) == TOKEN_HAP && AccessTokenInfoManager::GetInstance().GetPermDialogCap(tokenID)) { @@ -345,7 +344,6 @@ int32_t AccessTokenManagerService::InitHapToken( int32_t ret = AccessTokenInfoManager::GetInstance().CreateHapTokenInfo( info.hapInfoParameter, policy.hapPolicyParameter, fullTokenId); if (ret != RET_SUCCESS) { - ACCESSTOKEN_LOG_ERROR(LABEL, "Hap token info create failed."); return ret; } @@ -653,7 +651,6 @@ bool AccessTokenManagerService::Initialize() DlpPermissionSetParser::GetInstance().Init(); #endif PermissionDefinitionParser::GetInstance().Init(); - AccessTokenServiceParamSet(); GetConfigValue(); TempPermissionObserver::GetInstance().GetConfigValue(); ACCESSTOKEN_LOG_INFO(LABEL, "Initialize success"); diff --git a/services/accesstokenmanager/main/cpp/src/token/accesstoken_info_manager.cpp b/services/accesstokenmanager/main/cpp/src/token/accesstoken_info_manager.cpp index 0261f4d3b227c443e9af5e30805cc7dcdfd23332..c08f5a8e21b032f2fd9d1e51fcd7f2bc0eb85707 100644 --- a/services/accesstokenmanager/main/cpp/src/token/accesstoken_info_manager.cpp +++ b/services/accesstokenmanager/main/cpp/src/token/accesstoken_info_manager.cpp @@ -567,7 +567,7 @@ int AccessTokenInfoManager::CreateHapTokenInfo( int32_t cloneFlag = ((dlpFlag == 0) && (info.instIndex) > 0) ? 1 : 0; AccessTokenID tokenId = AccessTokenIDManager::GetInstance().CreateAndRegisterTokenId(TOKEN_HAP, dlpFlag, cloneFlag); if (tokenId == 0) { - ACCESSTOKEN_LOG_INFO(LABEL, "Token Id create failed"); + ACCESSTOKEN_LOG_ERROR(LABEL, "Token Id create failed"); return ERR_TOKENID_CREATE_FAILED; } PermissionManager::GetInstance().AddDefPermissions(policy.permList, tokenId, false); @@ -728,12 +728,12 @@ int32_t AccessTokenInfoManager::UpdateHapToken(AccessTokenIDEx& tokenIdEx, const { AccessTokenID tokenID = tokenIdEx.tokenIdExStruct.tokenID; if (!DataValidator::IsAppIDDescValid(info.appIDDesc)) { - ACCESSTOKEN_LOG_INFO(LABEL, "Token %{public}u parm format error!", tokenID); + ACCESSTOKEN_LOG_ERROR(LABEL, "Token %{public}u parm format error!", tokenID); return AccessTokenError::ERR_PARAM_INVALID; } std::shared_ptr infoPtr = GetHapTokenInfoInner(tokenID); if (infoPtr == nullptr) { - ACCESSTOKEN_LOG_INFO(LABEL, "Token %{public}u is null, can not update!", tokenID); + ACCESSTOKEN_LOG_ERROR(LABEL, "Token %{public}u is null, can not update!", tokenID); return AccessTokenError::ERR_TOKENID_NOT_EXIST; } @@ -1188,7 +1188,7 @@ int AccessTokenInfoManager::AddHapTokenInfoToDb( std::vector permDefValues; std::vector permStateValues; if (hapInfo == nullptr) { - ACCESSTOKEN_LOG_INFO(LABEL, "Token %{public}u info is null!", tokenID); + ACCESSTOKEN_LOG_ERROR(LABEL, "Token %{public}u info is null!", tokenID); return AccessTokenError::ERR_TOKENID_NOT_EXIST; } hapInfo->StoreHapInfo(hapInfoValues); @@ -1245,8 +1245,6 @@ AccessTokenID AccessTokenInfoManager::GetNativeTokenId(const std::string& proces void AccessTokenInfoManager::DumpHapTokenInfoByTokenId(const AccessTokenID tokenId, std::string& dumpInfo) { - ACCESSTOKEN_LOG_DEBUG(LABEL, "Dump by tokenId[%{public}u].", tokenId); - ATokenTypeEnum type = AccessTokenIDManager::GetInstance().GetTokenIdType(tokenId); if (type == TOKEN_HAP) { std::shared_ptr infoPtr = GetHapTokenInfoInner(tokenId); @@ -1265,8 +1263,6 @@ void AccessTokenInfoManager::DumpHapTokenInfoByTokenId(const AccessTokenID token void AccessTokenInfoManager::DumpHapTokenInfoByBundleName(const std::string& bundleName, std::string& dumpInfo) { - ACCESSTOKEN_LOG_DEBUG(LABEL, "Get hap token info by bundleName[%{public}s].", bundleName.c_str()); - Utils::UniqueReadGuard hapInfoGuard(this->hapTokenInfoLock_); for (auto iter = hapTokenInfoMap_.begin(); iter != hapTokenInfoMap_.end(); iter++) { if (iter->second != nullptr) { @@ -1295,8 +1291,6 @@ void AccessTokenInfoManager::DumpAllHapTokenInfo(std::string& dumpInfo) void AccessTokenInfoManager::DumpNativeTokenInfoByProcessName(const std::string& processName, std::string& dumpInfo) { - ACCESSTOKEN_LOG_DEBUG(LABEL, "Get native token info by processName[%{public}s].", processName.c_str()); - Utils::UniqueReadGuard infoGuard(this->nativeTokenInfoLock_); for (auto iter = nativeTokenInfoMap_.begin(); iter != nativeTokenInfoMap_.end(); iter++) { if ((iter->second != nullptr) && (processName == iter->second->GetProcessName())) { diff --git a/services/privacymanager/privacy.cfg b/services/privacymanager/privacy.cfg index 598743d57e04c6734019b70e8a348c6e8b511e56..3b7d9a2fd14f86ad0581560b8f084a51714919fe 100644 --- a/services/privacymanager/privacy.cfg +++ b/services/privacymanager/privacy.cfg @@ -23,7 +23,7 @@ "ohos.permission.MANAGE_DISPOSED_APP_STATUS", "ohos.permission.USE_SECURITY_PRIVACY_MESSAGER", "ohos.permission.CAMERA_CONTROL", - "ohos.permission.MICROPHONE_CONTROL" + "ohos.permission.MICROPHONE_CONTROL" ], "secon" : "u:r:privacy_service:s0" } diff --git a/services/privacymanager/test/unittest/permission_record_manager_test.cpp b/services/privacymanager/test/unittest/permission_record_manager_test.cpp index 7a35f11811efa3986bb5dd6e69dac06c58f5103b..79538b80242e668e976e794500fe952c459fe591 100644 --- a/services/privacymanager/test/unittest/permission_record_manager_test.cpp +++ b/services/privacymanager/test/unittest/permission_record_manager_test.cpp @@ -531,7 +531,7 @@ HWTEST_F(PermissionRecordManagerTest, StartUsingPermissionTest011, TestSize.Leve ASSERT_EQ(PERM_ACTIVE_IN_FOREGROUND, callback->type_); } -#ifdef APP_SECURITY_PRIVACY_SERVICE +#ifndef APP_SECURITY_PRIVACY_SERVICE /* * @tc.name: ShowGlobalDialog001 * @tc.desc: ShowGlobalDialog function test @@ -956,7 +956,7 @@ HWTEST_F(PermissionRecordManagerTest, SetMutePolicyTest007, TestSize.Level1) PermissionRecordManager::GetInstance().SetMutePolicy(PolicyType::TEMPORARY, CallerType::MICROPHONE, false)); } -#ifdef APP_SECURITY_PRIVACY_SERVICE +#ifndef APP_SECURITY_PRIVACY_SERVICE /* * @tc.name: SetMutePolicyTest008 * @tc.desc: