diff --git a/services/audiomanager/managersink/src/daudio_sink_dev.cpp b/services/audiomanager/managersink/src/daudio_sink_dev.cpp index 60be7ddefd51a6a06764898493b65e1de337039d..1c7122d2fc47b861b4d28dcaefc40a98da1a1477 100644 --- a/services/audiomanager/managersink/src/daudio_sink_dev.cpp +++ b/services/audiomanager/managersink/src/daudio_sink_dev.cpp @@ -795,20 +795,20 @@ bool DAudioSinkDev::CheckAclRight() std::shared_ptr initCallback = std::make_shared(); ret = DeviceManager::GetInstance().InitDeviceManager(PKG_NAME, initCallback); CHECK_AND_RETURN_RET_LOG(ret != DH_SUCCESS, false, "InitDeviceManager failed ret = %{public}d", ret); - DmAccessCaller dmSrcCaller = { - .accountId = accountId_, - .pkgName = PKG_NAME, - .networkId = devId_, - .userId = userId_, - .tokenId = tokenId_, - }; - DmAccessCallee dmDstCallee = { - .networkId = sinkDevId, - .accountId = accountId, - .userId = userId, - .tokenId = sinkTokenId_, - .pkgName = PKG_NAME, - }; + + DmAccessCaller dmSrcCaller; + dmSrcCaller.accountId = accountId_; + dmSrcCaller.pkgName = PKG_NAME; + dmSrcCaller.networkId = devId_; + dmSrcCaller.userId = userId_; + dmSrcCaller.tokenId = tokenId_; + + DmAccessCallee dmDstCallee; + dmDstCallee.accountId = accountId; + dmDstCallee.networkId = sinkDevId; + dmDstCallee.pkgName = PKG_NAME; + dmDstCallee.userId = userId; + dmDstCallee.tokenId = sinkTokenId_; DHLOGI("CheckAclRight srcDevId: %{public}s, accountId: %{public}s, sinkDevId: %{public}s", GetAnonyString(devId_).c_str(), GetAnonyString(accountId).c_str(), GetAnonyString(sinkDevId).c_str()); return DeviceManager::GetInstance().CheckSinkAccessControl(dmSrcCaller, dmDstCallee); diff --git a/services/audiomanager/managersource/src/daudio_source_dev.cpp b/services/audiomanager/managersource/src/daudio_source_dev.cpp index d03b4e4c792e3b3e2fddae8e1d82846286635333..f97dac19016c8a11c3bbbbce7e6ef1b72cfa8a16 100644 --- a/services/audiomanager/managersource/src/daudio_source_dev.cpp +++ b/services/audiomanager/managersource/src/daudio_source_dev.cpp @@ -432,16 +432,15 @@ bool DAudioSourceDev::CheckAclRight() int32_t ret = DeviceManager::GetInstance().InitDeviceManager(PKG_NAME, initCallback); CHECK_AND_RETURN_RET_LOG(ret != DH_SUCCESS, false, "InitDeviceManager failed ret = %{public}d", ret); GetLocalDeviceNetworkId(srcDevId_); - DmAccessCaller dmSrcCaller = { - .accountId = accountId_, - .pkgName = PKG_NAME, - .networkId = srcDevId_, - .userId = userId_, - .tokenId = tokenId_, - }; - DmAccessCallee dmDstCallee = { - .networkId = devId_, - }; + DmAccessCaller dmSrcCaller; + dmSrcCaller.accountId = accountId_; + dmSrcCaller.pkgName = PKG_NAME; + dmSrcCaller.networkId = srcDevId_; + dmSrcCaller.userId = userId_; + dmSrcCaller.tokenId = tokenId_; + + DmAccessCallee dmDstCallee; + dmDstCallee.networkId = devId_; DHLOGI("CheckAclRight dmSrcCaller networkId: %{public}s, accountId: %{public}s, devId: %{public}s", GetAnonyString(srcDevId_).c_str(), GetAnonyString(accountId_).c_str(), GetAnonyString(devId_).c_str()); CHECK_AND_RETURN_RET_LOG(DeviceManager::GetInstance().CheckSrcAccessControl(dmSrcCaller, dmDstCallee),