openharmony/ability_ability_runtime
1
0
Fork 0
mirror of https://gitee.com/openharmony/ability_ability_runtime synced 2024-11-23 07:10:19 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

!11698 安全飞检修复

Browse Source 
Merge pull request !11698 from wangkailong/idiji
This commit is contained in:
openharmony_ci 2024-11-22 08:40:09 +00:00 committed by Gitee
commit 473426156f
No known key found for this signature in database
GPG Key ID: 173E9B9CA92EEF8F
2 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
frameworks/cj/ffi/cj_ability_delegator.cpp
View File

@ -26,7 +26,7 @@ namespace OHOS {
namespace AbilityDelegatorCJ {
using namespace OHOS::FFI;
using namespace OHOS::AbilityRuntime;
int32_t CJAbilityDelegator::StartAbility(const AAFwk::Want &want)
{
return delegator_->StartAbility(want);
@ -68,7 +68,7 @@ void CJAbilityDelegator::FinishTest(const char* msg, int64_t code)
{
delegator_->FinishUserTest(msg, code);
}
extern "C" {
int64_t FFIAbilityDelegatorRegistryGetAbilityDelegator()
{
@ -84,7 +84,7 @@ int64_t FFIAbilityDelegatorRegistryGetAbilityDelegator()
}
return cjDelegator->GetID();
}
int32_t FFIAbilityDelegatorStartAbility(int64_t id, WantHandle want)
{
auto cjDelegator = FFI::FFIData::GetData<CJAbilityDelegator>(id);
@ -163,6 +163,7 @@ void FFIAbilityDelegatorFinishTest(int64_t id, const char* msg, int64_t code)
auto cjDelegator = FFI::FFIData::GetData<CJAbilityDelegator>(id);
if (cjDelegator == nullptr) {
TAG_LOGE(AAFwkTag::DELEGATOR, "null cj delegator");
return;
}
cjDelegator->FinishTest(msg, code);
}

2
services/abilitymgr/src/user_controller.cpp
View File

@ -306,7 +306,7 @@ void UserController::UserBootDone(std::shared_ptr<UserItem> &item)
std::lock_guard<ffrt::mutex> guard(userLock_);
auto it = userItems_.find(userId);
if (it != userItems_.end()) {
if (it == userItems_.end()) {
return;
}