From 46245caabd5b483fb8f7e50be3b3a38700521c0c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=82=B9=E5=8F=8B=E6=9D=BE?= Date: Wed, 2 Apr 2025 12:05:07 +0800 Subject: [PATCH 1/4] =?UTF-8?q?=E4=BF=AE=E6=94=B9xts=20=E5=8E=BB=E9=87=8D?= =?UTF-8?q?=20idl=E6=96=87=E4=BB=B6=20Signed-off-by:=20=E9=82=B9=E5=8F=8B?= =?UTF-8?q?=E6=9D=BE=20?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- bundle.json | 8 --- frameworks/js/napi/session/BUILD.gn | 49 ------------- frameworks/js/napi/session/update_session.gni | 18 ----- interfaces/inner_api/engine/BUILD.gn | 67 ++++++++++++++++- .../inner_api/engine/IUpdateService.idl | 9 ++- services/engine/BUILD.gn | 23 ++---- services/engine/IUpdateService.idl | 72 ------------------- services/engine/callback/IUpdateCallback.idl | 20 ------ services/engine/src/update_service.cpp | 13 ++-- 9 files changed, 80 insertions(+), 199 deletions(-) delete mode 100644 frameworks/js/napi/session/BUILD.gn delete mode 100644 services/engine/IUpdateService.idl delete mode 100644 services/engine/callback/IUpdateCallback.idl diff --git a/bundle.json b/bundle.json index 3c93d13e..10d428cf 100644 --- a/bundle.json +++ b/bundle.json @@ -58,7 +58,6 @@ "build": { "modules": [ "//base/update/updateservice/frameworks/js/napi/update:update", - "//base/update/updateservice/frameworks/js/napi/session:update_session", "//base/update/updateservice/interfaces/inner_api/engine:updateservicekits", "//base/update/updateservice/interfaces/inner_api/modulemgr:update_module_mgr", "//base/update/updateservice/services/engine:dupdate_config.json", @@ -87,13 +86,6 @@ "header_files": [] }, "name": "//base/update/updateservice/interfaces/inner_api/modulemgr:update_module_mgr" - }, - { - "header": { - "header_base": "//base/update/updateservice/frameworks/js/napi/session/include", - "header_files": [] - }, - "name": "//base/update/updateservice/frameworks/js/napi/session:update_session" } ], "test": [ diff --git a/frameworks/js/napi/session/BUILD.gn b/frameworks/js/napi/session/BUILD.gn deleted file mode 100644 index 6340c293..00000000 --- a/frameworks/js/napi/session/BUILD.gn +++ /dev/null @@ -1,49 +0,0 @@ -# Copyright (c) 2025 Huawei Device Co., Ltd. -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. - -import("//build/ohos.gni") -import("../../../js/napi/session/update_session.gni") - -config("update_session_library_native_config") { - include_dirs = session_include_dirs -} - -ohos_shared_library("update_session") { - sources = session_sources - include_dirs = session_include_dirs - include_dirs += [ - "$root_path/foundations/ability/define/include", - "$root_path/foundations/ability/log/include", - "$root_path/foundations/ability/utils/include", - "$root_path/foundations/model/include", - "$root_path/interfaces/inner_api/feature/update/model/common", - "$root_path/interfaces/inner_api/feature/update/model/event", - "$root_path/interfaces/inner_api/feature/update/model/install", - "$root_path/interfaces/inner_api/feature/update/model/task", - "$root_path/interfaces/inner_api/feature/update/model/version_info", - "$root_path/interfaces/inner_api/feature/update/model/version_info/description", - ] - - sources += [ - "$root_path/interfaces/inner_api/feature/update/model/check/src/error_message.cpp", - "$root_path/interfaces/inner_api/feature/update/model/upgrade_info/src/business_error.cpp", - "$root_path/interfaces/inner_api/feature/update/model/version_info/description/src/description_info.cpp", - "$root_path/interfaces/inner_api/feature/update/model/version_info/src/version_component.cpp", - ] - - external_deps = session_external_deps - part_name = "update_service" - subsystem_name = "updater" - cflags = session_cflags - public_configs = [ ":update_session_library_native_config" ] -} diff --git a/frameworks/js/napi/session/update_session.gni b/frameworks/js/napi/session/update_session.gni index 102cca44..369c6a9d 100644 --- a/frameworks/js/napi/session/update_session.gni +++ b/frameworks/js/napi/session/update_session.gni @@ -18,21 +18,3 @@ session_sources = [ ] session_include_dirs = [ "$root_path/frameworks/js/napi/session/include" ] - -session_external_deps = [ - "access_token:libaccesstoken_sdk", - "access_token:libtokenid_sdk", - "c_utils:utils", # refbase - "hilog:libhilog", - "ipc:ipc_core", - "json:nlohmann_json_static", - "napi:ace_napi", -] - -session_cflags = [ - "-fPIC", - "-Os", - "-Werror", - "-DNAPI_VERSION=8", - "-fstack-protector-strong", -] diff --git a/interfaces/inner_api/engine/BUILD.gn b/interfaces/inner_api/engine/BUILD.gn index d289aa10..88803fc8 100644 --- a/interfaces/inner_api/engine/BUILD.gn +++ b/interfaces/inner_api/engine/BUILD.gn @@ -39,6 +39,71 @@ ohos_prebuilt_etc("updater_sa.rc") { subsystem_name = "updater" } +config("update_idl_config") { + include_dirs = [ "${target_gen_dir}" ] + include_dirs += [ + "$updateengine_root_path/foundations/ability/define/include", + "$updateengine_root_path/foundations/ability/log/include", + "$updateengine_root_path/foundations/ability/utils/include", + "$updateengine_root_path/foundations/model/include", + "$updateengine_root_path/interfaces/inner_api/feature/update/model/check", + "$updateengine_root_path/interfaces/inner_api/feature/update/model/clear", + "$updateengine_root_path/interfaces/inner_api/feature/update/model/common", + "$updateengine_root_path/interfaces/inner_api/feature/update/model/download", + "$updateengine_root_path/interfaces/inner_api/feature/update/model/event", + "$updateengine_root_path/interfaces/inner_api/feature/update/model/event/on_off", + "$updateengine_root_path/interfaces/inner_api/feature/update/model/install", + "$updateengine_root_path/interfaces/inner_api/feature/update/model/policy", + "$updateengine_root_path/interfaces/inner_api/feature/update/model/subscribe", + "$updateengine_root_path/interfaces/inner_api/feature/update/model/task", + "$updateengine_root_path/interfaces/inner_api/feature/update/model/upgrade", + "$updateengine_root_path/interfaces/inner_api/feature/update/model/upgrade_info", + "$updateengine_root_path/interfaces/inner_api/feature/update/model/version_info", + "$updateengine_root_path/interfaces/inner_api/feature/update/model/version_info/current_version", + "$updateengine_root_path/interfaces/inner_api/feature/update/model/version_info/description", + "$updateengine_root_path/interfaces/inner_api/feature/update/model/version_info/new_version", + ] +} + +ohos_source_set("update_service_proxy") { + sanitize = { + cfi = true + cfi_cross_dso = true + debug = false + } + output_values = get_target_outputs(":update_service_interface") + sources = filter_include(output_values, [ "*_proxy.cpp" ]) + public_configs = [ ":update_idl_config" ] + deps = [ ":update_service_interface" ] + external_deps = [ + "hilog:libhilog", + "ipc:ipc_single", + "json:nlohmann_json_static", + "samgr:samgr_proxy" + ] + part_name = "$updateengine_part_name" + subsystem_name = "updater" +} + +ohos_source_set("update_service_stub") { + sanitize = { + cfi = true + cfi_cross_dso = true + debug = false + } + output_values = get_target_outputs(":update_service_interface") + sources = filter_include(output_values, [ "*_stub.cpp" ]) + public_configs = [ ":update_idl_config" ] + deps = [ ":update_service_interface" ] + external_deps = [ + "hilog:libhilog", + "ipc:ipc_single", + "json:nlohmann_json_static", + ] + part_name = "$updateengine_part_name" + subsystem_name = "updater" +} + config("updateengine_inner_library_native_config") { include_dirs = [ "$updateengine_root_path/interfaces/inner_api/include" ] include_dirs += feature_include @@ -70,7 +135,7 @@ ohos_shared_library("$updateengine_inner_library_name") { sources += filter_include(output_values, [ "*.cpp" ]) include_dirs = [ - "$updateengine_root_path/interfaces/inner_api/feature/update_model", + "$updateengine_root_path/interfaces/inner_api/feature/update/model/event", "$updateengine_root_path/interfaces/inner_api/engine/include", "$updateengine_root_path/interfaces/inner_api/include", ] diff --git a/interfaces/inner_api/engine/IUpdateService.idl b/interfaces/inner_api/engine/IUpdateService.idl index 87bdab76..22fda385 100644 --- a/interfaces/inner_api/engine/IUpdateService.idl +++ b/interfaces/inner_api/engine/IUpdateService.idl @@ -37,9 +37,6 @@ option_stub_hooks on; option_parcel_hooks on; interface OHOS.UpdateEngine.IUpdateService { - int RegisterUpdateCallback([in] UpgradeInfo info, [in] IUpdateCallback updateCallback); - int UnregisterUpdateCallback([in] UpgradeInfo info); - int CheckNewVersion([in] UpgradeInfo info, [out] BusinessError businessError, [out] CheckResult checkResult); int Download([in] UpgradeInfo info, [in] VersionDigestInfo versionDigestInfo, [in] DownloadOptions downloadOptions, [out] BusinessError businessError); @@ -52,6 +49,8 @@ interface OHOS.UpdateEngine.IUpdateService { int ClearError([in] UpgradeInfo info, [in] VersionDigestInfo versionDigest, [in] ClearOptions clearOptions, [out] BusinessError businessError); int TerminateUpgrade([in] UpgradeInfo info, [out] BusinessError businessError); + int SetUpgradePolicy([in] UpgradeInfo info, [in] UpgradePolicy policy, [out] BusinessError businessError); + int GetUpgradePolicy([in] UpgradeInfo info, [out] UpgradePolicy policy, [out] BusinessError businessError); int GetNewVersionInfo([in] UpgradeInfo info, [out] NewVersionInfo newVersionInfo, [out] BusinessError businessError); int GetNewVersionDescription([in] UpgradeInfo info, [in] VersionDigestInfo versionDigestInfo, @@ -62,8 +61,8 @@ interface OHOS.UpdateEngine.IUpdateService { int GetCurrentVersionDescription([in] UpgradeInfo info, [in] DescriptionOptions descriptionOptions, [out] VersionDescriptionInfo currentVersionDescriptionInfo, [out] BusinessError businessError); int GetTaskInfo([in] UpgradeInfo info, [out] TaskInfo taskInfo, [out] BusinessError businessError); - int SetUpgradePolicy([in] UpgradeInfo info, [in] UpgradePolicy policy, [out] BusinessError businessError); - int GetUpgradePolicy([in] UpgradeInfo info, [out] UpgradePolicy policy, [out] BusinessError businessError); + int RegisterUpdateCallback([in] UpgradeInfo info, [in] IUpdateCallback updateCallback); + int UnregisterUpdateCallback([in] UpgradeInfo info); int Cancel([in] UpgradeInfo info, [in] int service, [out] BusinessError businessError); int FactoryReset([out] BusinessError businessError); int ApplyNewVersion([in] UpgradeInfo info, [in] String miscFile, diff --git a/services/engine/BUILD.gn b/services/engine/BUILD.gn index ec47f2a9..6b9f8437 100644 --- a/services/engine/BUILD.gn +++ b/services/engine/BUILD.gn @@ -15,21 +15,6 @@ import("//build/config/components/idl_tool/idl.gni") import("//build/ohos.gni") import("../../services/engine/engine_sa.gni") -idl_interface_sources = [ "${target_gen_dir}/update_service_stub.cpp" ] - -idl_include = [ - "${target_gen_dir}", - "${target_gen_dir}/callback", -] - -idl_gen_interface("update_service_interface") { - src_idl = rebase_path("IUpdateService.idl") - sources_callback = [ "callback/IUpdateCallback.idl" ] - dst_file = string_join(",", idl_interface_sources) - log_domainid = "0xD002E00" - log_tag = "UPDATE_SERVICE_KITS" -} - ohos_prebuilt_etc("dupdate_config.json") { source = "$update_service_dupdate_config_path" relative_install_dir = "update" @@ -58,12 +43,12 @@ ohos_shared_library("$updateengine_library_name") { } shlib_type = "sa" include_dirs = sa_include_dirs - include_dirs += idl_include sources = sa_sources - output_values = get_target_outputs(":update_service_interface") - sources += filter_include(output_values, [ "*_stub.cpp" ]) deps = sa_deps - deps += [ ":update_service_interface" ] + deps += [ + "//base/update/updateservice/interfaces/inner_api/engine:update_service_proxy", + "//base/update/updateservice/interfaces/inner_api/engine:update_service_stub", + ] external_deps = sa_external_deps part_name = "$updateengine_part_name" subsystem_name = "updater" diff --git a/services/engine/IUpdateService.idl b/services/engine/IUpdateService.idl deleted file mode 100644 index 87bdab76..00000000 --- a/services/engine/IUpdateService.idl +++ /dev/null @@ -1,72 +0,0 @@ -/* - * Copyright (c) 2025 Huawei Device Co., Ltd. - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package OHOS.UpdateEngine; - -import callback/IUpdateCallback; - -sequenceable OHOS.UpdateEngine.BusinessError; -sequenceable OHOS.UpdateEngine.CheckResult; -sequenceable OHOS.UpdateEngine.ClearOptions; -sequenceable OHOS.UpdateEngine.CurrentVersionInfo; -sequenceable OHOS.UpdateEngine.DescriptionOptions; -sequenceable OHOS.UpdateEngine.DownloadOptions; -sequenceable OHOS.UpdateEngine.NewVersionInfo; -sequenceable OHOS.UpdateEngine.PauseDownloadOptions; -sequenceable OHOS.UpdateEngine.ResumeDownloadOptions; -sequenceable OHOS.UpdateEngine.TaskInfo; -sequenceable OHOS.UpdateEngine.UpgradeInfo; -sequenceable OHOS.UpdateEngine.UpgradeOptions; -sequenceable OHOS.UpdateEngine.UpgradePolicy; -sequenceable OHOS.UpdateEngine.VersionDescriptionInfo; -sequenceable OHOS.UpdateEngine.VersionDigestInfo; - -option_stub_hooks on; -option_parcel_hooks on; - -interface OHOS.UpdateEngine.IUpdateService { - int RegisterUpdateCallback([in] UpgradeInfo info, [in] IUpdateCallback updateCallback); - int UnregisterUpdateCallback([in] UpgradeInfo info); - - int CheckNewVersion([in] UpgradeInfo info, [out] BusinessError businessError, [out] CheckResult checkResult); - int Download([in] UpgradeInfo info, [in] VersionDigestInfo versionDigestInfo, - [in] DownloadOptions downloadOptions, [out] BusinessError businessError); - int PauseDownload([in] UpgradeInfo info, [in] VersionDigestInfo versionDigestInfo, - [in] PauseDownloadOptions pauseDownloadOptions, [out] BusinessError businessError); - int ResumeDownload([in] UpgradeInfo info, [in] VersionDigestInfo versionDigestInfo, - [in] ResumeDownloadOptions resumeDownloadOptions, [out] BusinessError businessError); - int Upgrade([in] UpgradeInfo info, [in] VersionDigestInfo versionDigest, - [in] UpgradeOptions upgradeOptions, [out] BusinessError businessError); - int ClearError([in] UpgradeInfo info, [in] VersionDigestInfo versionDigest, - [in] ClearOptions clearOptions, [out] BusinessError businessError); - int TerminateUpgrade([in] UpgradeInfo info, [out] BusinessError businessError); - int GetNewVersionInfo([in] UpgradeInfo info, [out] NewVersionInfo newVersionInfo, - [out] BusinessError businessError); - int GetNewVersionDescription([in] UpgradeInfo info, [in] VersionDigestInfo versionDigestInfo, - [in] DescriptionOptions descriptionOptions, [out] VersionDescriptionInfo newVersionDescriptionInfo, - [out] BusinessError businessError); - int GetCurrentVersionInfo([in] UpgradeInfo info, [out] CurrentVersionInfo currentVersionInfo, - [out] BusinessError businessError); - int GetCurrentVersionDescription([in] UpgradeInfo info, [in] DescriptionOptions descriptionOptions, - [out] VersionDescriptionInfo currentVersionDescriptionInfo, [out] BusinessError businessError); - int GetTaskInfo([in] UpgradeInfo info, [out] TaskInfo taskInfo, [out] BusinessError businessError); - int SetUpgradePolicy([in] UpgradeInfo info, [in] UpgradePolicy policy, [out] BusinessError businessError); - int GetUpgradePolicy([in] UpgradeInfo info, [out] UpgradePolicy policy, [out] BusinessError businessError); - int Cancel([in] UpgradeInfo info, [in] int service, [out] BusinessError businessError); - int FactoryReset([out] BusinessError businessError); - int ApplyNewVersion([in] UpgradeInfo info, [in] String miscFile, - [in] String[] packageNames, [out] BusinessError businessError); - int VerifyUpgradePackage([in] String packagePath, [in] String keyPath, [out] BusinessError businessError); -} diff --git a/services/engine/callback/IUpdateCallback.idl b/services/engine/callback/IUpdateCallback.idl deleted file mode 100644 index 034e7b9d..00000000 --- a/services/engine/callback/IUpdateCallback.idl +++ /dev/null @@ -1,20 +0,0 @@ -/* - * Copyright (c) 2025 Huawei Device Co., Ltd. - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -sequenceable OHOS.UpdateEngine.EventInfo; - -[callback] interface OHOS.UpdateEngine.IUpdateCallback { - void OnEvent([in] EventInfo eventInfo) ; -} diff --git a/services/engine/src/update_service.cpp b/services/engine/src/update_service.cpp index 3d150505..59675b93 100644 --- a/services/engine/src/update_service.cpp +++ b/services/engine/src/update_service.cpp @@ -62,11 +62,6 @@ constexpr int OPEN_SO_PRIO = -20; constexpr int NORMAL_PRIO = 0; #endif -int32_t CallResultToIpcResult(int32_t callResult) -{ - return callResult + CALL_RESULT_OFFSET; -} - void UpdateService::ClientDeathRecipient::OnRemoteDied(const wptr &remote) { ENGINE_LOGI("client DeathRecipient OnRemoteDied: %{public}s", upgradeInfo_.ToString().c_str()); @@ -536,12 +531,12 @@ int32_t UpdateService::PermissionCheck(uint32_t code) ENGINE_LOGI("UpdateService Oh PermissionCheck, code: %{public}u", code); if (!IsCallerValid()) { ENGINE_LOGE("UpdateService IsCallerValid false"); - return CallResultToIpcResult(INT_NOT_SYSTEM_APP); + return INT_NOT_SYSTEM_APP; } if (!IsPermissionGranted(code)) { ENGINE_LOGE("UpdateService code %{public}u IsPermissionGranted false", code); - return CallResultToIpcResult(INT_APP_NOT_GRANTED); + return INT_APP_NOT_GRANTED; } if (code == CAST_UINT(UpdaterSaInterfaceCode::FACTORY_RESET)) { @@ -571,6 +566,10 @@ int32_t UpdateService::CallbackParcel(uint32_t code, MessageParcel &data, Messag } ret = ModuleManager::GetInstance().HandleFunc(code, data, reply, option); ENGINE_LOGE("CallbackParcel deal result code %{public}d", ret); + // 处理xts因错误码导致用例失败 + if (ret != INT_CALL_SUCCESS) { + return ret > CALL_RESULT_OFFSET ? (ret - CALL_RESULT_OFFSET) : ret; + } return INT_CALL_FAIL; } } -- Gitee From adf62044c5c8debb6655b92b35d1e1a9187a070f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=82=B9=E5=8F=8B=E6=9D=BE?= Date: Wed, 2 Apr 2025 05:45:32 +0000 Subject: [PATCH 2/4] =?UTF-8?q?=E4=BF=AE=E6=94=B9gn=E6=A0=BC=E5=BC=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: 邹友松 --- interfaces/inner_api/engine/BUILD.gn | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/interfaces/inner_api/engine/BUILD.gn b/interfaces/inner_api/engine/BUILD.gn index 88803fc8..80256057 100644 --- a/interfaces/inner_api/engine/BUILD.gn +++ b/interfaces/inner_api/engine/BUILD.gn @@ -79,7 +79,7 @@ ohos_source_set("update_service_proxy") { "hilog:libhilog", "ipc:ipc_single", "json:nlohmann_json_static", - "samgr:samgr_proxy" + "samgr:samgr_proxy", ] part_name = "$updateengine_part_name" subsystem_name = "updater" -- Gitee From e55c16722c11bfa834702aa8bdea660c694fa3f5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=82=B9=E5=8F=8B=E6=9D=BE?= Date: Wed, 2 Apr 2025 08:31:06 +0000 Subject: [PATCH 3/4] =?UTF-8?q?=E4=BF=AE=E6=94=B9gn=E9=94=99=E8=AF=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: 邹友松 --- services/engine/BUILD.gn | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/services/engine/BUILD.gn b/services/engine/BUILD.gn index 6b9f8437..c9e38369 100644 --- a/services/engine/BUILD.gn +++ b/services/engine/BUILD.gn @@ -46,8 +46,8 @@ ohos_shared_library("$updateengine_library_name") { sources = sa_sources deps = sa_deps deps += [ - "//base/update/updateservice/interfaces/inner_api/engine:update_service_proxy", - "//base/update/updateservice/interfaces/inner_api/engine:update_service_stub", + "$updateengine_root_path/interfaces/inner_api/engine:update_service_proxy", + "$updateengine_root_path/interfaces/inner_api/engine:update_service_stub", ] external_deps = sa_external_deps part_name = "$updateengine_part_name" -- Gitee From 8fa1dc45ce5234a58b73dc0134b9820f223dd20d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=82=B9=E5=8F=8B=E6=9D=BE?= Date: Wed, 2 Apr 2025 08:46:18 +0000 Subject: [PATCH 4/4] =?UTF-8?q?=E5=8E=BB=E6=8E=89=E6=B3=A8=E9=87=8A?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: 邹友松 --- services/engine/src/update_service.cpp | 1 - 1 file changed, 1 deletion(-) diff --git a/services/engine/src/update_service.cpp b/services/engine/src/update_service.cpp index 59675b93..f91093c3 100644 --- a/services/engine/src/update_service.cpp +++ b/services/engine/src/update_service.cpp @@ -566,7 +566,6 @@ int32_t UpdateService::CallbackParcel(uint32_t code, MessageParcel &data, Messag } ret = ModuleManager::GetInstance().HandleFunc(code, data, reply, option); ENGINE_LOGE("CallbackParcel deal result code %{public}d", ret); - // 处理xts因错误码导致用例失败 if (ret != INT_CALL_SUCCESS) { return ret > CALL_RESULT_OFFSET ? (ret - CALL_RESULT_OFFSET) : ret; } -- Gitee