From 5cb71e3d688e90ca1c3de65ef02b9135c17f82de Mon Sep 17 00:00:00 2001 From: Cuiziyuan Date: Tue, 20 May 2025 20:56:21 +0800 Subject: [PATCH] =?UTF-8?q?=E5=88=9B=E5=BB=BAhelper=E6=9F=A5=E8=AF=A2?= =?UTF-8?q?=E9=9D=99=E9=BB=98=E4=BD=BF=E8=83=BD=E5=BC=80=E5=85=B3=E6=97=B6?= =?UTF-8?q?=E6=97=A0=E9=9C=80=E6=9F=A5=E8=AF=A2=E5=85=83=E6=95=B0=E6=8D=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Cuiziyuan --- .../service/data_share/data_provider_config.cpp | 7 +++++++ .../data_share/data_share_service_impl.cpp | 15 --------------- 2 files changed, 7 insertions(+), 15 deletions(-) diff --git a/services/distributeddataservice/service/data_share/data_provider_config.cpp b/services/distributeddataservice/service/data_share/data_provider_config.cpp index 74a7630fb..0bb5498fa 100644 --- a/services/distributeddataservice/service/data_share/data_provider_config.cpp +++ b/services/distributeddataservice/service/data_share/data_provider_config.cpp @@ -42,6 +42,13 @@ DataProviderConfig::DataProviderConfig(const std::string &uri, uint32_t callerTo LoadConfigCommonStrategy::GetInfoFromProxyURI(providerInfo_.uri, providerInfo_.visitedUserId, callerTokenId, providerInfo_.bundleName); URIUtils::FormatUri(providerInfo_.uri); + // if visitedUserId is 0, set current foreground userId as visitedUserId + if (providerInfo_.visitedUserId == 0) { + if (!(AccountDelegate::GetInstance()->QueryForegroundUserId(providerInfo_.visitedUserId))) { + ZLOGE("Get foreground userId failed"); + providerInfo_.visitedUserId = -1; + } + } } else { auto [success, data] = URIUtils::GetUserFromProxyURI(providerInfo_.uri); if (success) { diff --git a/services/distributeddataservice/service/data_share/data_share_service_impl.cpp b/services/distributeddataservice/service/data_share/data_share_service_impl.cpp index 99bff919b..9c58bf0eb 100644 --- a/services/distributeddataservice/service/data_share/data_share_service_impl.cpp +++ b/services/distributeddataservice/service/data_share/data_share_service_impl.cpp @@ -1083,21 +1083,6 @@ int32_t DataShareServiceImpl::GetBMSAndMetaDataStatus(const std::string &uri, co errCode, URIUtils::Anonymous(calledInfo.uri).c_str()); return errCode; } - DataShareDbConfig dbConfig; - DataShareDbConfig::DbConfig dbArg; - dbArg.uri = calledInfo.uri; - dbArg.bundleName = calledInfo.bundleName; - dbArg.storeName = calledInfo.storeName; - dbArg.userId = calledInfo.singleton ? 0 : calledInfo.visitedUserId; - dbArg.hasExtension = calledInfo.hasExtension; - dbArg.appIndex = calledInfo.appIndex; - auto [code, metaData] = dbConfig.GetMetaData(dbArg); - if (code != E_OK) { - ZLOGE("Get metaData fail,bundleName:%{public}s,tableName:%{public}s,tokenId:0x%{public}x, uri:%{public}s", - calledInfo.bundleName.c_str(), calledInfo.tableName.c_str(), tokenId, - URIUtils::Anonymous(calledInfo.uri).c_str()); - return E_METADATA_NOT_EXISTS; - } return E_OK; } -- Gitee