!11698 安全飞检修复

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

View File

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

View File

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