diff --git a/services/dbms/src/dbms_device_manager.cpp b/services/dbms/src/dbms_device_manager.cpp index 369ada8631b27f2a746a41004f593b1a9bc3867e..59afac092b75ce72f582d970d487522f281b5569 100644 --- a/services/dbms/src/dbms_device_manager.cpp +++ b/services/dbms/src/dbms_device_manager.cpp @@ -102,11 +102,11 @@ bool DbmsDeviceManager::CheckAclData(DistributedBmsAclInfo info) { #ifdef ACCOUNT_ENABLE DistributedHardware::DmAccessCaller dmSrecaller = { + .accountId = info.accountId, + .pkgName = info.pkgName, .networkId = info.networkId, .userId = info.userId, - .accountId = info.accountId, - .tokenId = info.tokenId, - .pkgName = info.pkgName + .tokenId = info.tokenId }; AccountSA::OhosAccountInfo osAccountInfo; if (!AccountManagerHelper::GetOsAccountData(osAccountInfo)) { @@ -118,9 +118,9 @@ bool DbmsDeviceManager::CheckAclData(DistributedBmsAclInfo info) return false; } DistributedHardware::DmAccessCallee dmDstCallee = { + .accountId = osAccountInfo.uid_, .networkId = dmDeviceInfo.networkId, .userId = AccountManagerHelper::GetCurrentActiveUserId(), - .accountId = osAccountInfo.uid_, .tokenId = OHOS::Security::AccessToken::AccessTokenKit::GetHapTokenID(dmDstCallee.userId, info.pkgName, 0) }; return DistributedHardware::DeviceManager::GetInstance().CheckAccessControl(dmSrecaller, dmDstCallee);