From 0113180568b1345694c6bad9db844658a98921ae Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=82=B9=E5=8F=8B=E6=9D=BE?= Date: Tue, 27 Aug 2024 20:15:29 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E4=BC=98=E5=8C=96=E5=8D=87=E7=BA=A7?= =?UTF-8?q?=E9=80=9A=E7=9F=A5=E7=BB=93=E6=9E=9C=E5=8F=91=E9=80=81=20Signed?= =?UTF-8?q?-off-by:=20=E9=82=B9=E5=8F=8B=E6=9D=BE=20?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- services/firmware/upgrade/flow/src/firmware_manager.cpp | 3 +++ 1 file changed, 3 insertions(+) diff --git a/services/firmware/upgrade/flow/src/firmware_manager.cpp b/services/firmware/upgrade/flow/src/firmware_manager.cpp index f53c19e1..8f4f3c0d 100644 --- a/services/firmware/upgrade/flow/src/firmware_manager.cpp +++ b/services/firmware/upgrade/flow/src/firmware_manager.cpp @@ -51,6 +51,7 @@ namespace UpdateEngine { constexpr int32_t INIT_DELAY_TIME = 5; // 进程启动延时时间5秒，为了安装重启之后可以看到版本号及时刷新 constexpr int32_t PROCESS_EXIT_DELAY_TIME = 1; // 进程退出等待时间，单位：秒 constexpr uint64_t PULLUP_AFTER_TERMINATE_INTERVAL = 5; // 终止升级后SA拉起间隔 +constexpr int32_t NOTIFY_SERVICE_DELAY_TIME = 15; // ANS进程注册通知栏回调间隔，保证升级重启能弹框 FirmwareManager::FirmwareManager() {} @@ -384,6 +385,7 @@ void FirmwareManager::HandleBootUpdateSuccess(const FirmwareTask &task, DelayedSingleton::GetInstance()->SaveHotaCurrentVersionComponentId(); if (task.combinationType == CombinationType::HOTA) { FIRMWARE_LOGI("notify upgrade success"); + sleep(NOTIFY_SERVICE_DELAY_TIME); DelayedSingleton::GetInstance()->NotifyEvent(task.taskId, EventId::EVENT_UPGRADE_SUCCESS, UpgradeStatus::UPDATE_SUCCESS, ErrorMessage{}, versionComponents); FirmwareUpdateHelper::ClearFirmwareInfo(); @@ -417,6 +419,7 @@ void FirmwareManager::HandleBootUpdateFail(const FirmwareTask &task, } } + sleep(NOTIFY_SERVICE_DELAY_TIME); DelayedSingleton::GetInstance()->NotifyEvent(task.taskId, EventId::EVENT_UPGRADE_FAIL, UpgradeStatus::UPDATE_FAIL, errorMessage, versionComponents); FIRMWARE_LOGI("upgrade fail"); -- Gitee From df08f80e39f6cb2ebaa22e284ec37c52ad151688 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=82=B9=E5=8F=8B=E6=9D=BE?= Date: Thu, 29 Aug 2024 10:00:19 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E9=80=9A=E7=9F=A5?= =?UTF-8?q?=E6=A0=8F=E6=9C=8D=E5=8A=A1=E8=AE=A2=E9=98=85=E9=97=AE=E9=A2=98?= =?UTF-8?q?=20Signed-off-by:=20=E9=82=B9=E5=8F=8B=E6=9D=BE=20?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- services/engine/etc/updater_sa.cfg | 3 +-- services/engine/sa_profile/3006.json | 7 ++++++- services/firmware/upgrade/flow/src/firmware_manager.cpp | 3 --- 3 files changed, 7 insertions(+), 6 deletions(-) diff --git a/services/engine/etc/updater_sa.cfg b/services/engine/etc/updater_sa.cfg index de4271cc..acef9214 100644 --- a/services/engine/etc/updater_sa.cfg +++ b/services/engine/etc/updater_sa.cfg @@ -12,8 +12,7 @@ "mkdir /data/update 0770 update update", "mkdir /data/update/ota_package 0770 update update", "mkdir /data/update/ota_package/firmware 0770 update update", - "mkdir /data/update/ota_package/firmware/versions 0770 update update", - "start updater_sa" + "mkdir /data/update/ota_package/firmware/versions 0770 update update" ] } ], diff --git a/services/engine/sa_profile/3006.json b/services/engine/sa_profile/3006.json index b3eab956..8e3f0ac5 100644 --- a/services/engine/sa_profile/3006.json +++ b/services/engine/sa_profile/3006.json @@ -4,13 +4,18 @@ { "name": 3006, "libpath": "libupdateservice.z.so", - "run-on-create": true, + "run-on-create": false, "distributed": false, "bootphase": "BootStartPhase", "dump-level": 1, "auto-restart" : true, "start-on-demand": { "allow-update": true, + "commonevent": [ + { + "name": "usual.event.BOOT_COMPLETED" + } + ], "timedevent": [ { "name": "loopevent", diff --git a/services/firmware/upgrade/flow/src/firmware_manager.cpp b/services/firmware/upgrade/flow/src/firmware_manager.cpp index 8f4f3c0d..f53c19e1 100644 --- a/services/firmware/upgrade/flow/src/firmware_manager.cpp +++ b/services/firmware/upgrade/flow/src/firmware_manager.cpp @@ -51,7 +51,6 @@ namespace UpdateEngine { constexpr int32_t INIT_DELAY_TIME = 5; // 进程启动延时时间5秒，为了安装重启之后可以看到版本号及时刷新 constexpr int32_t PROCESS_EXIT_DELAY_TIME = 1; // 进程退出等待时间，单位：秒 constexpr uint64_t PULLUP_AFTER_TERMINATE_INTERVAL = 5; // 终止升级后SA拉起间隔 -constexpr int32_t NOTIFY_SERVICE_DELAY_TIME = 15; // ANS进程注册通知栏回调间隔，保证升级重启能弹框 FirmwareManager::FirmwareManager() {} @@ -385,7 +384,6 @@ void FirmwareManager::HandleBootUpdateSuccess(const FirmwareTask &task, DelayedSingleton::GetInstance()->SaveHotaCurrentVersionComponentId(); if (task.combinationType == CombinationType::HOTA) { FIRMWARE_LOGI("notify upgrade success"); - sleep(NOTIFY_SERVICE_DELAY_TIME); DelayedSingleton::GetInstance()->NotifyEvent(task.taskId, EventId::EVENT_UPGRADE_SUCCESS, UpgradeStatus::UPDATE_SUCCESS, ErrorMessage{}, versionComponents); FirmwareUpdateHelper::ClearFirmwareInfo(); @@ -419,7 +417,6 @@ void FirmwareManager::HandleBootUpdateFail(const FirmwareTask &task, } } - sleep(NOTIFY_SERVICE_DELAY_TIME); DelayedSingleton::GetInstance()->NotifyEvent(task.taskId, EventId::EVENT_UPGRADE_FAIL, UpgradeStatus::UPDATE_FAIL, errorMessage, versionComponents); FIRMWARE_LOGI("upgrade fail"); -- Gitee From b4c2824bd0f9c7a5b2e454a5a84a890e1afecb76 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=82=B9=E5=8F=8B=E6=9D=BE?= Date: Thu, 29 Aug 2024 14:43:31 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=BA=8B=E4=BB=B6?= =?UTF-8?q?=E9=80=9A=E7=9F=A5=E5=8F=91=E9=80=81=E4=BE=9D=E8=B5=96=20Signed?= =?UTF-8?q?-off-by:=20=E9=82=B9=E5=8F=8B=E6=9D=BE=20?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../common/include/base_service_kits_impl.h | 3 - interfaces/inner_api/engine/BUILD.gn | 2 +- interfaces/inner_api/include/update_helper.h | 8 +- .../callback/src/base_callback_utils.cpp | 2 +- services/engine/engine_sa.gni | 2 +- services/engine/include/i_update_notify.h | 29 ++++ services/engine/include/update_notify.h | 41 ++++-- services/engine/src/update_notify.cpp | 125 ++++++++++++++---- .../upgrade/flow/src/firmware_manager.cpp | 1 + .../updateservicecancel_fuzzer/BUILD.gn | 2 +- .../BUILD.gn | 2 +- .../updateservicedownload_fuzzer/BUILD.gn | 2 +- .../BUILD.gn | 2 +- .../BUILD.gn | 2 +- .../BUILD.gn | 2 +- .../BUILD.gn | 2 +- .../BUILD.gn | 2 +- 17 files changed, 173 insertions(+), 56 deletions(-) create mode 100644 services/engine/include/i_update_notify.h diff --git a/interfaces/inner_api/common/include/base_service_kits_impl.h b/interfaces/inner_api/common/include/base_service_kits_impl.h index c2ae8ceb..5fedec18 100644 --- a/interfaces/inner_api/common/include/base_service_kits_impl.h +++ b/interfaces/inner_api/common/include/base_service_kits_impl.h @@ -18,9 +18,6 @@ #include -#ifndef ABILITY_RUNTIME_INNER_ENABLE -#include "ability_manager_proxy.h" -#endif #include "iremote_object.h" #include "common_death_recipient.h" diff --git a/interfaces/inner_api/engine/BUILD.gn b/interfaces/inner_api/engine/BUILD.gn index 8dcbb7d1..c36602c8 100644 --- a/interfaces/inner_api/engine/BUILD.gn +++ b/interfaces/inner_api/engine/BUILD.gn @@ -87,7 +87,7 @@ ohos_shared_library("$updateengine_inner_library_name") { ] if (ability_ability_runtime_enable) { - external_deps += [ "ability_runtime:ability_manager" ] + external_deps += [ "ability_runtime:extension_manager" ] } part_name = "$updateengine_part_name" subsystem_name = "updater" diff --git a/interfaces/inner_api/include/update_helper.h b/interfaces/inner_api/include/update_helper.h index ef5949b6..8415a452 100644 --- a/interfaces/inner_api/include/update_helper.h +++ b/interfaces/inner_api/include/update_helper.h @@ -35,8 +35,10 @@ #include "update_define.h" namespace OHOS::UpdateEngine { -const std::string OUC_PACKAGE_NAME = "com.ohos.updateapp"; -const std::string OUC_SERVICE_EXT_ABILITY_NAME = "ServiceExtAbility"; +const std::string UPDATE_APP_PACKAGE_NAME = "com.ohos.updateapp"; +const std::string UPDATE_APP_SERVICE_EXT_ABILITY_NAME = "ServiceExtAbility"; +constexpr int32_t UPDATE_APP_TIMEOUT = 15; +constexpr int32_t UPDATE_APP_CONNECT_TIMEOUT = 5; // 搜索状态 enum class SearchStatus { @@ -316,7 +318,7 @@ struct UpgradeInfo { }; struct SubscribeInfo : public BaseJsonStruct { - std::string upgradeApp = OUC_PACKAGE_NAME; + std::string upgradeApp = UPDATE_APP_PACKAGE_NAME; BusinessType businessType; std::string abilityName; std::string subscriberDevId; diff --git a/services/core/ability/callback/src/base_callback_utils.cpp b/services/core/ability/callback/src/base_callback_utils.cpp index ec1db30e..2f1ded35 100644 --- a/services/core/ability/callback/src/base_callback_utils.cpp +++ b/services/core/ability/callback/src/base_callback_utils.cpp @@ -99,7 +99,7 @@ void BaseCallbackUtils::NotifyToHap(EventInfo &info) ENGINE_LOGI("Notify eventInfoStr %{public}s", eventInfoStr.c_str()); if (!eventInfoStr.empty()) { SubscribeInfo subscribeInfo{GetBusinessSubType()}; - OHOS::UpdateEngine::UpdateNotify::NotifyToAppService(eventInfoStr, subscribeInfo.ToJson()); + UpdateNotify::GetInstance()->ConnectToAppService(eventInfoStr, subscribeInfo.ToJson()); } } } // namespace UpdateEngine diff --git a/services/engine/engine_sa.gni b/services/engine/engine_sa.gni index aea7516d..f21c92aa 100644 --- a/services/engine/engine_sa.gni +++ b/services/engine/engine_sa.gni @@ -202,7 +202,7 @@ if (ability_ability_base_enable) { ] } if (ability_ability_runtime_enable) { - sa_external_deps += [ "ability_runtime:ability_manager" ] + sa_external_deps += [ "ability_runtime:extension_manager" ] } if (communication_netmanager_base_enable) { sa_external_deps += [ "netmanager_base:net_conn_manager_if" ] diff --git a/services/engine/include/i_update_notify.h b/services/engine/include/i_update_notify.h new file mode 100644 index 00000000..7807f57a --- /dev/null +++ b/services/engine/include/i_update_notify.h @@ -0,0 +1,29 @@ +/* + * Copyright (c) 2024 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 I_UPDATE_NOTIFY_H +#define I_UPDATE_NOTIFY_H + +#include + +#include "iremote_broker.h" + +namespace OHOS::UpdateEngine { +class IUpdateNotify : public OHOS::IRemoteBroker { +public: + DECLARE_INTERFACE_DESCRIPTOR(u"OHOS.Updater.IUpdateNotify"); +}; +} // namespace OHOS::UpdateEngine +#endif // I_UPDATE_NOTIFY_H diff --git a/services/engine/include/update_notify.h b/services/engine/include/update_notify.h index a89c70b3..91be2ab0 100644 --- a/services/engine/include/update_notify.h +++ b/services/engine/include/update_notify.h @@ -16,40 +16,59 @@ #ifndef UPDATE_NOTIFY_H #define UPDATE_NOTIFY_H +#include +#include #include #include "ability_connect_callback_stub.h" #include "ability_connect_callback_interface.h" #include "ability_manager_interface.h" #include "ability_manager_client.h" #include "if_system_ability_manager.h" +#include "i_update_notify.h" #include "system_ability_definition.h" #include "update_no_constructor.h" #include "want.h" namespace OHOS { namespace UpdateEngine { -class UpdateNotify : public NoConstructor { +class UpdateNotify : public IRemoteStub { public: - static bool NotifyToAppService(const std::string &eventInfo, const std::string &subscribeInfo); + DISALLOW_COPY_AND_MOVE(UpdateNotify); + + UpdateNotify(); + ~UpdateNotify(); + static sptr GetInstance(); + bool ConnectToAppService(const std::string &eventInfo, const std::string &subscribeInfo); + void HandleAbilityConnect(const sptr &remoteObject); + +private: + bool HandleMessage(const std::string &message); + ErrCode ConnectAbility(const AAFwk::Want &want, const sptr &connect); + ErrCode DisconnectAbility(const sptr &connect); private: - static ErrCode ConnectAbility(const AAFwk::Want &want, const sptr &connect, - const sptr &callerToken); - static ErrCode DisconnectAbility(const sptr &connect); - static ErrCode StopServiceAbility(const AAFwk::Want &want); - static ErrCode StartAbility(const AAFwk::Want &want); - static AAFwk::Want MakeWant(const std::string &deviceId, const std::string &abilityName, - const std::string &bundleName, const std::string &subscribeInfo, const std::string ¶ms = {}); + static std::mutex instanceLock_; + static sptr instance_; + sptr remoteObject_ = nullptr; + std::mutex connectMutex_; + std::condition_variable conditionVal_; + + enum class UpdateAppCode { + UNKNOWN = 0, + UPDATE_APP = 5 + }; }; class NotifyConnection : public AAFwk::AbilityConnectionStub { public: - explicit NotifyConnection() = default; + explicit NotifyConnection(const sptr &instance); ~NotifyConnection() = default; - void OnAbilityConnectDone(const AppExecFwk::ElementName &element, const sptr &remoteObject, int32_t resultCode) override; void OnAbilityDisconnectDone(const AppExecFwk::ElementName &element, int resultCode) override; + +private: + sptr instance_ = nullptr; }; } // namespace UpdateEngine } // namespace OHOS diff --git a/services/engine/src/update_notify.cpp b/services/engine/src/update_notify.cpp index 98a66040..412be658 100644 --- a/services/engine/src/update_notify.cpp +++ b/services/engine/src/update_notify.cpp @@ -15,6 +15,8 @@ #include "update_notify.h" +#include "cJSON.h" +#include "extension_manager_client.h" #include "iservice_registry.h" #include "update_helper.h" @@ -22,62 +24,129 @@ namespace OHOS { namespace UpdateEngine { -ErrCode UpdateNotify::StartAbility(const AAFwk::Want &want) +std::mutex UpdateNotify::instanceLock_; +sptr UpdateNotify::instance_ = nullptr; + +UpdateNotify::UpdateNotify() { - ErrCode result = AAFwk::AbilityManagerClient::GetInstance()->StartAbility(want); - ENGINE_LOGI("StartAbility result %{public}d", result); - return result; + ENGINE_LOGD("UpdateNotify"); } -ErrCode UpdateNotify::StopServiceAbility(const AAFwk::Want &want) +UpdateNotify::~UpdateNotify() { - ErrCode result = AAFwk::AbilityManagerClient::GetInstance()->StopServiceAbility(want); - ENGINE_LOGI("StopServiceAbility result %{public}d", result); - return result; + ENGINE_LOGD("~UpdateNotify"); +} + +sptr UpdateNotify::GetInstance() +{ + if (instance_ == nullptr) { + std::lock_guard autoLock(instanceLock_); + if (instance_ == nullptr) { + instance_ = new UpdateNotify(); + } + } + return instance_; } -ErrCode UpdateNotify::ConnectAbility(const AAFwk::Want &want, const sptr &connect, - const sptr &callerToken) +ErrCode UpdateNotify::ConnectAbility(const AAFwk::Want &want, const sptr &connect) { - ErrCode result = AAFwk::AbilityManagerClient::GetInstance()->ConnectAbility(want, connect, callerToken); + ErrCode result = + AAFwk::ExtensionManagerClient::GetInstance().ConnectServiceExtensionAbility(want, connect, nullptr, -1); ENGINE_LOGI("ConnectAbility result %{public}d", result); return result; } -ErrCode UpdateNotify::DisconnectAbility(const sptr &connect) +ErrCode UpdateNotify::DisconnectAbility(const sptr &connect) { - ErrCode result = AAFwk::AbilityManagerClient::GetInstance()->DisconnectAbility(connect); + ErrCode result = + AAFwk::ExtensionManagerClient::GetInstance().DisconnectAbility(connect); ENGINE_LOGI("DisconnectAbility result %{public}d", result); return result; } -AAFwk::Want UpdateNotify::MakeWant(const std::string &deviceId, const std::string &abilityName, - const std::string &bundleName, const std::string &subscribeInfo, const std::string ¶ms) +bool UpdateNotify::ConnectToAppService(const std::string &eventInfo, const std::string &subscribeInfo) { - AppExecFwk::ElementName element(deviceId, bundleName, abilityName); - AAFwk::Want want; - want.SetElement(element); - want.SetParam("EventInfo", params); - want.SetParam("SubscribeInfo", subscribeInfo); - return want; + if (eventInfo.empty()) { + ENGINE_LOGE("ConnectToAppService eventInfo error."); + return false; + } + cJSON *root = cJSON_CreateObject(); + cJSON_AddItemToObject(root, "EventInfo", cJSON_Parse(eventInfo.c_str())); + cJSON_AddItemToObject(root, "SubscribeInfo", cJSON_Parse(subscribeInfo.c_str())); + + char *data = cJSON_PrintUnformatted(root); + if (data == nullptr) { + cJSON_Delete(root); + return false; + } + std::string message = std::string(data); + cJSON_free(data); + cJSON_Delete(root); + return HandleMessage(message); } -bool UpdateNotify::NotifyToAppService(const std::string &eventInfo, const std::string &subscribeInfo) +bool UpdateNotify::HandleMessage(const std::string &message) { - if (eventInfo.empty()) { - ENGINE_LOGE("NotifyToAppService eventInfo error."); + std::string bundleName = UPDATE_APP_PACKAGE_NAME; + std::string abilityName = UPDATE_APP_SERVICE_EXT_ABILITY_NAME; + AAFwk::Want want; + want.SetElementName(bundleName, abilityName); + want.SetParam("Timeout", UPDATE_APP_TIMEOUT); + auto connect = sptr::MakeSptr(instance_); + int ret = ConnectAbility(want, connect); + std::unique_lock uniqueLock(connectMutex_); + conditionVal_.wait_for(uniqueLock, std::chrono::seconds(UPDATE_APP_CONNECT_TIMEOUT)); + if (ret != OHOS::ERR_OK || remoteObject_ == nullptr) { + ENGINE_LOGE("HandleMessage, can not connect to ouc"); return false; } - std::string bundleName = OUC_PACKAGE_NAME; - std::string abilityName = OUC_SERVICE_EXT_ABILITY_NAME; - AAFwk::Want want = MakeWant("", abilityName, bundleName, subscribeInfo, eventInfo); - return StartAbility(want) == OHOS::ERR_OK; + + MessageParcel data; + if (!data.WriteString16(Str8ToStr16(message))) { + ENGINE_LOGE("HandleMessage, write message failed"); + return false; + } + + MessageParcel reply; + MessageOption option(MessageOption::TF_SYNC); + int32_t result = remoteObject_->SendRequest(CAST_INT(UpdateAppCode::UPDATE_APP), data, reply, option); + if (result != 0) { + ENGINE_LOGE("HandleMessage SendRequest, error result %{public}d", result); + DisconnectAbility(connect); + return false; + } + return true; +} + +void UpdateNotify::HandleAbilityConnect(const sptr &remoteObject) +{ + remoteObject_ = remoteObject; + conditionVal_.notify_one(); +} + +NotifyConnection::NotifyConnection(const sptr &instance) +{ + ENGINE_LOGD("NotifyConnection constructor"); + instance_ = instance; } void NotifyConnection::OnAbilityConnectDone(const AppExecFwk::ElementName &element, const sptr &remoteObject, int32_t resultCode) { ENGINE_LOGI("OnAbilityConnectDone successfully. result %{public}d", resultCode); + if (resultCode != ERR_OK) { + ENGINE_LOGE("ability connect failed, error code: %{public}d", resultCode); + return; + } + ENGINE_LOGI("ability connect success, ability name %{public}s", element.GetAbilityName().c_str()); + if (remoteObject == nullptr) { + ENGINE_LOGE("get remoteObject failed"); + return; + } + if (instance_ == nullptr) { + return; + } + instance_->HandleAbilityConnect(remoteObject); } void NotifyConnection::OnAbilityDisconnectDone(const AppExecFwk::ElementName &element, int resultCode) diff --git a/services/firmware/upgrade/flow/src/firmware_manager.cpp b/services/firmware/upgrade/flow/src/firmware_manager.cpp index f53c19e1..943e6a46 100644 --- a/services/firmware/upgrade/flow/src/firmware_manager.cpp +++ b/services/firmware/upgrade/flow/src/firmware_manager.cpp @@ -378,6 +378,7 @@ void FirmwareManager::HandleBootUpdateSuccess(const FirmwareTask &task, versionComponent.upgradeAction = UpgradeAction::UPGRADE; versionComponent.displayVersion = component.targetBlDisplayVersionNumber; versionComponent.innerVersion = component.targetBlVersionNumber; + versionComponent.componentExtra = JsonBuilder().Append("{}").ToJson(); versionComponents.push_back(versionComponent); } diff --git a/test/fuzztest/updateservicecancel_fuzzer/BUILD.gn b/test/fuzztest/updateservicecancel_fuzzer/BUILD.gn index ae2965fd..a0b769b6 100644 --- a/test/fuzztest/updateservicecancel_fuzzer/BUILD.gn +++ b/test/fuzztest/updateservicecancel_fuzzer/BUILD.gn @@ -42,7 +42,7 @@ ohos_fuzztest("UpdateServiceCancelFuzzTest") { ] deps = [ "$updateengine_root_path/interfaces/inner_api/engine:$updateengine_inner_library_name" ] external_deps = [ - "ability_runtime:ability_manager", + "ability_runtime:extension_manager", "access_token:libaccesstoken_sdk", "access_token:libnativetoken", "access_token:libtoken_setproc", diff --git a/test/fuzztest/updateservicechecknewversion_fuzzer/BUILD.gn b/test/fuzztest/updateservicechecknewversion_fuzzer/BUILD.gn index 04be0847..477bafb5 100644 --- a/test/fuzztest/updateservicechecknewversion_fuzzer/BUILD.gn +++ b/test/fuzztest/updateservicechecknewversion_fuzzer/BUILD.gn @@ -41,7 +41,7 @@ ohos_fuzztest("UpdateServiceCheckNewVersionFuzzTest") { ] deps = [ "$updateengine_root_path/interfaces/inner_api/engine:$updateengine_inner_library_name" ] external_deps = [ - "ability_runtime:ability_manager", + "ability_runtime:extension_manager", "access_token:libaccesstoken_sdk", "access_token:libnativetoken", "access_token:libtoken_setproc", diff --git a/test/fuzztest/updateservicedownload_fuzzer/BUILD.gn b/test/fuzztest/updateservicedownload_fuzzer/BUILD.gn index 5e567292..3ba5fba1 100644 --- a/test/fuzztest/updateservicedownload_fuzzer/BUILD.gn +++ b/test/fuzztest/updateservicedownload_fuzzer/BUILD.gn @@ -42,7 +42,7 @@ ohos_fuzztest("UpdateServiceDownloadFuzzTest") { ] deps = [ "$updateengine_root_path/interfaces/inner_api/engine:$updateengine_inner_library_name" ] external_deps = [ - "ability_runtime:ability_manager", + "ability_runtime:extension_manager", "access_token:libaccesstoken_sdk", "access_token:libnativetoken", "access_token:libtoken_setproc", diff --git a/test/fuzztest/updateservicegetnewversion_fuzzer/BUILD.gn b/test/fuzztest/updateservicegetnewversion_fuzzer/BUILD.gn index 044b27f0..0a94c440 100644 --- a/test/fuzztest/updateservicegetnewversion_fuzzer/BUILD.gn +++ b/test/fuzztest/updateservicegetnewversion_fuzzer/BUILD.gn @@ -42,7 +42,7 @@ ohos_fuzztest("UpdateServiceGetNewVersionFuzzTest") { ] deps = [ "$updateengine_root_path/interfaces/inner_api/engine:$updateengine_inner_library_name" ] external_deps = [ - "ability_runtime:ability_manager", + "ability_runtime:extension_manager", "access_token:libaccesstoken_sdk", "access_token:libnativetoken", "access_token:libtoken_setproc", diff --git a/test/fuzztest/updateservicegetupgradepolicy_fuzzer/BUILD.gn b/test/fuzztest/updateservicegetupgradepolicy_fuzzer/BUILD.gn index 9167ea5d..f44ab3ba 100644 --- a/test/fuzztest/updateservicegetupgradepolicy_fuzzer/BUILD.gn +++ b/test/fuzztest/updateservicegetupgradepolicy_fuzzer/BUILD.gn @@ -41,7 +41,7 @@ ohos_fuzztest("UpdateServiceGetUpgradePolicyFuzzTest") { ] deps = [ "$updateengine_root_path/interfaces/inner_api/engine:$updateengine_inner_library_name" ] external_deps = [ - "ability_runtime:ability_manager", + "ability_runtime:extension_manager", "access_token:libaccesstoken_sdk", "access_token:libnativetoken", "access_token:libtoken_setproc", diff --git a/test/fuzztest/updateserviceregisterupdatecallback_fuzzer/BUILD.gn b/test/fuzztest/updateserviceregisterupdatecallback_fuzzer/BUILD.gn index d1aad60b..d32f09ec 100644 --- a/test/fuzztest/updateserviceregisterupdatecallback_fuzzer/BUILD.gn +++ b/test/fuzztest/updateserviceregisterupdatecallback_fuzzer/BUILD.gn @@ -41,7 +41,7 @@ ohos_fuzztest("UpdateServiceRegisterUpdateCallbackFuzzTest") { ] deps = [ "$updateengine_root_path/interfaces/inner_api/engine:$updateengine_inner_library_name" ] external_deps = [ - "ability_runtime:ability_manager", + "ability_runtime:extension_manager", "access_token:libaccesstoken_sdk", "access_token:libnativetoken", "access_token:libtoken_setproc", diff --git a/test/fuzztest/updateservicesetupgradepolicy_fuzzer/BUILD.gn b/test/fuzztest/updateservicesetupgradepolicy_fuzzer/BUILD.gn index 828bf3f0..7294884c 100644 --- a/test/fuzztest/updateservicesetupgradepolicy_fuzzer/BUILD.gn +++ b/test/fuzztest/updateservicesetupgradepolicy_fuzzer/BUILD.gn @@ -42,7 +42,7 @@ ohos_fuzztest("UpdateServiceSetUpgradePolicyFuzzTest") { ] deps = [ "$updateengine_root_path/interfaces/inner_api/engine:$updateengine_inner_library_name" ] external_deps = [ - "ability_runtime:ability_manager", + "ability_runtime:extension_manager", "access_token:libaccesstoken_sdk", "access_token:libnativetoken", "access_token:libtoken_setproc", diff --git a/test/fuzztest/updateserviceunregisterupdatecallback_fuzzer/BUILD.gn b/test/fuzztest/updateserviceunregisterupdatecallback_fuzzer/BUILD.gn index 9e4fe061..772f1b06 100644 --- a/test/fuzztest/updateserviceunregisterupdatecallback_fuzzer/BUILD.gn +++ b/test/fuzztest/updateserviceunregisterupdatecallback_fuzzer/BUILD.gn @@ -41,7 +41,7 @@ ohos_fuzztest("UpdateServiceUnregisterUpdateCallbackFuzzTest") { ] deps = [ "$updateengine_root_path/interfaces/inner_api/engine:$updateengine_inner_library_name" ] external_deps = [ - "ability_runtime:ability_manager", + "ability_runtime:extension_manager", "access_token:libaccesstoken_sdk", "access_token:libnativetoken", "access_token:libtoken_setproc", -- Gitee