From cd8230f416adff7584b9fc4c4892e86e04075039 Mon Sep 17 00:00:00 2001 From: 18795846185 Date: Tue, 3 Jun 2025 22:45:17 +0800 Subject: [PATCH 1/3] clm2025-ISnapshotHandler Signed-off-by: 18795846185 Change-Id: I952c9f1b62a2f6547c53b39bcb4d857d94188217 --- .../service/data_share/data_share_service_stub.cpp | 1 + 1 file changed, 1 insertion(+) diff --git a/services/distributeddataservice/service/data_share/data_share_service_stub.cpp b/services/distributeddataservice/service/data_share/data_share_service_stub.cpp index 170de1bcb..479c943c2 100644 --- a/services/distributeddataservice/service/data_share/data_share_service_stub.cpp +++ b/services/distributeddataservice/service/data_share/data_share_service_stub.cpp @@ -28,6 +28,7 @@ #include "log_print.h" #include "qos.h" #include "utils/anonymous.h" +//#include "ishared_result_set.h" namespace OHOS { namespace DataShare { -- Gitee From 7b9586690d949e8a4575c3ad14fda89f5bc74f9c Mon Sep 17 00:00:00 2001 From: 18795846185 Date: Wed, 4 Jun 2025 18:11:52 +0800 Subject: [PATCH 2/3] clm2025-ISystemAbilityTokenCallback Signed-off-by: 18795846185 Change-Id: Ie8d9edf71dd0a06b207bca429fda9604016d291e --- .../service/data_share/data_share_service_stub.cpp | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/services/distributeddataservice/service/data_share/data_share_service_stub.cpp b/services/distributeddataservice/service/data_share/data_share_service_stub.cpp index 479c943c2..a12668b5a 100644 --- a/services/distributeddataservice/service/data_share/data_share_service_stub.cpp +++ b/services/distributeddataservice/service/data_share/data_share_service_stub.cpp @@ -28,7 +28,6 @@ #include "log_print.h" #include "qos.h" #include "utils/anonymous.h" -//#include "ishared_result_set.h" namespace OHOS { namespace DataShare { @@ -129,7 +128,7 @@ int32_t DataShareServiceStub::OnQuery(MessageParcel &data, MessageParcel &reply) return IPC_STUB_INVALID_DATA_ERR; } int status = 0; - auto result = ISharedResultSet::WriteToParcel(Query(uri, extUri, predicate, columns, status), reply); + auto result = OHOS::DataShare::ISharedResultSet::WriteToParcel(Query(uri, extUri, predicate, columns, status), reply); if (!ITypesUtil::Marshal(reply, status)) { ZLOGE("Marshal status:0x%{public}x", status); return IPC_STUB_WRITE_PARCEL_ERR; -- Gitee From da0ef01a2fd652a8f342d2955d6da09910c72d57 Mon Sep 17 00:00:00 2001 From: 18795846185 Date: Wed, 4 Jun 2025 18:58:54 +0800 Subject: [PATCH 3/3] clm2025-ISystemAbilityTokenCallback Signed-off-by: 18795846185 Change-Id: I1b3fdeb26452348bcad9d2b8037a9de2581a442c --- .../service/data_share/data_share_service_stub.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/services/distributeddataservice/service/data_share/data_share_service_stub.cpp b/services/distributeddataservice/service/data_share/data_share_service_stub.cpp index a12668b5a..85704b0fb 100644 --- a/services/distributeddataservice/service/data_share/data_share_service_stub.cpp +++ b/services/distributeddataservice/service/data_share/data_share_service_stub.cpp @@ -128,7 +128,7 @@ int32_t DataShareServiceStub::OnQuery(MessageParcel &data, MessageParcel &reply) return IPC_STUB_INVALID_DATA_ERR; } int status = 0; - auto result = OHOS::DataShare::ISharedResultSet::WriteToParcel(Query(uri, extUri, predicate, columns, status), reply); + auto result = NativeRdb::ISharedResultSet::WriteToParcel(Query(uri, extUri, predicate, columns, status), reply); if (!ITypesUtil::Marshal(reply, status)) { ZLOGE("Marshal status:0x%{public}x", status); return IPC_STUB_WRITE_PARCEL_ERR; -- Gitee