From eedf51c225c11de856bc17ae4cfb9f40758f342e Mon Sep 17 00:00:00 2001 From: Monster <1609552023@qq.com> Date: Mon, 25 Dec 2023 14:23:58 +0800 Subject: [PATCH] =?UTF-8?q?=E5=88=A0=E9=99=A4=E7=A9=BA=E5=AE=9E=E7=8E=B0?= =?UTF-8?q?=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../engine/update_service_kits_impl.cpp | 35 -------- .../inner_api/engine/update_service_proxy.cpp | 81 ------------------- .../include/iservice_accessory_updater.h | 34 -------- .../include/iservice_online_updater.h | 6 -- .../inner_api/include/iupdate_service.h | 3 +- .../inner_api/include/update_service_kits.h | 11 --- .../include/update_service_kits_impl.h | 10 --- .../include/updater_sa_ipc_interface_code.h | 6 +- .../modulemgr/include/module_manager.h | 4 +- .../modulemgr/include/update_service_module.h | 2 +- .../modulemgr/src/module_manager.cpp | 4 +- .../modulemgr/src/update_service_module.cpp | 3 +- services/engine/include/update_service.h | 11 --- .../include/update_service_impl_firmware.h | 5 -- .../engine/include/update_service_proxy.h | 11 --- services/engine/src/update_service.cpp | 41 +--------- .../src/update_service_impl_firmware.cpp | 14 ---- 17 files changed, 11 insertions(+), 270 deletions(-) delete mode 100644 interfaces/inner_api/include/iservice_accessory_updater.h diff --git a/interfaces/inner_api/engine/update_service_kits_impl.cpp b/interfaces/inner_api/engine/update_service_kits_impl.cpp index 0412616b..e50b2ce2 100644 --- a/interfaces/inner_api/engine/update_service_kits_impl.cpp +++ b/interfaces/inner_api/engine/update_service_kits_impl.cpp @@ -231,39 +231,4 @@ void UpdateServiceKitsImpl::RegisterCallback() remoteServer_->RegisterUpdateCallback(iter.first, iter.second); } } - -int32_t UpdateServiceKitsImpl::GetCustomUpgradePolicy(const UpgradeInfo &info, CustomPolicy &policy, - BusinessError &businessError) -{ - ENGINE_LOGI("UpdateServiceKitsImpl::GetCustomUpgradePolicy"); - auto updateService = GetService(); - RETURN_FAIL_WHEN_SERVICE_NULL(updateService); - return updateService->GetCustomUpgradePolicy(info, policy, businessError); -} - -int32_t UpdateServiceKitsImpl::SetCustomUpgradePolicy(const UpgradeInfo &info, const CustomPolicy &policy, - BusinessError &businessError) -{ - ENGINE_LOGI("UpdateServiceKitsImpl::SetCustomUpgradePolicy"); - auto updateService = GetService(); - RETURN_FAIL_WHEN_SERVICE_NULL(updateService); - return updateService->SetCustomUpgradePolicy(info, policy, businessError); -} - -int32_t UpdateServiceKitsImpl::AccessoryConnectNotify(const AccessoryDeviceInfo &deviceInfo, const uint8_t *data, - uint32_t dataLen) -{ - ENGINE_LOGI("UpdateServiceKitsImpl::AccessoryConnectNotify"); - auto updateService = GetService(); - RETURN_FAIL_WHEN_SERVICE_NULL(updateService); - return updateService->AccessoryConnectNotify(deviceInfo, data, dataLen); -} - -int32_t UpdateServiceKitsImpl::AccessoryUnpairNotify(const AccessoryDeviceInfo &deviceInfo) -{ - ENGINE_LOGI("UpdateServiceKitsImpl::AccessoryUnpairNotify"); - auto updateService = GetService(); - RETURN_FAIL_WHEN_SERVICE_NULL(updateService); - return updateService->AccessoryUnpairNotify(deviceInfo); -} } // namespace OHOS::UpdateEngine diff --git a/interfaces/inner_api/engine/update_service_proxy.cpp b/interfaces/inner_api/engine/update_service_proxy.cpp index f8087695..05d69311 100644 --- a/interfaces/inner_api/engine/update_service_proxy.cpp +++ b/interfaces/inner_api/engine/update_service_proxy.cpp @@ -507,85 +507,4 @@ int32_t UpdateServiceProxy::VerifyUpgradePackage(const std::string &packagePath, businessError = remoteBusinessError; return INT_CALL_SUCCESS; } - -int32_t UpdateServiceProxy::SetCustomUpgradePolicy(const UpgradeInfo &info, const CustomPolicy &policy, - BusinessError &businessError) -{ - ENGINE_LOGI("UpdateServiceProxy::SetCustomUpgradePolicy"); - auto remote = Remote(); - RETURN_WHEN_REMOTE_NULL(remote); - - MessageParcel data; - RETURN_WHEN_TOKEN_WRITE_FAIL(data); - MessageParcelHelper::WriteUpgradeInfo(data, info); - MessageParcelHelper::WriteCustomUpgradePolicy(data, policy); - - MessageParcel reply; - MessageOption option; - int32_t ret = remote->SendRequest(CAST_UINT(UpdaterSaInterfaceCode::SET_CUSTOM_POLICY), data, reply, option); - RETURN_FAIL_WHEN_REMOTE_ERR("UpdateServiceProxy::SetUpgradePolicy", ret); - - MessageParcelHelper::ReadBusinessError(reply, businessError); - return INT_CALL_SUCCESS; -} - -int32_t UpdateServiceProxy::GetCustomUpgradePolicy(const UpgradeInfo &info, CustomPolicy &policy, - BusinessError &businessError) -{ - ENGINE_LOGI("UpdateServiceProxy::GetCustomUpgradePolicy"); - auto remote = Remote(); - RETURN_WHEN_REMOTE_NULL(remote); - - MessageParcel data; - RETURN_WHEN_TOKEN_WRITE_FAIL(data); - MessageParcelHelper::WriteUpgradeInfo(data, info); - MessageParcelHelper::WriteCustomUpgradePolicy(data, policy); - - MessageParcel reply; - MessageOption option; - int32_t ret = remote->SendRequest(CAST_UINT(UpdaterSaInterfaceCode::GET_CUSTOM_POLICY), data, reply, option); - RETURN_FAIL_WHEN_REMOTE_ERR("UpdateServiceProxy::GetCustomUpgradePolicy", ret); - - MessageParcelHelper::ReadBusinessError(reply, businessError); - MessageParcelHelper::ReadCustomUpgradePolicy(reply, policy); - return INT_CALL_SUCCESS; -} - -int32_t UpdateServiceProxy::AccessoryConnectNotify(const AccessoryDeviceInfo &deviceInfo, const uint8_t *data, - uint32_t dataLen) -{ - ENGINE_LOGI("UpdateServiceProxy::AccessoryConnectNotify"); - auto remote = Remote(); - RETURN_WHEN_REMOTE_NULL(remote); - - MessageParcel message; - RETURN_WHEN_TOKEN_WRITE_FAIL(message); - MessageParcelHelper::WriteAccessoryUpgradeData(message, data, dataLen); - MessageParcelHelper::WriteAccessoryUpgradeDeviceInfo(message, deviceInfo); - - MessageParcel reply; - MessageOption option; - int32_t ret = remote->SendRequest(CAST_UINT(UpdaterSaInterfaceCode::ACCESSORY_CONNECT_NOTIFY), - message, reply, option); - RETURN_FAIL_WHEN_REMOTE_ERR("UpdateServiceProxy::AccessoryConnectNotify", ret); - return INT_CALL_SUCCESS; -} - -int32_t UpdateServiceProxy::AccessoryUnpairNotify(const AccessoryDeviceInfo &deviceInfo) -{ - ENGINE_LOGI("UpdateServiceProxy::AccessoryUnpairNotify"); - auto remote = Remote(); - RETURN_WHEN_REMOTE_NULL(remote); - - MessageParcel message; - RETURN_WHEN_TOKEN_WRITE_FAIL(message); - MessageParcelHelper::WriteAccessoryUpgradeDeviceInfo(message, deviceInfo); - - MessageParcel reply; - MessageOption option; - int32_t ret = remote->SendRequest(CAST_UINT(UpdaterSaInterfaceCode::ACCESSORY_UNPAIR_NOTIFY), - message, reply, option); - RETURN_FAIL_WHEN_REMOTE_ERR("UpdateServiceProxy::AccessoryUnpairNotify", ret); - return INT_CALL_SUCCESS; -} } // namespace OHOS::UpdateEngine diff --git a/interfaces/inner_api/include/iservice_accessory_updater.h b/interfaces/inner_api/include/iservice_accessory_updater.h deleted file mode 100644 index c3940d40..00000000 --- a/interfaces/inner_api/include/iservice_accessory_updater.h +++ /dev/null @@ -1,34 +0,0 @@ -/* - * Copyright (c) 2023 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. - */ - -#ifndef ISERVICE_ACCESSORY_UPDATER_H -#define ISERVICE_ACCESSORY_UPDATER_H - -#include "refbase.h" - -#include "update_helper.h" - -namespace OHOS::UpdateEngine { -class IServiceAccessoryUpdater : public virtual RefBase { -public: - virtual ~IServiceAccessoryUpdater() = default; - - virtual int32_t AccessoryConnectNotify(const AccessoryDeviceInfo &deviceInfo, const uint8_t *data, - uint32_t dataLen) = 0; - - virtual int32_t AccessoryUnpairNotify(const AccessoryDeviceInfo &deviceInfo) = 0; -}; -} // namespace OHOS::UpdateEngine -#endif // ISERVICE_ACCESSORY_UPDATER_H \ No newline at end of file diff --git a/interfaces/inner_api/include/iservice_online_updater.h b/interfaces/inner_api/include/iservice_online_updater.h index 859b90ac..a38db25a 100644 --- a/interfaces/inner_api/include/iservice_online_updater.h +++ b/interfaces/inner_api/include/iservice_online_updater.h @@ -66,12 +66,6 @@ public: virtual int32_t GetUpgradePolicy(const UpgradeInfo &info, UpgradePolicy &policy, BusinessError &businessError) = 0; - virtual int32_t SetCustomUpgradePolicy(const UpgradeInfo &info, const CustomPolicy &policy, - BusinessError &businessError) = 0; - - virtual int32_t GetCustomUpgradePolicy(const UpgradeInfo &info, CustomPolicy &policy, - BusinessError &businessError) = 0; - virtual int32_t Cancel(const UpgradeInfo &info, int32_t service, BusinessError &businessError) = 0; }; } // namespace OHOS::UpdateEngine diff --git a/interfaces/inner_api/include/iupdate_service.h b/interfaces/inner_api/include/iupdate_service.h index 24725b87..6a28bf72 100644 --- a/interfaces/inner_api/include/iupdate_service.h +++ b/interfaces/inner_api/include/iupdate_service.h @@ -19,7 +19,6 @@ #include "iremote_broker.h" #include "iremote_proxy.h" -#include "iservice_accessory_updater.h" #include "iservice_local_updater.h" #include "iservice_online_updater.h" #include "iservice_restorer.h" @@ -28,7 +27,7 @@ namespace OHOS::UpdateEngine { class IUpdateService : public OHOS::IRemoteBroker, public IServiceOnlineUpdater, public IServiceRestorer, - public IServiceLocalUpdater, public IServiceAccessoryUpdater { + public IServiceLocalUpdater { public: virtual int32_t RegisterUpdateCallback(const UpgradeInfo &info, const sptr& updateCallback) = 0; diff --git a/interfaces/inner_api/include/update_service_kits.h b/interfaces/inner_api/include/update_service_kits.h index 61ad1c14..ed547e37 100644 --- a/interfaces/inner_api/include/update_service_kits.h +++ b/interfaces/inner_api/include/update_service_kits.h @@ -87,17 +87,6 @@ public: virtual int32_t VerifyUpgradePackage(const std::string &packagePath, const std::string &keyPath, BusinessError &businessError) = 0; - - virtual int32_t SetCustomUpgradePolicy(const UpgradeInfo &info, const CustomPolicy &policy, - BusinessError &businessError) = 0; - - virtual int32_t GetCustomUpgradePolicy(const UpgradeInfo &info, CustomPolicy &policy, - BusinessError &businessError) = 0; - - virtual int32_t AccessoryConnectNotify(const AccessoryDeviceInfo &deviceInfo, const uint8_t *data, - uint32_t dataLen) = 0; - - virtual int32_t AccessoryUnpairNotify(const AccessoryDeviceInfo &deviceInfo) = 0; }; } // namespace OHOS::UpdateEngine #endif // UPDATE_SERVICE_KITS_H diff --git a/interfaces/inner_api/include/update_service_kits_impl.h b/interfaces/inner_api/include/update_service_kits_impl.h index 8ee698d7..a759e86c 100644 --- a/interfaces/inner_api/include/update_service_kits_impl.h +++ b/interfaces/inner_api/include/update_service_kits_impl.h @@ -87,16 +87,6 @@ public: int32_t VerifyUpgradePackage(const std::string &packagePath, const std::string &keyPath, BusinessError &businessError) final; - int32_t SetCustomUpgradePolicy(const UpgradeInfo &info, const CustomPolicy &policy, - BusinessError &businessError) final; - - int32_t GetCustomUpgradePolicy(const UpgradeInfo &info, CustomPolicy &policy, - BusinessError &businessError) final; - - int32_t AccessoryConnectNotify(const AccessoryDeviceInfo &deviceInfo, const uint8_t *data, uint32_t dataLen) final; - - int32_t AccessoryUnpairNotify(const AccessoryDeviceInfo &deviceInfo) final; - protected: void RegisterCallback() override; diff --git a/interfaces/inner_api/include/updater_sa_ipc_interface_code.h b/interfaces/inner_api/include/updater_sa_ipc_interface_code.h index 33112e00..b5aab428 100644 --- a/interfaces/inner_api/include/updater_sa_ipc_interface_code.h +++ b/interfaces/inner_api/include/updater_sa_ipc_interface_code.h @@ -40,11 +40,7 @@ enum class UpdaterSaInterfaceCode : uint32_t { CANCEL, FACTORY_RESET, APPLY_NEW_VERSION, - VERIFY_UPGRADE_PACKAGE, - SET_CUSTOM_POLICY, - GET_CUSTOM_POLICY, - ACCESSORY_CONNECT_NOTIFY, - ACCESSORY_UNPAIR_NOTIFY + VERIFY_UPGRADE_PACKAGE }; } // namespace OHOS::UpdateEngine #endif // UPDATER_SA_IPC_INTERFACE_CODE_H \ No newline at end of file diff --git a/interfaces/inner_api/modulemgr/include/module_manager.h b/interfaces/inner_api/modulemgr/include/module_manager.h index 125e2d9c..d78efbc3 100644 --- a/interfaces/inner_api/modulemgr/include/module_manager.h +++ b/interfaces/inner_api/modulemgr/include/module_manager.h @@ -38,14 +38,14 @@ public: void LoadModule(std::string libPath); bool IsModuleLoaded(); - void HookFunc(std::vector, RequestFuncType handleRemoteRequest); + void HookFunc(std::vector, RequestFuncType handleRemoteRequest); int32_t HandleFunc(uint32_t code, MessageParcel& data, MessageParcel& reply, MessageOption &option); void HookOnStartOnStopFunc(std::string phase, LifeCycleFuncType handleSAOnStartOnStop); void HandleOnStartOnStopFunc(std::string phase, const OHOS::SystemAbilityOnDemandReason &reason); void HookOnIdleFunc(std::string phase, LifeCycleFuncReturnType handleSAOnIdle); int32_t HandleOnIdleFunc(std::string phase, const OHOS::SystemAbilityOnDemandReason &reason); - static std::map onRemoteRequestFuncMap_; + static std::map onRemoteRequestFuncMap_; private: int32_t retryInterval_ = 0; diff --git a/interfaces/inner_api/modulemgr/include/update_service_module.h b/interfaces/inner_api/modulemgr/include/update_service_module.h index 6e32f82d..7596f310 100644 --- a/interfaces/inner_api/modulemgr/include/update_service_module.h +++ b/interfaces/inner_api/modulemgr/include/update_service_module.h @@ -37,7 +37,7 @@ using RequestFuncType = int32_t (*)(uint32_t code, using LifeCycleFuncType = void (*)(const OHOS::SystemAbilityOnDemandReason &reason); using LifeCycleFuncReturnType = int32_t (*)(const OHOS::SystemAbilityOnDemandReason &reason); -void RegisterFunc(std::vector codes, RequestFuncType handleRemoteRequest); +void RegisterFunc(std::vector codes, RequestFuncType handleRemoteRequest); void RegisterOnStartOnStopFunc(std::string phase, LifeCycleFuncType handlePhase); void RegisterOnIdleFunc(std::string phase, LifeCycleFuncReturnType handlePhase); diff --git a/interfaces/inner_api/modulemgr/src/module_manager.cpp b/interfaces/inner_api/modulemgr/src/module_manager.cpp index 65cb44d7..5edaf939 100644 --- a/interfaces/inner_api/modulemgr/src/module_manager.cpp +++ b/interfaces/inner_api/modulemgr/src/module_manager.cpp @@ -22,7 +22,7 @@ namespace OHOS { namespace UpdateEngine { -std::map ModuleManager::onRemoteRequestFuncMap_; +std::map ModuleManager::onRemoteRequestFuncMap_; std::map ModuleManager::onStartOnStopFuncMap_; std::map ModuleManager::onIdleFuncMap_; @@ -65,7 +65,7 @@ ModuleManager& ModuleManager::GetInstance() return moduleManager; } -void ModuleManager::HookFunc(std::vector codes, RequestFuncType handleRemoteRequest) +void ModuleManager::HookFunc(std::vector codes, RequestFuncType handleRemoteRequest) { for (int code : codes) { if (onRemoteRequestFuncMap_.find(code) == onRemoteRequestFuncMap_.end()) { diff --git a/interfaces/inner_api/modulemgr/src/update_service_module.cpp b/interfaces/inner_api/modulemgr/src/update_service_module.cpp index 1720d30c..573a2f87 100644 --- a/interfaces/inner_api/modulemgr/src/update_service_module.cpp +++ b/interfaces/inner_api/modulemgr/src/update_service_module.cpp @@ -15,13 +15,12 @@ #include "update_service_module.h" -#include #include #include "../include/module_log.h" #include "../include/module_manager.h" -void RegisterFunc(std::vector codes, RequestFuncType handleRemoteRequest) +void RegisterFunc(std::vector codes, RequestFuncType handleRemoteRequest) { UTILS_LOGI("enter RegisterFunc"); OHOS::UpdateEngine::ModuleManager::GetInstance().HookFunc(codes, handleRemoteRequest); diff --git a/services/engine/include/update_service.h b/services/engine/include/update_service.h index c0d4d9a2..fb69dd80 100644 --- a/services/engine/include/update_service.h +++ b/services/engine/include/update_service.h @@ -90,17 +90,6 @@ public: int32_t VerifyUpgradePackage(const std::string &packagePath, const std::string &keyPath, BusinessError &businessError) override; - int32_t SetCustomUpgradePolicy(const UpgradeInfo &info, const CustomPolicy &policy, - BusinessError &businessError) override; - - int32_t GetCustomUpgradePolicy(const UpgradeInfo &info, CustomPolicy &policy, - BusinessError &businessError) override; - - int32_t AccessoryConnectNotify(const AccessoryDeviceInfo &deviceInfo, const uint8_t *data, - uint32_t dataLen) override; - - int32_t AccessoryUnpairNotify(const AccessoryDeviceInfo &deviceInfo) override; - int Dump(int fd, const std::vector &args) override; static sptr GetInstance(); diff --git a/services/engine/include/update_service_impl_firmware.h b/services/engine/include/update_service_impl_firmware.h index c0658269..dc4e145b 100644 --- a/services/engine/include/update_service_impl_firmware.h +++ b/services/engine/include/update_service_impl_firmware.h @@ -73,11 +73,6 @@ public: int32_t GetUpgradePolicy(const UpgradeInfo &info, UpgradePolicy &policy, BusinessError &businessError) final; - int32_t SetCustomUpgradePolicy(const UpgradeInfo &info, const CustomPolicy &policy, - BusinessError &businessError) final; - - int32_t GetCustomUpgradePolicy(const UpgradeInfo &info, CustomPolicy &policy, BusinessError &businessError) final; - int32_t Cancel(const UpgradeInfo &info, int32_t service, BusinessError &businessError) final; private: diff --git a/services/engine/include/update_service_proxy.h b/services/engine/include/update_service_proxy.h index 34c4c723..f77464e8 100644 --- a/services/engine/include/update_service_proxy.h +++ b/services/engine/include/update_service_proxy.h @@ -78,17 +78,6 @@ public: int32_t VerifyUpgradePackage(const std::string &packagePath, const std::string &keyPath, BusinessError &businessError) override; - int32_t SetCustomUpgradePolicy(const UpgradeInfo &info, const CustomPolicy &policy, - BusinessError &businessError) override; - - int32_t GetCustomUpgradePolicy(const UpgradeInfo &info, CustomPolicy &policy, - BusinessError &businessError) override; - - int32_t AccessoryConnectNotify(const AccessoryDeviceInfo &deviceInfo, const uint8_t *data, - uint32_t dataLen) override; - - int32_t AccessoryUnpairNotify(const AccessoryDeviceInfo &deviceInfo) override; - private: static inline BrokerDelegator delegator_; }; diff --git a/services/engine/src/update_service.cpp b/services/engine/src/update_service.cpp index 9a7f5161..41ff80df 100644 --- a/services/engine/src/update_service.cpp +++ b/services/engine/src/update_service.cpp @@ -36,8 +36,8 @@ #include "update_service_restorer.h" #include "update_service_util.h" -#include "../../../interfaces/inner_api/modulemgr/include/update_service_module.h" -#include "../../../interfaces/inner_api/modulemgr/include/module_manager.h" +#include "update_service_module.h" +#include "module_manager.h" namespace OHOS { namespace UpdateEngine { @@ -346,41 +346,6 @@ int32_t UpdateService::VerifyUpgradePackage(const std::string &packagePath, cons return localUpdater->VerifyUpgradePackage(packagePath, keyPath, businessError); } -int32_t UpdateService::SetCustomUpgradePolicy(const UpgradeInfo &info, const CustomPolicy &policy, - BusinessError &businessError) -{ - sptr onlineUpdater = updateImplMgr_->GetOnlineUpdater(info); - if (onlineUpdater == nullptr) { - ENGINE_LOGI("SetCustomUpgradePolicy onlineUpdater null"); - return INT_CALL_FAIL; - } - return onlineUpdater->SetCustomUpgradePolicy(info, policy, businessError); -} - -int32_t UpdateService::GetCustomUpgradePolicy(const UpgradeInfo &info, CustomPolicy &policy, - BusinessError &businessError) -{ - sptr onlineUpdater = updateImplMgr_->GetOnlineUpdater(info); - if (onlineUpdater == nullptr) { - ENGINE_LOGI("GetCustomUpgradePolicy localUpdater null"); - return INT_CALL_FAIL; - } - return onlineUpdater->GetCustomUpgradePolicy(info, policy, businessError); -} - -int32_t UpdateService::AccessoryConnectNotify(const AccessoryDeviceInfo &deviceInfo, const uint8_t *data, - uint32_t dataLen) -{ - ENGINE_LOGI("AccessoryConnectNotify Unsupported"); - return INT_CALL_FAIL; -} - -int32_t UpdateService::AccessoryUnpairNotify(const AccessoryDeviceInfo &deviceInfo) -{ - ENGINE_LOGI("AccessoryUnpairNotify Unsupported"); - return INT_CALL_FAIL; -} - void BuildUpgradeInfoDump(const int fd, UpgradeInfo &info) { dprintf(fd, "---------------------upgrade info info--------------------\n"); @@ -467,7 +432,7 @@ void UpdateService::OnStart(const SystemAbilityOnDemandReason &startReason) ENGINE_LOGE("updateService_ null"); } - std::vector codes = { + std::vector codes = { CAST_UINT(UpdaterSaInterfaceCode::CHECK_VERSION), CAST_UINT(UpdaterSaInterfaceCode::DOWNLOAD), CAST_UINT(UpdaterSaInterfaceCode::PAUSE_DOWNLOAD), diff --git a/services/engine/src/update_service_impl_firmware.cpp b/services/engine/src/update_service_impl_firmware.cpp index 4be4df67..0d293585 100644 --- a/services/engine/src/update_service_impl_firmware.cpp +++ b/services/engine/src/update_service_impl_firmware.cpp @@ -277,20 +277,6 @@ int32_t UpdateServiceImplFirmware::GetUpgradePolicy(const UpgradeInfo &info, Upg return INT_CALL_SUCCESS; } -int32_t UpdateServiceImplFirmware::SetCustomUpgradePolicy(const UpgradeInfo &info, const CustomPolicy &policy, - BusinessError &businessError) -{ - FIRMWARE_LOGI("SetCustomUpgradePolicy Unsupported"); - return INT_CALL_SUCCESS; -} - -int32_t UpdateServiceImplFirmware::GetCustomUpgradePolicy(const UpgradeInfo &info, CustomPolicy &policy, - BusinessError &businessError) -{ - FIRMWARE_LOGI("GetCustomUpgradePolicy Unsupported"); - return INT_CALL_SUCCESS; -} - int32_t UpdateServiceImplFirmware::Cancel(const UpgradeInfo &info, int32_t service, BusinessError &businessError) { FIRMWARE_LOGI("Cancel %{public}d", service); -- Gitee