diff --git a/bundle.json b/bundle.json index 3c93d13e7d1bdef9342dff285a9f805fd233675a..10d428cf5d7fb0f3ae56e184a9d2c738916add5c 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 6340c2931814bd93041f6a0b63927fab41ad7659..0000000000000000000000000000000000000000 --- 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 102cca449cf1424a26f3c12fe5e97dcb107b7c1f..369c6a9d1009ddd2da97b2acfb59cd5b4ef1c59b 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/IUpdateService.idl b/interfaces/inner_api/engine/IUpdateService.idl index 87bdab76181d47d84d89de074b7adb7b1896d354..19d30e2e139902455e599b46265064d3211c085e 100644 --- a/interfaces/inner_api/engine/IUpdateService.idl +++ b/interfaces/inner_api/engine/IUpdateService.idl @@ -37,36 +37,35 @@ 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, + [ipccode 1] int CheckNewVersion([in] UpgradeInfo info, [out] BusinessError businessError, [out] CheckResult checkResult); + [ipccode 2] int Download([in] UpgradeInfo info, [in] VersionDigestInfo versionDigestInfo, [in] DownloadOptions downloadOptions, [out] BusinessError businessError); - int PauseDownload([in] UpgradeInfo info, [in] VersionDigestInfo versionDigestInfo, + [ipccode 3] int PauseDownload([in] UpgradeInfo info, [in] VersionDigestInfo versionDigestInfo, [in] PauseDownloadOptions pauseDownloadOptions, [out] BusinessError businessError); - int ResumeDownload([in] UpgradeInfo info, [in] VersionDigestInfo versionDigestInfo, + [ipccode 4] int ResumeDownload([in] UpgradeInfo info, [in] VersionDigestInfo versionDigestInfo, [in] ResumeDownloadOptions resumeDownloadOptions, [out] BusinessError businessError); - int Upgrade([in] UpgradeInfo info, [in] VersionDigestInfo versionDigest, + [ipccode 5] int Upgrade([in] UpgradeInfo info, [in] VersionDigestInfo versionDigest, [in] UpgradeOptions upgradeOptions, [out] BusinessError businessError); - int ClearError([in] UpgradeInfo info, [in] VersionDigestInfo versionDigest, + [ipccode 6] 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, + [ipccode 7] int TerminateUpgrade([in] UpgradeInfo info, [out] BusinessError businessError); + [ipccode 8] int SetUpgradePolicy([in] UpgradeInfo info, [in] UpgradePolicy policy, [out] BusinessError businessError); + [ipccode 9] int GetUpgradePolicy([in] UpgradeInfo info, [out] UpgradePolicy policy, [out] BusinessError businessError); + [ipccode 10] int GetNewVersionInfo([in] UpgradeInfo info, [out] NewVersionInfo newVersionInfo, [out] BusinessError businessError); - int GetNewVersionDescription([in] UpgradeInfo info, [in] VersionDigestInfo versionDigestInfo, + [ipccode 11] 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, + [ipccode 12] int GetCurrentVersionInfo([in] UpgradeInfo info, [out] CurrentVersionInfo currentVersionInfo, [out] BusinessError businessError); - int GetCurrentVersionDescription([in] UpgradeInfo info, [in] DescriptionOptions descriptionOptions, + [ipccode 13] 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, + [ipccode 14] int GetTaskInfo([in] UpgradeInfo info, [out] TaskInfo taskInfo, [out] BusinessError businessError); + [ipccode 15] int RegisterUpdateCallback([in] UpgradeInfo info, [in] IUpdateCallback updateCallback); + [ipccode 16] int UnregisterUpdateCallback([in] UpgradeInfo info); + [ipccode 17] int Cancel([in] UpgradeInfo info, [in] int service, [out] BusinessError businessError); + [ipccode 18] int FactoryReset([out] BusinessError businessError); + [ipccode 19] 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); + [ipccode 20] int VerifyUpgradePackage([in] String packagePath, [in] String keyPath, [out] BusinessError businessError); } diff --git a/services/engine/IUpdateService.idl b/services/engine/IUpdateService.idl index 87bdab76181d47d84d89de074b7adb7b1896d354..19d30e2e139902455e599b46265064d3211c085e 100644 --- a/services/engine/IUpdateService.idl +++ b/services/engine/IUpdateService.idl @@ -37,36 +37,35 @@ 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, + [ipccode 1] int CheckNewVersion([in] UpgradeInfo info, [out] BusinessError businessError, [out] CheckResult checkResult); + [ipccode 2] int Download([in] UpgradeInfo info, [in] VersionDigestInfo versionDigestInfo, [in] DownloadOptions downloadOptions, [out] BusinessError businessError); - int PauseDownload([in] UpgradeInfo info, [in] VersionDigestInfo versionDigestInfo, + [ipccode 3] int PauseDownload([in] UpgradeInfo info, [in] VersionDigestInfo versionDigestInfo, [in] PauseDownloadOptions pauseDownloadOptions, [out] BusinessError businessError); - int ResumeDownload([in] UpgradeInfo info, [in] VersionDigestInfo versionDigestInfo, + [ipccode 4] int ResumeDownload([in] UpgradeInfo info, [in] VersionDigestInfo versionDigestInfo, [in] ResumeDownloadOptions resumeDownloadOptions, [out] BusinessError businessError); - int Upgrade([in] UpgradeInfo info, [in] VersionDigestInfo versionDigest, + [ipccode 5] int Upgrade([in] UpgradeInfo info, [in] VersionDigestInfo versionDigest, [in] UpgradeOptions upgradeOptions, [out] BusinessError businessError); - int ClearError([in] UpgradeInfo info, [in] VersionDigestInfo versionDigest, + [ipccode 6] 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, + [ipccode 7] int TerminateUpgrade([in] UpgradeInfo info, [out] BusinessError businessError); + [ipccode 8] int SetUpgradePolicy([in] UpgradeInfo info, [in] UpgradePolicy policy, [out] BusinessError businessError); + [ipccode 9] int GetUpgradePolicy([in] UpgradeInfo info, [out] UpgradePolicy policy, [out] BusinessError businessError); + [ipccode 10] int GetNewVersionInfo([in] UpgradeInfo info, [out] NewVersionInfo newVersionInfo, [out] BusinessError businessError); - int GetNewVersionDescription([in] UpgradeInfo info, [in] VersionDigestInfo versionDigestInfo, + [ipccode 11] 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, + [ipccode 12] int GetCurrentVersionInfo([in] UpgradeInfo info, [out] CurrentVersionInfo currentVersionInfo, [out] BusinessError businessError); - int GetCurrentVersionDescription([in] UpgradeInfo info, [in] DescriptionOptions descriptionOptions, + [ipccode 13] 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, + [ipccode 14] int GetTaskInfo([in] UpgradeInfo info, [out] TaskInfo taskInfo, [out] BusinessError businessError); + [ipccode 15] int RegisterUpdateCallback([in] UpgradeInfo info, [in] IUpdateCallback updateCallback); + [ipccode 16] int UnregisterUpdateCallback([in] UpgradeInfo info); + [ipccode 17] int Cancel([in] UpgradeInfo info, [in] int service, [out] BusinessError businessError); + [ipccode 18] int FactoryReset([out] BusinessError businessError); + [ipccode 19] 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); + [ipccode 20] int VerifyUpgradePackage([in] String packagePath, [in] String keyPath, [out] BusinessError businessError); } diff --git a/services/engine/src/update_service.cpp b/services/engine/src/update_service.cpp index 3d1505056edf2693f023e7b3d521363d5cd0740e..f91093c3a32b3fae23246bcd5ac69b9bac22b490 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,9 @@ 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); + if (ret != INT_CALL_SUCCESS) { + return ret > CALL_RESULT_OFFSET ? (ret - CALL_RESULT_OFFSET) : ret; + } return INT_CALL_FAIL; } }