openharmony/ability_ability_runtime
1
0
Fork 0
mirror of https://gitee.com/openharmony/ability_ability_runtime synced 2024-12-02 20:47:11 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

app startup process quarantine

Browse Source 
Signed-off-by: liuzongze <liuzongze@huawei.com>
Change-Id: I467bb8dc938bd098ac8d025428344c0e92567452
This commit is contained in:
liuzongze 2024-08-27 15:34:04 +08:00
parent 8e3b78aaf4
commit d7b33a148b
5 changed files with 89 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

70
frameworks/native/appkit/app/ohos_application.cpp
View File

@ -673,20 +673,14 @@ std::shared_ptr<AbilityRuntime::Context> OHOSApplication::AddAbilityStage(
auto application = std::static_pointer_cast<OHOSApplication>(shared_from_this());
std::weak_ptr<OHOSApplication> weak = application;
abilityStage->Init(stageContext, weak);
auto autoStartupCallback = [weak, abilityStage, abilityRecord, moduleName, callback]() {
auto ohosApplication = weak.lock();
if (ohosApplication == nullptr) {
TAG_LOGE(AAFwkTag::APPKIT, "ohosApplication is nullptr");
return;
auto autoStartupCallback = CreateAutoStartupCallback(abilityStage, abilityRecord, callback);
if (autoStartupCallback != nullptr) {
abilityStage->RunAutoStartupTask(autoStartupCallback, isAsyncCallback, stageContext);
if (isAsyncCallback) {
TAG_LOGI(AAFwkTag::APPKIT, "waiting for startup");
return nullptr;
}
ohosApplication->AutoStartupDone(abilityRecord, abilityStage, moduleName);
callback(abilityStage->GetContext());
};
abilityStage->RunAutoStartupTask(autoStartupCallback, isAsyncCallback, stageContext);
if (isAsyncCallback) {
TAG_LOGI(AAFwkTag::APPKIT, "waiting for startup");
return nullptr;
}
Want want;
@ -708,6 +702,36 @@ std::shared_ptr<AbilityRuntime::Context> OHOSApplication::AddAbilityStage(
return abilityStage->GetContext();
}
const std::function<void()> OHOSApplication::CreateAutoStartupCallback(
const std::shared_ptr<AbilityRuntime::AbilityStage> abilityStage,
const std::shared_ptr<AbilityLocalRecord> abilityRecord,
const std::function<void(const std::shared_ptr<AbilityRuntime::Context>&)>& callback)
{
const std::shared_ptr<AbilityInfo> &abilityInfo = abilityRecord->GetAbilityInfo();
if (!IsMainProcess(abilityInfo->bundleName, abilityInfo->applicationInfo.process)) {
return nullptr;
}
std::string moduleName = abilityInfo->moduleName;
auto application = std::static_pointer_cast<OHOSApplication>(shared_from_this());
std::weak_ptr<OHOSApplication> weak = application;
auto autoStartupCallback = [weak, abilityStage, abilityRecord, moduleName, callback]() {
auto ohosApplication = weak.lock();
if (ohosApplication == nullptr) {
TAG_LOGE(AAFwkTag::APPKIT, "null ohosApplication");
return;
}
ohosApplication->AutoStartupDone(abilityRecord, abilityStage, moduleName);
if (callback == nullptr) {
TAG_LOGE(AAFwkTag::APPKIT, "null callback");
return;
}
callback(abilityStage->GetContext());
};
return autoStartupCallback;
}
void OHOSApplication::AutoStartupDone(const std::shared_ptr<AbilityLocalRecord> &abilityRecord,
const std::shared_ptr<AbilityRuntime::AbilityStage> &abilityStage, const std::string &moduleName)
{
@ -1036,5 +1060,25 @@ bool OHOSApplication::isUpdateLanguage(Configuration &config, const std::string
AbilityRuntime::ApplicationConfigurationManager::GetInstance().SetLanguageSetLevel(currentSetLevel);
return true;
}
bool OHOSApplication::IsMainProcess(const std::string &bundleName, const std::string &process)
{
auto processInfo = GetProcessInfo();
if (processInfo == nullptr) {
TAG_LOGE(AAFwkTag::APPKIT, "null processInfo");
return false;
}
ProcessType processType = processInfo->GetProcessType();
if (processType == ProcessType::NORMAL) {
return true;
}
std::string processName = processInfo->GetProcessName();
if (processName == bundleName || processName == process) {
return true;
}
TAG_LOGD(AAFwkTag::APPKIT, "not main process");
return false;
}
} // namespace AppExecFwk
} // namespace OHOS

16
interfaces/inner_api/app_manager/include/appmgr/process_info.h
View File

@ -21,6 +21,7 @@
#include "nocopyable.h"
#include "parcel.h"
#include "app_mgr_constants.h"
namespace OHOS {
namespace AppExecFwk {
@ -72,9 +73,24 @@ public:
*/
static ProcessInfo *Unmarshalling(Parcel &parcel);
/**
* @brief Set process type
*
* @param ProcessType process type.
*/
void SetProcessType(const ProcessType &processType);
/**
* @brief Obtains type of the process.
*
* @return Returns process type.
*/
ProcessType GetProcessType() const;
private:
std::string processName_;
pid_t pid_ = 0;
ProcessType processType_ = ProcessType::NORMAL;
};
} // namespace AppExecFwk
} // namespace OHOS

10
interfaces/inner_api/app_manager/src/appmgr/process_info.cpp
View File

@ -61,5 +61,15 @@ bool ProcessInfo::Marshalling(Parcel &parcel) const
{
return (parcel.WriteString16(Str8ToStr16(processName_)) && parcel.WriteInt32(pid_));
}
void ProcessInfo::SetProcessType(const ProcessType &processType)
{
processType_ = processType;
}
ProcessType ProcessInfo::GetProcessType() const
{
return processType_;
}
} // namespace AppExecFwk
} // namespace OHOS

5
interfaces/kits/native/appkit/app/ohos_application.h
View File

@ -324,6 +324,11 @@ private:
bool isUpdateFontSize(Configuration &config);
bool isUpdateLanguage(Configuration &config, const std::string language,
const std::string languageIsSetByApp, const std::string globalLanguageIsSetByApp);
const std::function<void()> CreateAutoStartupCallback(
const std::shared_ptr<AbilityRuntime::AbilityStage> abilityStage,
const std::shared_ptr<AbilityLocalRecord> abilityRecord,
const std::function<void(const std::shared_ptr<AbilityRuntime::Context>&)>& callback);
bool IsMainProcess(const std::string &bundleName, const std::string &process);
private:
std::list<std::shared_ptr<AbilityLifecycleCallbacks>> abilityLifecycleCallbacks_;

1
services/appmgr/src/app_running_record.cpp
View File

@ -445,6 +445,7 @@ void AppRunningRecord::LaunchApplication(const Configuration &config)
}
}
ProcessInfo processInfo(processName_, GetPriorityObject()->GetPid());
processInfo.SetProcessType(processType_);
launchData.SetProcessInfo(processInfo);
launchData.SetRecordId(appRecordId_);
launchData.SetUId(mainUid_);