mirror of
https://github.com/openharmony/ability_ability_runtime.git
synced 2026-08-24 22:21:36 -04:00
!17130 merge add_transfer_back_service_1018 into master
add background serviceExtension Created-by: zhongshield1 Commit-by: zhangzezhong Merged-by: openharmony_ci Description: **IssueNo**: https://gitcode.com/openharmony/ability_ability_runtime/issues/13401 **Description**: **稳定性自检:** | 自检项 | 自检结果 | | ------------------------------------------------------------ | -------- | | 涉及跨进程调用的相关操作需要抛至主线程或加锁防止并发 | pass | | 成员变量进行赋值或创建需要排查并发 | pass | | 谨慎在lambda表达式中使用引用捕获 | pass | | 谨慎在未经拷贝的情况下使用外部传入的string、C字符串 | pass | | map\vector\list\set等stl模板类使用时需要排查并发 | pass | | 谨慎考虑加锁范围 | pass | | 在IPC通信中谨慎使用同步通信方式 | pass | | 禁止传递this指针至其他模块或线程(特别是eventhandler任务) | pass | | 禁止将外部传入的裸指针在内部直接构造智能指针 | pass | | 禁止多个独立创建的智能指针管理同一地址 | pass | | 禁止在析构函数中抛异步任务 | pass | | 禁止js对象在非js线程(例如在IPC线程)创建、使用或销毁 | pass | | 禁止在对外接口中未经判空直接使用外部传入的指针 | pass | | 禁止接口返回局部变量引用 | pass | | 禁止在信号函数中加锁 | pass | | 禁止在关键流程(SA启动、应用启动等主流程)执行耗时的操作 | pass | | 禁止将同一个cpp编译在不同的so中 | pass | **安全编码自检:** | 自检项 | 自检结果 | | -------------------------------------------------------------- | -------- | | 裸指针避免通过隐式转换构造为sptr | pass | | json对象在取值之前必须先判断类型,避免类型不匹配 | pass | | 序列化时必须对传入的数组大小进行校验,避免出现超大数组 | pass | | 避免使用未明确位宽的整型,选择使用int8_t、uint8_t等类型 | pass | | 外部传入的路径要做规范化校验,对路径中的.、..、../等特殊字符严格校验 | pass | | 指针变量、表示资源描述符的变量、bool变量必须赋初值 | pass | | readParcelable获取的对象使用前需要判空 | pass | | 分配和释放内存的函数需要成对出现 | pass | | 申请内存后异常退出前需要及时进行内存释放 | pass | | 内存申请前必须对内存大小进行合法性校验 | pass | | 内存分配后必须判断是否成功 | pass | | 禁止使用realloc、alloca函数 | pass | | 禁止打印文件路径、口令等敏感信息,如有需要,使用private修饰 | pass | | 禁止打印内存地址 | pass | | 整数之间运算时必须严格检查,确保不会出现溢出、反转、除0 | pass | | 禁止对有符号整数进行位操作符运算 | pass | | 禁止对指针进行逻辑或位运算 | pass | | 循环次数如果收外部数据控制,需要检验其合法性 | pass | | 禁止使用内存操作类危险函数,需要使用安全函数 | pass | | 谨慎使用不可重入函数 | pass | | 必须检查安全函数的返回值,并进行正确处理 | pass | | 禁止仅通过TokenType类型判断绕过权限校验 | pass | **TDD Result**: **XTS Result**: ### 是否已执行L0用例 - [ ] 已验证 - [ ] 不涉及。如不涉及,请写明理由 See merge request: openharmony/ability_ability_runtime!17130
This commit is contained in:
@@ -516,20 +516,48 @@ bool EtsServiceExtension::HandleInsightIntent(const AAFwk::Want &want)
|
||||
};
|
||||
callback->Push(asyncCallback);
|
||||
InsightIntentExecutorInfo executorInfo;
|
||||
ret = GetInsightIntentExecutorInfo(want, executeParam, executorInfo);
|
||||
if (!ret) {
|
||||
TAG_LOGE(AAFwkTag::SERVICE_EXT, "Get Intent executor failed");
|
||||
InsightIntentExecutorMgr::TriggerCallbackInner(std::move(callback),
|
||||
static_cast<int32_t>(AbilityErrorCode::ERROR_CODE_INVALID_PARAM));
|
||||
return false;
|
||||
const WantParams &wantParams = want.GetParams();
|
||||
std::string arkTSMode = wantParams.GetStringParam(AppExecFwk::INSIGHT_INTENT_ARKTS_MODE);
|
||||
if (arkTSMode == AbilityRuntime::CODE_LANGUAGE_ARKTS_1_2) {
|
||||
ret = GetInsightIntentExecutorInfo(want, executeParam, executorInfo);
|
||||
if (!ret) {
|
||||
TAG_LOGE(AAFwkTag::SERVICE_EXT, "Get Intent executor failed");
|
||||
InsightIntentExecutorMgr::TriggerCallbackInner(std::move(callback),
|
||||
static_cast<int32_t>(AbilityErrorCode::ERROR_CODE_INVALID_PARAM));
|
||||
return false;
|
||||
}
|
||||
ret = DelayedSingleton<InsightIntentExecutorMgr>::GetInstance()->ExecuteInsightIntent(
|
||||
etsRuntime_, executorInfo, std::move(callback));
|
||||
if (!ret) {
|
||||
TAG_LOGE(AAFwkTag::SERVICE_EXT, "Execute insight intent failed");
|
||||
return false;
|
||||
}
|
||||
return true;
|
||||
} else {
|
||||
auto& jsRuntime = etsRuntime_.GetJsRuntime();
|
||||
if (jsRuntime == nullptr) {
|
||||
TAG_LOGE(AAFwkTag::UIABILITY, "null jsRuntime");
|
||||
return false;
|
||||
}
|
||||
if (abilityInfo_) {
|
||||
auto &jsRuntimePoint = (static_cast<AbilityRuntime::JsRuntime &>(*jsRuntime));
|
||||
jsRuntimePoint.UpdateModuleNameAndAssetPath(abilityInfo_->moduleName);
|
||||
}
|
||||
ret = GetInsightIntentExecutorInfo(want, executeParam, executorInfo);
|
||||
if (!ret) {
|
||||
TAG_LOGE(AAFwkTag::SERVICE_EXT, "Get Intent executor failed");
|
||||
InsightIntentExecutorMgr::TriggerCallbackInner(std::move(callback),
|
||||
static_cast<int32_t>(AbilityErrorCode::ERROR_CODE_INVALID_PARAM));
|
||||
return false;
|
||||
}
|
||||
ret = DelayedSingleton<InsightIntentExecutorMgr>::GetInstance()->ExecuteInsightIntent(
|
||||
*jsRuntime, executorInfo, std::move(callback));
|
||||
if (!ret) {
|
||||
TAG_LOGE(AAFwkTag::SERVICE_EXT, "Execute insight intent failed");
|
||||
return false;
|
||||
}
|
||||
return true;
|
||||
}
|
||||
ret = DelayedSingleton<InsightIntentExecutorMgr>::GetInstance()->ExecuteInsightIntent(
|
||||
etsRuntime_, executorInfo, std::move(callback));
|
||||
if (!ret) {
|
||||
TAG_LOGE(AAFwkTag::SERVICE_EXT, "Execute insight intent failed");
|
||||
return false;
|
||||
}
|
||||
return true;
|
||||
}
|
||||
|
||||
ani_ref EtsServiceExtension::CallObjectMethod(bool withResult, const char *name, const char *signature, ...)
|
||||
|
||||
@@ -1089,20 +1089,48 @@ void EtsUIAbility::ExecuteInsightIntentBackground(const Want &want,
|
||||
if (abilityInfo_) {
|
||||
}
|
||||
|
||||
const WantParams &wantParams = want.GetParams();
|
||||
std::string arkTSMode = wantParams.GetStringParam(AppExecFwk::INSIGHT_INTENT_ARKTS_MODE);
|
||||
InsightIntentExecutorInfo executeInfo;
|
||||
auto ret = GetInsightIntentExecutorInfo(want, executeParam, executeInfo);
|
||||
if (!ret) {
|
||||
TAG_LOGE(AAFwkTag::UIABILITY, "get intentExecutor failed");
|
||||
InsightIntentExecutorMgr::TriggerCallbackInner(
|
||||
std::move(callback), static_cast<int32_t>(AbilityErrorCode::ERROR_CODE_INVALID_PARAM));
|
||||
return;
|
||||
}
|
||||
if (arkTSMode == AbilityRuntime::CODE_LANGUAGE_ARKTS_1_2) {
|
||||
auto ret = GetInsightIntentExecutorInfo(want, executeParam, executeInfo, arkTSMode);
|
||||
if (!ret) {
|
||||
TAG_LOGE(AAFwkTag::UIABILITY, "get intentExecutor failed");
|
||||
InsightIntentExecutorMgr::TriggerCallbackInner(
|
||||
std::move(callback), static_cast<int32_t>(AbilityErrorCode::ERROR_CODE_INVALID_PARAM));
|
||||
return;
|
||||
}
|
||||
|
||||
ret = DelayedSingleton<InsightIntentExecutorMgr>::GetInstance()->ExecuteInsightIntent(
|
||||
etsRuntime_, executeInfo, std::move(callback));
|
||||
if (!ret) {
|
||||
// callback has removed, release in insight intent executor.
|
||||
TAG_LOGE(AAFwkTag::UIABILITY, "execute insightIntent failed");
|
||||
ret = DelayedSingleton<InsightIntentExecutorMgr>::GetInstance()->ExecuteInsightIntent(
|
||||
etsRuntime_, executeInfo, std::move(callback));
|
||||
if (!ret) {
|
||||
// callback has removed, release in insight intent executor.
|
||||
TAG_LOGE(AAFwkTag::UIABILITY, "execute insightIntent failed");
|
||||
}
|
||||
} else {
|
||||
auto& jsRuntime = etsRuntime_.GetJsRuntime();
|
||||
if (jsRuntime == nullptr) {
|
||||
TAG_LOGE(AAFwkTag::UIABILITY, "null jsRuntime");
|
||||
return;
|
||||
}
|
||||
if (abilityInfo_) {
|
||||
auto &jsRuntimePoint = (static_cast<AbilityRuntime::JsRuntime &>(*jsRuntime));
|
||||
jsRuntimePoint.UpdateModuleNameAndAssetPath(abilityInfo_->moduleName);
|
||||
}
|
||||
auto ret = GetInsightIntentExecutorInfo(want, executeParam, executeInfo, arkTSMode);
|
||||
if (!ret) {
|
||||
TAG_LOGE(AAFwkTag::UIABILITY, "get intentExecutor failed");
|
||||
InsightIntentExecutorMgr::TriggerCallbackInner(
|
||||
std::move(callback), static_cast<int32_t>(AbilityErrorCode::ERROR_CODE_INVALID_PARAM));
|
||||
return;
|
||||
}
|
||||
|
||||
ret = DelayedSingleton<InsightIntentExecutorMgr>::GetInstance()->ExecuteInsightIntent(
|
||||
*jsRuntime, executeInfo, std::move(callback));
|
||||
if (!ret) {
|
||||
// callback has removed, release in insight intent executor.
|
||||
TAG_LOGE(AAFwkTag::UIABILITY, "execute insightIntent failed");
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user