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

!913 元能力内源检查修改

Browse Source 
Merge pull request !913 from liuyanzhi2020/liu0301
This commit is contained in:
openharmony_ci 2022-03-02 06:46:30 +00:00 committed by Gitee
commit 1c0db9cd5a
No known key found for this signature in database
GPG Key ID: 173E9B9CA92EEF8F
56 changed files with 237 additions and 250 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
common/task_dispatcher/src/dispatcher/base_task_dispatcher.cpp
View File

@ -1,5 +1,5 @@
/*
* Copyright (c) 2021 Huawei Device Co., Ltd.
* Copyright (c) 2021-2022 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
@ -34,6 +34,7 @@ ErrCode BaseTaskDispatcher::SyncDispatchBarrier(const std::shared_ptr<Runnable>
APP_LOGI("BaseTaskDispatcher::SyncDispatchBarrier called");
return SyncDispatch(task);
}
ErrCode BaseTaskDispatcher::AsyncDispatchBarrier(const std::shared_ptr<Runnable> &task)
{
APP_LOGI("BaseTaskDispatcher::AsyncDispatchBarrier start");
@ -110,7 +111,7 @@ ErrCode BaseTaskDispatcher::GroupDispatchNotify(
if (groupImpl->AddNotification(ptrCallback)) {
APP_LOGI("BaseTaskDispatcher::GroupDispatchNotify end");
return ERR_OK;
};
}
APP_LOGE("BaseTaskDispatcher::GroupDispatchNotify addNotification failed");
return ERR_APPEXECFWK_CHECK_FAILED;
}

5
common/task_dispatcher/src/threading/task_executor.cpp
View File

@ -1,5 +1,5 @@
/*
* Copyright (c) 2021 Huawei Device Co., Ltd.
* Copyright (c) 2021-2022 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
@ -66,7 +66,6 @@ ErrCode TaskExecutor::DoWorks(const std::shared_ptr<WorkerThread> &worker)
}
std::shared_ptr<Task> task = worker->PollFirstTask();
bool isInterrupted = false;
bool done = false;
while (((task != nullptr && done == false) || ((task = GetTask(worker)) != nullptr))) {
@ -212,7 +211,7 @@ void TaskExecutor::Consume()
if (delayTaskWrapper == nullptr || delayTaskWrapper->runnable_ == nullptr) {
APP_LOGE("TaskExecutor::Consume delayTaskWrapper is nullptr");
return;
};
}
(delayTaskWrapper->runnable_)();
APP_LOGI("TaskExecutor::Consume after run");
}

15
common/task_dispatcher/src/threading/worker_pool.cpp
View File

@ -1,5 +1,5 @@
/*
* Copyright (c) 2021 Huawei Device Co., Ltd.
* Copyright (c) 2021-2022 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
@ -97,18 +97,12 @@ bool WorkerPool::CheckThreadCount(int maxThreadCount, int coreThreadCount)
bool WorkerPool::CheckMaxThreadCount(int maxThreadCount)
{
if ((maxThreadCount > THREAD_UPPER_LIMIT) || (maxThreadCount < MAX_THREAD_LOWER_LIMIT)) {
return false;
}
return true;
return (maxThreadCount <= THREAD_UPPER_LIMIT) && (maxThreadCount >= MAX_THREAD_LOWER_LIMIT);
}
bool WorkerPool::CheckCoreThreadCount(int coreThreadCount)
{
if ((coreThreadCount > THREAD_UPPER_LIMIT) || (coreThreadCount < CORE_THREAD_LOWER_LIMIT)) {
return false;
}
return true;
return (coreThreadCount <= THREAD_UPPER_LIMIT) && (coreThreadCount >= CORE_THREAD_LOWER_LIMIT);
}
long WorkerPool::GetKeepAliveTime(void) const
@ -243,8 +237,7 @@ bool WorkerPool::AddWorker(const std::shared_ptr<Delegate> &delegate, const std:
unsigned int value = control_.load();
int num = GetWorkingThreadNum(value);
if (num >= thread_limit_) {
APP_LOGI("WorkerPool::AddWorker thread count exceed limits, num=%{public}d, limits=%{public}d",
num,
APP_LOGI("WorkerPool::AddWorker thread count exceed limits, num=%{public}d, limits=%{public}d", num,
thread_limit_);
break;
}

4
frameworks/kits/ability/ability_runtime/include/ability_context_impl.h
View File

@ -1,5 +1,5 @@
/*
* Copyright (c) 2021 Huawei Device Co., Ltd.
* Copyright (c) 2021-2022 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
@ -152,7 +152,7 @@ public:
ErrCode ReleaseAbility(const std::shared_ptr<CallerCallBack> &callback) override;
/**
* regist ability callback
* register ability callback
*
* @param abilityCallback Indicates the abilityCallback object.
*/

4
frameworks/kits/ability/ability_runtime/src/local_call_container.cpp
View File

@ -1,5 +1,5 @@
/*
* Copyright (c) 2021 Huawei Device Co., Ltd.
* Copyright (c) 2021-2022 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
@ -67,7 +67,7 @@ int LocalCallContainer::StartAbilityInner(
HILOG_DEBUG("start ability by call, abilityClient->StartAbilityByCall call");
return abilityClient->StartAbilityByCall(want, this, callerToken);
}
// already finish call requst.
// already finish call request.
HILOG_DEBUG("start ability by call, callback->InvokeCallBack(remote) begin");
callback->InvokeCallBack(remote);
HILOG_DEBUG("start ability by call, callback->InvokeCallBack(remote) end");

4
frameworks/kits/ability/native/include/ability_thread.h
View File

@ -457,7 +457,7 @@ private:
void HandleDisconnectAbility(const Want &want);
/**
* @brief Handle the current commadn of Ability.
* @brief Handle the current command of Ability.
*
* @param want The Want object to command to.
*
@ -482,7 +482,7 @@ private:
void HandleDisconnectExtension(const Want &want);
/**
* @brief Handle the current commadn of Extension.
* @brief Handle the current command of Extension.
*
* @param want The Want object to command to.
*

6
frameworks/kits/ability/native/include/data_uri_utils.h
View File

@ -1,5 +1,5 @@
/*
* Copyright (c) 2021 Huawei Device Co., Ltd.
* Copyright (c) 2021-2022 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
@ -63,7 +63,7 @@ public:
/**
* @brief Updates the ID in the specified dataUri
* @param dataUri based on RFC 2396( Uniform Resource Identifier ).
* @param id indiates Update attached to the end of the path component of the given URI
* @param id indicates Update attached to the end of the path component of the given URI
* @return Uri return is the URI after path is updated
*/
static Uri UpdateId(const Uri &dataUri, long long id);
@ -78,7 +78,7 @@ public:
private:
/**
* @brief Determine whether the string content is a numeric string
* @param str indicates stirng.
* @param str indicates string.
* @return bool
*/
static bool IsNumber(const string &str);

2
frameworks/kits/ability/native/src/ability.cpp
View File

@ -199,7 +199,7 @@ void Ability::OnStart(const Want &want)
BYTRACE_NAME(BYTRACE_TAG_ABILITY_MANAGER, __PRETTY_FUNCTION__);
APP_LOGI("%{public}s begin.", __func__);
if (abilityInfo_ == nullptr) {
APP_LOGE("Ability::OnStart falied abilityInfo_ is nullptr.");
APP_LOGE("Ability::OnStart failed abilityInfo_ is nullptr.");
return;
}

14
frameworks/kits/ability/native/src/ability_thread.cpp
View File

@ -233,7 +233,7 @@ void AbilityThread::Attach(std::shared_ptr<OHOSApplication> &application,
ErrCode err = AbilityManagerClient::GetInstance()->AttachAbilityThread(this, token_);
APP_LOGI("AbilityThread::Attach after AttachAbilityThread");
if (err != ERR_OK) {
APP_LOGE("AbilityThread:: attach success faile err = %{public}d", err);
APP_LOGE("AbilityThread:: attach success failed err = %{public}d", err);
return;
}
@ -289,7 +289,7 @@ void AbilityThread::AttachExtension(std::shared_ptr<OHOSApplication> &applicatio
ErrCode err = AbilityManagerClient::GetInstance()->AttachAbilityThread(this, token_);
APP_LOGI("AbilityThread::AttachExtension after AttachAbilityThread");
if (err != ERR_OK) {
APP_LOGE("AbilityThread:: attach extension success faile err = %{public}d", err);
APP_LOGE("AbilityThread:: attach extension success failed err = %{public}d", err);
return;
}
APP_LOGI("AbilityThread::AttachExtension end");
@ -420,7 +420,7 @@ void AbilityThread::Attach(
ErrCode err = AbilityManagerClient::GetInstance()->AttachAbilityThread(this, token_);
APP_LOGI("AbilityThread::Attach after AttachAbilityThread");
if (err != ERR_OK) {
APP_LOGE("AbilityThread:: attach success faile err = %{public}d", err);
APP_LOGE("AbilityThread:: attach success failed err = %{public}d", err);
return;
}
@ -488,7 +488,7 @@ void AbilityThread::HandleConnectAbility(const Want &want)
ErrCode err = AbilityManagerClient::GetInstance()->ScheduleConnectAbilityDone(token_, service);
APP_LOGI("AbilityThread::HandleConnectAbility after ScheduleConnectAbilityDone");
if (err != ERR_OK) {
APP_LOGE("AbilityThread:: HandleConnectAbility faile err = %{public}d", err);
APP_LOGE("AbilityThread:: HandleConnectAbility failed err = %{public}d", err);
}
APP_LOGI("AbilityThread::HandleConnectAbility end");
}
@ -512,13 +512,13 @@ void AbilityThread::HandleDisconnectAbility(const Want &want)
ErrCode err = AbilityManagerClient::GetInstance()->ScheduleDisconnectAbilityDone(token_);
APP_LOGI("AbilityThread::HandleDisconnectAbility after ScheduleDisconnectAbilityDone");
if (err != ERR_OK) {
APP_LOGE("AbilityThread:: HandleDisconnectAbility faile err = %{public}d", err);
APP_LOGE("AbilityThread:: HandleDisconnectAbility failed err = %{public}d", err);
}
APP_LOGI("AbilityThread::HandleDisconnectAbility end");
}
/**
* @brief Handle the current commadn of Ability.
* @brief Handle the current command of Ability.
*
* @param want The Want object to command to.
*
@ -541,7 +541,7 @@ void AbilityThread::HandleCommandAbility(const Want &want, bool restart, int sta
APP_LOGI("AbilityThread::HandleCommandAbility before ScheduleCommandAbilityDone");
ErrCode err = AbilityManagerClient::GetInstance()->ScheduleCommandAbilityDone(token_);
if (err != ERR_OK) {
APP_LOGE("AbilityThread:: HandleCommandAbility faile err = %{public}d", err);
APP_LOGE("AbilityThread:: HandleCommandAbility failed err = %{public}d", err);
}
APP_LOGI("AbilityThread::HandleCommandAbility end");
}

8
frameworks/kits/ability/native/src/continuation/distributed/reverse_continuation_scheduler_primary_stub.cpp
View File

@ -1,5 +1,5 @@
/*
* Copyright (c) 2021 Huawei Device Co., Ltd.
* Copyright (c) 2021-2022 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
@ -49,9 +49,9 @@ int ReverseContinuationSchedulerPrimaryStub::OnRemoteRequest(
uint32_t code, MessageParcel &data, MessageParcel &reply, MessageOption &option)
{
APP_LOGI("%{public}s called begin", __func__);
std::u16string touken = data.ReadInterfaceToken();
std::u16string descripor = Str8ToStr16(DESCRIPTOR);
if (descripor != touken) {
std::u16string token = data.ReadInterfaceToken();
std::u16string descriptor = Str8ToStr16(DESCRIPTOR);
if (descriptor != token) {
APP_LOGE("ReverseContinuationSchedulerPrimaryStub::OnRemoteRequest failed, DESCRIPTOR != touken");
return -1;
}

4
frameworks/kits/ability/native/test/unittest/page_ability_impl_test.cpp
View File

@ -1,5 +1,5 @@
/*
* Copyright (c) 2021 Huawei Device Co., Ltd.
* Copyright (c) 2021-2022 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
@ -530,7 +530,7 @@ HWTEST_F(PageAbilityImplTest, AaFwk_PageAbilityImpl_HandleAbilityTransaction_080
/**
* @tc.number: AaFwk_PageAbilityImpl_HandleAbilityTransaction_0900
* @tc.name: HandleAbilityTransaction
* @tc.desc: Handle transactions in the Active/Background/Inactive/Inital states
* @tc.desc: Handle transactions in the Active/Background/Inactive/Initial states
*/
HWTEST_F(PageAbilityImplTest, AaFwk_PageAbilityImpl_HandleAbilityTransaction_0900, Function | MediumTest | Level1)
{

4
frameworks/kits/appkit/native/ability_delegator/include/ability_delegator.h
View File

@ -1,5 +1,5 @@
/*
* Copyright (c) 2021 Huawei Device Co., Ltd.
* Copyright (c) 2021-2022 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
@ -40,7 +40,7 @@ public:
STARTED,
FOREGROUND,
BACKGROUND,
STOPED
STOPPED
};
public:

4
frameworks/kits/appkit/native/ability_delegator/src/ability_delegator.cpp
View File

@ -1,5 +1,5 @@
/*
* Copyright (c) 2021 Huawei Device Co., Ltd.
* Copyright (c) 2021-2022 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
@ -447,7 +447,7 @@ AbilityDelegator::AbilityState AbilityDelegator::ConvertAbilityState(
abilityState = AbilityDelegator::AbilityState::BACKGROUND;
break;
case AbilityLifecycleExecutor::LifecycleState::STOPED_NEW:
abilityState = AbilityDelegator::AbilityState::STOPED;
abilityState = AbilityDelegator::AbilityState::STOPPED;
break;
default:
APP_LOGE("Unknown lifecycleState");

4
frameworks/kits/appkit/native/app/include/ability_manager.h
View File

@ -1,5 +1,5 @@
/*
* Copyright (c) 2021 Huawei Device Co., Ltd.
* Copyright (c) 2021-2022 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
@ -66,7 +66,7 @@ public:
* @param numMax The maximum number of entries to return in the list. The
* actual number returned may be smaller, depending on how many tasks the
* user has started and the maximum number the system can remember.
* @param falgs Information about what to return. May be any combination
* @param flags Information about what to return. May be any combination
* of {@link #RECENT_WITH_EXCLUDED} and {@link #RECENT_IGNORE_UNAVAILABLE}.
*
* @returns Returns the AbilityMissionInfo.

2
frameworks/kits/appkit/native/app/include/main_thread.h
View File

@ -382,7 +382,7 @@ private:
*
* @brief The handle of application not response process.
*
* @param sigMessage Recieve the sig message.
* @param sigMessage Receive the sig message.
*
*/
static void HandleANRProcess(int sigMessage);

10
frameworks/kits/appkit/native/app/include/sys_mgr_client.h
View File

@ -1,5 +1,5 @@
/*
* Copyright (c) 2021 Huawei Device Co., Ltd.
* Copyright (c) 2021-2022 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
@ -34,7 +34,7 @@ public:
*
* Get the systemAbility by ID.
*
* @param systemAbilityId The ID of systemAbility whitch want to get.
* @param systemAbilityId The ID of systemAbility which want to get.
*/
sptr<IRemoteObject> GetSystemAbility(const int32_t systemAbilityId);
@ -42,8 +42,8 @@ public:
*
* Register the systemAbility by ID.
*
* @param systemAbilityId The ID of systemAbility whitch want to register.
* @param broker The systemAbility whitch want to be registered.
* @param systemAbilityId The ID of systemAbility which want to register.
* @param broker The systemAbility which want to be registered.
*/
void RegisterSystemAbility(const int32_t systemAbilityId, sptr<IRemoteObject> broker);
@ -51,7 +51,7 @@ public:
*
* Unregister the systemAbility by ID.
*
* @param systemAbilityId The ID of systemAbility whitch want to unregister.
* @param systemAbilityId The ID of systemAbility which want to unregister.
*/
void UnregisterSystemAbility(const int32_t systemAbilityId);

16
frameworks/kits/appkit/native/app/src/main_thread.cpp
View File

@ -70,7 +70,7 @@ constexpr int32_t UNSPECIFIED_USERID = -2;
*
* @brief Notify the AppMgrDeathRecipient that the remote is dead.
*
* @param remote The remote whitch is dead.
* @param remote The remote which is dead.
*/
void AppMgrDeathRecipient::OnRemoteDied(const wptr<IRemoteObject> &remote)
{
@ -331,7 +331,7 @@ void MainThread::ScheduleTerminateApplication()
/**
*
* @brief Shrink the memory whitch used by application.
* @brief Shrink the memory which used by application.
*
* @param level Indicates the memory trim level, which shows the current memory usage status.
*/
@ -378,7 +378,7 @@ void MainThread::ScheduleProcessSecurityExit()
/**
*
* @brief Low the memory whitch used by application.
* @brief Low the memory which used by application.
*
*/
void MainThread::ScheduleLowMemory()
@ -476,7 +476,7 @@ void MainThread::ScheduleLaunchAbility(const AbilityInfo &info, const sptr<IRemo
*
* @brief clean the ability by token.
*
* @param token The token belong to the ability whitch want to be cleaned.
* @param token The token belong to the ability which want to be cleaned.
*
*/
void MainThread::ScheduleCleanAbility(const sptr<IRemoteObject> &token)
@ -1019,7 +1019,7 @@ bool MainThread::AbilityDelegatorPrepare(const UserTestRecord &record)
*
* @brief launch the ability.
*
* @param abilityRecord The abilityRecord whitch belongs to the ability launched.
* @param abilityRecord The abilityRecord which belongs to the ability launched.
*
*/
void MainThread::HandleLaunchAbility(const std::shared_ptr<AbilityLocalRecord> &abilityRecord)
@ -1079,7 +1079,7 @@ void MainThread::HandleLaunchAbility(const std::shared_ptr<AbilityLocalRecord> &
*
* @brief Clean the ability but don't notify ams.
*
* @param token The token whitch belongs to the ability launched.
* @param token The token which belongs to the ability launched.
*
*/
void MainThread::HandleCleanAbilityLocal(const sptr<IRemoteObject> &token)
@ -1127,7 +1127,7 @@ void MainThread::HandleCleanAbilityLocal(const sptr<IRemoteObject> &token)
*
* @brief Clean the ability.
*
* @param token The token whitch belongs to the ability launched.
* @param token The token which belongs to the ability launched.
*
*/
void MainThread::HandleCleanAbility(const sptr<IRemoteObject> &token)
@ -1283,7 +1283,7 @@ void MainThread::HandleTerminateApplication()
/**
*
* @brief Shrink the memory whitch used by application.
* @brief Shrink the memory which used by application.
*
* @param level Indicates the memory trim level, which shows the current memory usage status.
*

4
frameworks/kits/appkit/native/app/src/watchdog.cpp
View File

@ -1,5 +1,5 @@
/*
* Copyright (c) 2021 Huawei Device Co., Ltd.
* Copyright (c) 2021-2022 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
@ -114,7 +114,7 @@ bool WatchDog::Timer()
EVENT_KEY_PROCESS_NAME, applicationInfo_->process,
EVENT_KEY_MESSAGE, msgContent);
}
APP_LOGI("Waring : main thread is not response!");
APP_LOGI("Warning : main thread is not response!");
};
currentHandler_->PostTask(timeoutTask1, MAIN_THREAD_IS_ALIVE_MSG, MAIN_THREAD_TIMEOUT_TIME);
appMainHandler_->SendEvent(MAIN_THREAD_IS_ALIVE);

42
frameworks/kits/appkit/test/moduletest/appexecfwk_appkit_native_app_module_test_first.cpp
View File

@ -1,5 +1,5 @@
/*
* Copyright (c) 2021 Huawei Device Co., Ltd.
* Copyright (c) 2021-2022 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
@ -72,11 +72,11 @@ void AppkitNativeModuleTestFirst::TearDown(void)
GTEST_LOG_(INFO) << "AppkitNativeModuleTestFirst TearDown";
AppLaunchData lanchdate;
ApplicationInfo appinf;
ProcessInfo processinf("TestProcess", TestProcessInfo);
ProcessInfo processing("TestProcess", TestProcessInfo);
appinf.name = "MockTestApplication";
appinf.moduleSourceDirs.push_back("/hos/lib/libabilitydemo_native.z.so");
lanchdate.SetApplicationInfo(appinf);
lanchdate.SetProcessInfo(processinf);
lanchdate.SetProcessInfo(processing);
mockAppMgr->ScheduleLaunchApplication(lanchdate);
usleep(USleepTime);
@ -138,11 +138,11 @@ HWTEST_F(AppkitNativeModuleTestFirst, App_ApplicationLifeCycle_0100, Function |
AppLaunchData lanchdate;
ApplicationInfo appinf;
ProcessInfo processinf("TestProcess", TestProcessInfo);
ProcessInfo processing("TestProcess", TestProcessInfo);
appinf.name = "MockTestApplication";
appinf.moduleSourceDirs.push_back("/hos/lib/libabilitydemo_native.z.so");
lanchdate.SetApplicationInfo(appinf);
lanchdate.SetProcessInfo(processinf);
lanchdate.SetProcessInfo(processing);
mockAppMgr->ScheduleLaunchApplication(lanchdate);
usleep(USleepTime);
@ -249,11 +249,11 @@ HWTEST_F(AppkitNativeModuleTestFirst, App_ApplicationLifeCycle_0500, Function |
AppLaunchData lanchdate;
ApplicationInfo appinf;
ProcessInfo processinf("TestProcess", TestProcessInfo);
ProcessInfo processing("TestProcess", TestProcessInfo);
appinf.name = "MockTestApplication";
appinf.moduleSourceDirs.push_back("/hos/lib/libabilitydemo_native.z.so");
lanchdate.SetApplicationInfo(appinf);
lanchdate.SetProcessInfo(processinf);
lanchdate.SetProcessInfo(processing);
mockAppMgr->ScheduleLaunchApplication(lanchdate);
usleep(USleepTime);
@ -283,11 +283,11 @@ HWTEST_F(AppkitNativeModuleTestFirst, App_ApplicationLifeCycle_0600, Function |
AppLaunchData lanchdate;
ApplicationInfo appinf;
ProcessInfo processinf("TestProcess", TestProcessInfo);
ProcessInfo processing("TestProcess", TestProcessInfo);
appinf.name = "MockTestApplication";
appinf.moduleSourceDirs.push_back("/hos/lib/libabilitydemo_native.z.so");
lanchdate.SetApplicationInfo(appinf);
lanchdate.SetProcessInfo(processinf);
lanchdate.SetProcessInfo(processing);
mockAppMgr->ScheduleLaunchApplication(lanchdate);
usleep(USleepTime);
@ -317,11 +317,11 @@ HWTEST_F(AppkitNativeModuleTestFirst, App_ApplicationLifeCycle_0700, Function |
AppLaunchData lanchdate;
ApplicationInfo appinf;
ProcessInfo processinf("TestProcess", TestProcessInfo);
ProcessInfo processing("TestProcess", TestProcessInfo);
appinf.name = "MockTestApplication";
appinf.moduleSourceDirs.push_back("/hos/lib/libabilitydemo_native.z.so");
lanchdate.SetApplicationInfo(appinf);
lanchdate.SetProcessInfo(processinf);
lanchdate.SetProcessInfo(processing);
mockAppMgr->ScheduleLaunchApplication(lanchdate);
usleep(USleepTime);
@ -351,11 +351,11 @@ HWTEST_F(AppkitNativeModuleTestFirst, App_ApplicationLifeCycle_0800, Function |
AppLaunchData lanchdate;
ApplicationInfo appinf;
ProcessInfo processinf("TestProcess", TestProcessInfo);
ProcessInfo processing("TestProcess", TestProcessInfo);
appinf.name = "MockTestApplication";
appinf.moduleSourceDirs.push_back("/hos/lib/libabilitydemo_native.z.so");
lanchdate.SetApplicationInfo(appinf);
lanchdate.SetProcessInfo(processinf);
lanchdate.SetProcessInfo(processing);
mockAppMgr->ScheduleLaunchApplication(lanchdate);
usleep(USleepTime);
@ -389,11 +389,11 @@ HWTEST_F(AppkitNativeModuleTestFirst, App_ApplicationLifeCycle_0900, Function |
AppLaunchData lanchdate;
ApplicationInfo appinf;
ProcessInfo processinf("TestProcess", TestProcessInfo);
ProcessInfo processing("TestProcess", TestProcessInfo);
appinf.name = "MockTestApplication";
appinf.moduleSourceDirs.push_back("/hos/lib/libabilitydemo_native.z.so");
lanchdate.SetApplicationInfo(appinf);
lanchdate.SetProcessInfo(processinf);
lanchdate.SetProcessInfo(processing);
mockAppMgr->ScheduleLaunchApplication(lanchdate);
usleep(USleepTime);
@ -427,11 +427,11 @@ HWTEST_F(AppkitNativeModuleTestFirst, App_ApplicationLifeCycle_1000, Function |
AppLaunchData lanchdate;
ApplicationInfo appinf;
ProcessInfo processinf("TestProcess", TestProcessInfo);
ProcessInfo processing("TestProcess", TestProcessInfo);
appinf.name = "MockTestApplication";
appinf.moduleSourceDirs.push_back("/hos/lib/libabilitydemo_native.z.so");
lanchdate.SetApplicationInfo(appinf);
lanchdate.SetProcessInfo(processinf);
lanchdate.SetProcessInfo(processing);
mockAppMgr->ScheduleLaunchApplication(lanchdate);
usleep(USleepTime);
@ -465,11 +465,11 @@ HWTEST_F(AppkitNativeModuleTestFirst, App_ApplicationLifeCycle_1100, Function |
AppLaunchData lanchdate;
ApplicationInfo appinf;
ProcessInfo processinf("TestProcess", TestProcessInfo);
ProcessInfo processing("TestProcess", TestProcessInfo);
appinf.name = "MockTestApplication";
appinf.moduleSourceDirs.push_back("/hos/lib/libabilitydemo_native.z.so");
lanchdate.SetApplicationInfo(appinf);
lanchdate.SetProcessInfo(processinf);
lanchdate.SetProcessInfo(processing);
mockAppMgr->ScheduleLaunchApplication(lanchdate);
usleep(USleepTime);
@ -507,11 +507,11 @@ HWTEST_F(AppkitNativeModuleTestFirst, App_ApplicationLifeCycle_1200, Function |
AppLaunchData lanchdate;
ApplicationInfo appinf;
ProcessInfo processinf("TestProcess", TestProcessInfo);
ProcessInfo processing("TestProcess", TestProcessInfo);
appinf.name = "MockTestApplication";
appinf.moduleSourceDirs.push_back("/hos/lib/libabilitydemo_native.z.so");
lanchdate.SetApplicationInfo(appinf);
lanchdate.SetProcessInfo(processinf);
lanchdate.SetProcessInfo(processing);
mockAppMgr->ScheduleLaunchApplication(lanchdate);
usleep(USleepTime);

30
frameworks/kits/appkit/test/moduletest/appexecfwk_appkit_native_app_module_test_fourth.cpp
View File

@ -1,5 +1,5 @@
/*
* Copyright (c) 2021 Huawei Device Co., Ltd.
* Copyright (c) 2021-2022 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
@ -71,11 +71,11 @@ void AppkitNativeModuleTestThird::TearDown(void)
GTEST_LOG_(INFO) << "AppkitNativeModuleTestThird TearDown";
AppLaunchData lanchdate;
ApplicationInfo appinf;
ProcessInfo processinf("TestProcess", TestProcessInfo);
ProcessInfo processing("TestProcess", TestProcessInfo);
appinf.name = "MockTestApplication";
appinf.moduleSourceDirs.push_back("/hos/lib/libabilitydemo_native.z.so");
lanchdate.SetApplicationInfo(appinf);
lanchdate.SetProcessInfo(processinf);
lanchdate.SetProcessInfo(processing);
mockAppMgr->ScheduleLaunchApplication(lanchdate);
usleep(USleepTime);
@ -101,11 +101,11 @@ HWTEST_F(AppkitNativeModuleTestThird, App_CleanAbility_0100, Function | MediumTe
AppLaunchData lanchdate;
ApplicationInfo appinf;
ProcessInfo processinf("TestProcess", TestProcessInfo);
ProcessInfo processing("TestProcess", TestProcessInfo);
appinf.name = "MockTestApplication";
appinf.moduleSourceDirs.push_back("/hos/lib/libabilitydemo_native.z.so");
lanchdate.SetApplicationInfo(appinf);
lanchdate.SetProcessInfo(processinf);
lanchdate.SetProcessInfo(processing);
mockAppMgr->ScheduleLaunchApplication(lanchdate);
usleep(USleepTime);
@ -169,11 +169,11 @@ HWTEST_F(AppkitNativeModuleTestThird, App_CleanAbility_0300, Function | MediumTe
AppLaunchData lanchdate;
ApplicationInfo appinf;
ProcessInfo processinf("TestProcess", TestProcessInfo);
ProcessInfo processing("TestProcess", TestProcessInfo);
appinf.name = "MockTestApplication";
appinf.moduleSourceDirs.push_back("/hos/lib/libabilitydemo_native.z.so");
lanchdate.SetApplicationInfo(appinf);
lanchdate.SetProcessInfo(processinf);
lanchdate.SetProcessInfo(processing);
mockAppMgr->ScheduleLaunchApplication(lanchdate);
usleep(USleepTime);
@ -206,11 +206,11 @@ HWTEST_F(AppkitNativeModuleTestThird, App_CleanAbility_0400, Function | MediumTe
AppLaunchData lanchdate;
ApplicationInfo appinf;
ProcessInfo processinf("TestProcess", TestProcessInfo);
ProcessInfo processing("TestProcess", TestProcessInfo);
appinf.name = "MockTestApplication";
appinf.moduleSourceDirs.push_back("/hos/lib/libabilitydemo_native.z.so");
lanchdate.SetApplicationInfo(appinf);
lanchdate.SetProcessInfo(processinf);
lanchdate.SetProcessInfo(processing);
mockAppMgr->ScheduleLaunchApplication(lanchdate);
usleep(USleepTime);
@ -248,11 +248,11 @@ HWTEST_F(AppkitNativeModuleTestThird, App_CleanAbility_0500, Function | MediumTe
AppLaunchData lanchdate;
ApplicationInfo appinf;
ProcessInfo processinf("TestProcess", TestProcessInfo);
ProcessInfo processing("TestProcess", TestProcessInfo);
appinf.name = "MockTestApplication";
appinf.moduleSourceDirs.push_back("/hos/lib/libabilitydemo_native.z.so");
lanchdate.SetApplicationInfo(appinf);
lanchdate.SetProcessInfo(processinf);
lanchdate.SetProcessInfo(processing);
mockAppMgr->ScheduleLaunchApplication(lanchdate);
usleep(USleepTime);
@ -289,11 +289,11 @@ HWTEST_F(AppkitNativeModuleTestThird, App_ElementsCallbacks_0100, Function | Med
AppLaunchData lanchdate;
ApplicationInfo appinf;
ProcessInfo processinf("TestProcess", 9997);
ProcessInfo processing("TestProcess", 9997);
appinf.name = "MockTestApplication";
appinf.moduleSourceDirs.push_back("/hos/lib/libabilitydemo_native.z.so");
lanchdate.SetApplicationInfo(appinf);
lanchdate.SetProcessInfo(processinf);
lanchdate.SetProcessInfo(processing);
mockAppMgr->ScheduleLaunchApplication(lanchdate);
usleep(USleepTime);
@ -337,11 +337,11 @@ HWTEST_F(AppkitNativeModuleTestThird, App_AbilityLifecycleCallbacks_0100, Functi
AppLaunchData lanchdate;
ApplicationInfo appinf;
ProcessInfo processinf("TestProcess", 9996);
ProcessInfo processing("TestProcess", 9996);
appinf.name = "MockTestApplication";
appinf.moduleSourceDirs.push_back("/hos/lib/libabilitydemo_native.z.so");
lanchdate.SetApplicationInfo(appinf);
lanchdate.SetProcessInfo(processinf);
lanchdate.SetProcessInfo(processing);
mockAppMgr->ScheduleLaunchApplication(lanchdate);
usleep(USleepTime);

26
frameworks/kits/appkit/test/moduletest/appexecfwk_appkit_native_app_module_test_second.cpp
View File

@ -1,5 +1,5 @@
/*
* Copyright (c) 2021 Huawei Device Co., Ltd.
* Copyright (c) 2021-2022 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
@ -72,11 +72,11 @@ void AppkitNativeModuleTestSecond::TearDown(void)
GTEST_LOG_(INFO) << "AppkitNativeModuleTestSecond TearDown";
AppLaunchData lanchdate;
ApplicationInfo appinf;
ProcessInfo processinf("TestProcess", TestProcessInfo);
ProcessInfo processing("TestProcess", TestProcessInfo);
appinf.name = "MockTestApplication";
appinf.moduleSourceDirs.push_back("/hos/lib/libabilitydemo_native.z.so");
lanchdate.SetApplicationInfo(appinf);
lanchdate.SetProcessInfo(processinf);
lanchdate.SetProcessInfo(processing);
mockAppMgr->ScheduleLaunchApplication(lanchdate);
usleep(USleepTime);
@ -100,11 +100,11 @@ HWTEST_F(AppkitNativeModuleTestSecond, App_ApplicationLifeCycle_1300, Function |
AppLaunchData lanchdate;
ApplicationInfo appinf;
ProcessInfo processinf("TestProcess", TestProcessInfo);
ProcessInfo processing("TestProcess", TestProcessInfo);
appinf.name = "MockTestApplication";
appinf.moduleSourceDirs.push_back("/hos/lib/libabilitydemo_native.z.so");
lanchdate.SetApplicationInfo(appinf);
lanchdate.SetProcessInfo(processinf);
lanchdate.SetProcessInfo(processing);
mockAppMgr->ScheduleLaunchApplication(lanchdate);
usleep(USleepTime);
@ -142,11 +142,11 @@ HWTEST_F(AppkitNativeModuleTestSecond, App_ApplicationLifeCycle_1400, Function |
AppLaunchData lanchdate;
ApplicationInfo appinf;
ProcessInfo processinf("TestProcess", TestProcessInfo);
ProcessInfo processing("TestProcess", TestProcessInfo);
appinf.name = "MockTestApplication";
appinf.moduleSourceDirs.push_back("/hos/lib/libabilitydemo_native.z.so");
lanchdate.SetApplicationInfo(appinf);
lanchdate.SetProcessInfo(processinf);
lanchdate.SetProcessInfo(processing);
mockAppMgr->ScheduleLaunchApplication(lanchdate);
usleep(USleepTime);
@ -172,11 +172,11 @@ HWTEST_F(AppkitNativeModuleTestSecond, App_ApplicationLifeCycle_1500, Function |
AppLaunchData lanchdate;
ApplicationInfo appinf;
ProcessInfo processinf("TestProcess", TestProcessInfo);
ProcessInfo processing("TestProcess", TestProcessInfo);
appinf.name = "MockTestApplication";
appinf.moduleSourceDirs.push_back("/hos/lib/libabilitydemo_native.z.so");
lanchdate.SetApplicationInfo(appinf);
lanchdate.SetProcessInfo(processinf);
lanchdate.SetProcessInfo(processing);
mockAppMgr->ScheduleLaunchApplication(lanchdate);
usleep(USleepTime);
@ -203,11 +203,11 @@ HWTEST_F(AppkitNativeModuleTestSecond, App_LaunchAblity_0100, Function | MediumT
AppLaunchData lanchdate;
ApplicationInfo appinf;
ProcessInfo processinf("TestProcess", TestProcessInfo);
ProcessInfo processing("TestProcess", TestProcessInfo);
appinf.name = "MockTestApplication";
appinf.moduleSourceDirs.push_back("/hos/lib/libabilitydemo_native.z.so");
lanchdate.SetApplicationInfo(appinf);
lanchdate.SetProcessInfo(processinf);
lanchdate.SetProcessInfo(processing);
mockAppMgr->ScheduleLaunchApplication(lanchdate);
usleep(USleepTime);
@ -263,11 +263,11 @@ HWTEST_F(AppkitNativeModuleTestSecond, App_LaunchAblity_0300, Function | MediumT
AppLaunchData lanchdate;
ApplicationInfo appinf;
ProcessInfo processinf("TestProcess", TestProcessInfo);
ProcessInfo processing("TestProcess", TestProcessInfo);
appinf.name = "MockTestApplication";
appinf.moduleSourceDirs.push_back("/hos/lib/libabilitydemo_native.z.so");
lanchdate.SetApplicationInfo(appinf);
lanchdate.SetProcessInfo(processinf);
lanchdate.SetProcessInfo(processing);
mockAppMgr->ScheduleLaunchApplication(lanchdate);
usleep(USleepTime);

10
frameworks/kits/appkit/test/moduletest/appexecfwk_appkit_native_app_module_test_third.cpp
View File

@ -1,5 +1,5 @@
/*
* Copyright (c) 2021 Huawei Device Co., Ltd.
* Copyright (c) 2021-2022 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
@ -71,11 +71,11 @@ void AppkitNativeModuleTestThird::TearDown(void)
GTEST_LOG_(INFO) << "AppkitNativeModuleTestThird TearDown";
AppLaunchData lanchdate;
ApplicationInfo appinf;
ProcessInfo processinf("TestProcess", TestProcessInfo);
ProcessInfo processing("TestProcess", TestProcessInfo);
appinf.name = "MockTestApplication";
appinf.moduleSourceDirs.push_back("/hos/lib/libabilitydemo_native.z.so");
lanchdate.SetApplicationInfo(appinf);
lanchdate.SetProcessInfo(processinf);
lanchdate.SetProcessInfo(processing);
mockAppMgr->ScheduleLaunchApplication(lanchdate);
usleep(USleepTime);
@ -100,7 +100,7 @@ HWTEST_F(AppkitNativeModuleTestThird, App_Context_ApplicationContext_0100, Funct
AppLaunchData lanchdate;
ApplicationInfo appinf;
ProcessInfo processinf("TestProcess", 9998);
ProcessInfo processing("TestProcess", 9998);
appinf.name = "MockTestApplication";
appinf.cacheDir = "/hos/lib/cacheDir";
appinf.dataBaseDir = "/hos/lib/dataBaseDir";
@ -108,7 +108,7 @@ HWTEST_F(AppkitNativeModuleTestThird, App_Context_ApplicationContext_0100, Funct
appinf.bundleName = "MockBundleName";
appinf.moduleSourceDirs.push_back("/hos/lib/libabilitydemo_native.z.so");
lanchdate.SetApplicationInfo(appinf);
lanchdate.SetProcessInfo(processinf);
lanchdate.SetProcessInfo(processing);
mockAppMgr->ScheduleLaunchApplication(lanchdate);
usleep(USleepTime);

4
frameworks/kits/content/cpp/src/ohos/aafwk/content/extra_params.cpp
View File

@ -1,6 +1,6 @@
/*
* Copyright (c) 2021 Huawei Device Co., Ltd.
* Copyright (c) 2021-2022 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
@ -151,8 +151,6 @@ void ExtraParams::SetTargetBundleName(const string &targetBundleName)
* @brief Obtains the bundle name of the target application where the ability will be migrated.
*
* @return Returns the bundle name of the target application.
*
* @return none
*/
string ExtraParams::GetTargetBundleName() const
{

8
frameworks/kits/content/cpp/src/ohos/aafwk/content/intent_filter.cpp
View File

@ -1,5 +1,5 @@
/*
* Copyright (c) 2021 Huawei Device Co., Ltd.
* Copyright (c) 2021-2022 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
@ -82,11 +82,7 @@ bool IntentFilter::Marshalling(Parcel &parcel) const
actionU16.push_back(Str8ToStr16(actions_[i]));
}
if (!parcel.WriteString16Vector(actionU16)) {
return false;
}
return true;
return parcel.WriteString16Vector(actionU16);
}
bool IntentFilter::ReadFromParcel(Parcel &parcel)

4
interfaces/innerkits/ability_manager/include/ability_manager_client.h
View File

@ -1,5 +1,5 @@
/*
* Copyright (c) 2021 Huawei Device Co., Ltd.
* Copyright (c) 2021-2022 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
@ -278,7 +278,7 @@ public:
* @param numMax The maximum number of entries to return in the list. The
* actual number returned may be smaller, depending on how many tasks the
* user has started and the maximum number the system can remember.
* @param falgs Information about what to return. May be any combination
* @param flags Information about what to return. May be any combination
* of {@link #RECENT_WITH_EXCLUDED} and {@link #RECENT_IGNORE_UNAVAILABLE}.
* @return Returns ERR_OK on success, others on failure.
*/

4
interfaces/innerkits/ability_manager/include/ability_manager_errors.h
View File

@ -166,7 +166,7 @@ enum {
*/
UNINSTALL_APP_FAILED,
/**
* Result(2097184) for terminate ability result: An error of terminate servce.
* Result(2097184) for terminate ability result: An error of terminate service.
*/
TERMINATE_ABILITY_RESULT_FAILED,
/**
@ -266,7 +266,7 @@ enum {
GET_FLOATING_STACK_FAILED,
/**
* Result(2097205) for close mutli window failed
* Result(2097205) for close multi window failed
*/
CLOSE_MULTI_WINDOW_FAILED,

4
interfaces/innerkits/ability_manager/include/ability_manager_interface.h
View File

@ -1,5 +1,5 @@
/*
* Copyright (c) 2021 Huawei Device Co., Ltd.
* Copyright (c) 2021-2022 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
@ -316,7 +316,7 @@ public:
* @param numMax The maximum number of entries to return in the list. The
* actual number returned may be smaller, depending on how many tasks the
* user has started and the maximum number the system can remember.
* @param falgs Information about what to return. May be any combination
* @param flags Information about what to return. May be any combination
* of {@link #RECENT_WITH_EXCLUDED} and {@link #RECENT_IGNORE_UNAVAILABLE}.
* @return Returns ERR_OK on success, others on failure.
*/

4
interfaces/innerkits/ability_manager/include/ability_mission_info.h
View File

@ -1,5 +1,5 @@
/*
* Copyright (c) 2021 Huawei Device Co., Ltd.
* Copyright (c) 2021-2022 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
@ -27,7 +27,7 @@ namespace OHOS {
namespace AAFwk {
/**
* @struct AbilityMissionInfo
* AbilityMissionInfo is used to save informations about ability mission.
* AbilityMissionInfo is used to save information about ability mission.
*/
struct AbilityMissionInfo : public Parcelable {
int32_t id = -1;

4
interfaces/innerkits/ability_manager/include/ability_record_info.h
View File

@ -1,5 +1,5 @@
/*
* Copyright (c) 2021 Huawei Device Co., Ltd.
* Copyright (c) 2021-2022 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
@ -48,7 +48,7 @@ enum AbilityState {
/**
* @struct AbilityRecordInfo
* AbilityRecordInfo is used to save informations about ability record.
* AbilityRecordInfo is used to save information about ability record.
*/
struct AbilityRecordInfo : public Parcelable {
int32_t id = -1;

4
interfaces/innerkits/ability_manager/include/ability_running_info.h
View File

@ -1,5 +1,5 @@
/*
* Copyright (c) 2021 Huawei Device Co., Ltd.
* Copyright (c) 2021-2022 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
@ -25,7 +25,7 @@ namespace OHOS {
namespace AAFwk {
/**
* @struct AbilityRunningInfo
* AbilityRunningInfo is used to save informations about running ability.
* AbilityRunningInfo is used to save information about running ability.
*/
struct AbilityRunningInfo : public Parcelable {
public:

4
interfaces/innerkits/ability_manager/include/ability_scheduler_interface.h
View File

@ -1,5 +1,5 @@
/*
* Copyright (c) 2021 Huawei Device Co., Ltd.
* Copyright (c) 2021-2022 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
@ -332,7 +332,7 @@ public:
// ipc id for scheduling BatchInsert​
SCHEDULE_BATCHINSERT,
// ipc id for dataAbilityObServer Reguster
// ipc id for dataAbilityObServer Register
SCHEDULE_REGISTEROBSERVER,
// ipc id for dataAbilityObServer UnReguster

4
interfaces/innerkits/ability_manager/include/extension_running_info.h
View File

@ -1,5 +1,5 @@
/*
* Copyright (c) 2021 Huawei Device Co., Ltd.
* Copyright (c) 2021-2022 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
@ -25,7 +25,7 @@ namespace OHOS {
namespace AAFwk {
/**
* @struct ExtensionRunningInfo
* ExtensionRunningInfo is used to save informations about extension.
* ExtensionRunningInfo is used to save information about extension.
*/
struct ExtensionRunningInfo : public Parcelable {
public:

2
interfaces/innerkits/ability_manager/include/image_info.h
View File

@ -24,7 +24,7 @@ namespace OHOS {
namespace AAFwk {
/**
* @struct ImageInfo
* ImageInfo is used to save informations about sanpshot.
* ImageInfo is used to save information about sanpshot.
*/
struct ImageInfo : public Parcelable {
uint32_t width;

4
interfaces/innerkits/ability_manager/include/launch_param.h
View File

@ -1,5 +1,5 @@
/*
* Copyright (c) 2021 Huawei Device Co., Ltd.
* Copyright (c) 2021-2022 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
@ -43,7 +43,7 @@ enum LastExitReason {
/**
* @struct LaunchParam
* LaunchParam is used to save informations about ability launch param.
* LaunchParam is used to save information about ability launch param.
*/
struct LaunchParam : public Parcelable {
LaunchReason launchReason = LaunchReason::LAUNCHREASON_UNKNOWN;

4
interfaces/innerkits/ability_manager/include/lifecycle_state_info.h
View File

@ -1,5 +1,5 @@
/*
* Copyright (c) 2021 Huawei Device Co., Ltd.
* Copyright (c) 2021-2022 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
@ -43,7 +43,7 @@ enum AbilityLifeCycleState {
/**
* @struct LifeCycleStateInfo
* LifeCycleStateInfo is used to save informations about ability life cycle state.
* LifeCycleStateInfo is used to save information about ability life cycle state.
*/
struct LifeCycleStateInfo : public Parcelable {
AbilityLifeCycleState state = AbilityLifeCycleState::ABILITY_STATE_INITIAL;

4
interfaces/innerkits/ability_manager/include/mission_description_info.h
View File

@ -1,5 +1,5 @@
/*
* Copyright (c) 2021 Huawei Device Co., Ltd.
* Copyright (c) 2021-2022 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
@ -24,7 +24,7 @@ namespace OHOS {
namespace AAFwk {
/**
* @struct MissionDescriptionInfo
* MissionDescriptionInfo is used to save informations about mission description.
* MissionDescriptionInfo is used to save information about mission description.
*/
struct MissionDescriptionInfo : public Parcelable {
std::string label;

2
interfaces/innerkits/ability_manager/include/mission_info.h
View File

@ -25,7 +25,7 @@ namespace OHOS {
namespace AAFwk {
/**
* @struct MissionInfo
* MissionInfo is used to save informations about mission information.
* MissionInfo is used to save information about mission information.
*/
struct MissionInfo : public Parcelable {
bool ReadFromParcel(Parcel &parcel);

4
interfaces/innerkits/ability_manager/include/mission_record_info.h
View File

@ -1,5 +1,5 @@
/*
* Copyright (c) 2021 Huawei Device Co., Ltd.
* Copyright (c) 2021-2022 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
@ -25,7 +25,7 @@ namespace OHOS {
namespace AAFwk {
/**
* @struct MissionRecordInfo
* MissionRecordInfo is used to save informations about mission record.
* MissionRecordInfo is used to save information about mission record.
*/
struct MissionRecordInfo : public Parcelable {
int32_t id = -1;

4
interfaces/innerkits/ability_manager/include/mission_snapshot.h
View File

@ -1,5 +1,5 @@
/*
* Copyright (c) 2021 Huawei Device Co., Ltd.
* Copyright (c) 2021-2022 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
@ -26,7 +26,7 @@ namespace OHOS {
namespace AAFwk {
/**
* @struct MissionPixelMap
* MissionPixelMap is used to save informations about mission sanpshot.
* MissionPixelMap is used to save information about mission sanpshot.
*/
struct MissionPixelMap : public Parcelable {
AppExecFwk::ElementName topAbility;

4
interfaces/innerkits/ability_manager/include/mission_stack_info.h
View File

@ -1,5 +1,5 @@
/*
* Copyright (c) 2021 Huawei Device Co., Ltd.
* Copyright (c) 2021-2022 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
@ -25,7 +25,7 @@ namespace OHOS {
namespace AAFwk {
/**
* @struct MissionStackInfo
* MissionStackInfo is used to save informations about mission stack.
* MissionStackInfo is used to save information about mission stack.
*/
struct MissionStackInfo : public Parcelable {
int32_t id = -1;

2
interfaces/innerkits/ability_manager/include/stack_info.h
View File

@ -25,7 +25,7 @@ namespace OHOS {
namespace AAFwk {
/**
* @struct StackInfo
* StackInfo is used to save informations about stack.
* StackInfo is used to save information about stack.
*/
struct StackInfo : public Parcelable {

18
interfaces/innerkits/app_manager/src/appmgr/app_mgr_proxy.cpp
View File

@ -307,7 +307,7 @@ void AppMgrProxy::GetSystemMemoryAttr(SystemMemoryAttr &memoryInfo, std::string
MessageParcel data;
MessageParcel reply;
if (!WriteInterfaceToken(data)) {
APP_LOGE("WriteInterfaceToken faild");
APP_LOGE("WriteInterfaceToken failed");
return;
}
@ -317,13 +317,13 @@ void AppMgrProxy::GetSystemMemoryAttr(SystemMemoryAttr &memoryInfo, std::string
}
if (!SendTransactCmd(IAppMgr::Message::APP_GET_SYSTEM_MEMORY_ATTR, data, reply)) {
APP_LOGE("SendTransactCmd faild");
APP_LOGE("SendTransactCmd failed");
return;
}
std::shared_ptr<SystemMemoryAttr> remoteRetsult(reply.ReadParcelable<SystemMemoryAttr>());
if (remoteRetsult == nullptr) {
APP_LOGE("recv SystemMemoryAttr faild");
APP_LOGE("recv SystemMemoryAttr failed");
return;
}
@ -335,7 +335,7 @@ void AppMgrProxy::AddAbilityStageDone(const int32_t recordId)
MessageParcel data;
MessageParcel reply;
if (!WriteInterfaceToken(data)) {
APP_LOGE("WriteInterfaceToken faild");
APP_LOGE("WriteInterfaceToken failed");
return;
}
@ -345,7 +345,7 @@ void AppMgrProxy::AddAbilityStageDone(const int32_t recordId)
}
if (!SendTransactCmd(IAppMgr::Message::APP_ADD_ABILITY_STAGE_INFO_DONE, data, reply)) {
APP_LOGE("SendTransactCmd faild");
APP_LOGE("SendTransactCmd failed");
return;
}
return;
@ -514,7 +514,7 @@ void AppMgrProxy::ScheduleAcceptWantDone(const int32_t recordId, const AAFwk::Wa
MessageParcel data;
MessageParcel reply;
if (!WriteInterfaceToken(data)) {
APP_LOGE("WriteInterfaceToken faild");
APP_LOGE("WriteInterfaceToken failed");
return;
}
@ -524,7 +524,7 @@ void AppMgrProxy::ScheduleAcceptWantDone(const int32_t recordId, const AAFwk::Wa
}
if (!SendTransactCmd(IAppMgr::Message::SCHEDULE_ACCEPT_WANT_DONE, data, reply)) {
APP_LOGE("SendTransactCmd faild");
APP_LOGE("SendTransactCmd failed");
return;
}
}
@ -563,7 +563,7 @@ int AppMgrProxy::StartRenderProcess(const std::string &renderParam, int32_t ipcF
MessageParcel reply;
MessageOption option;
if (!WriteInterfaceToken(data)) {
APP_LOGE("WriteInterfaceToken faild");
APP_LOGE("WriteInterfaceToken failed");
return ERR_FLATTEN_OBJECT;
}
@ -613,7 +613,7 @@ void AppMgrProxy::AttachRenderProcess(const sptr<IRemoteObject> &renderScheduler
}
if (!SendTransactCmd(IAppMgr::Message::ATTACH_RENDER_PROCESS, data, reply)) {
APP_LOGE("SendTransactCmd ATTACH_RENDER_PROCESS faild");
APP_LOGE("SendTransactCmd ATTACH_RENDER_PROCESS failed");
return;
}
}

30
interfaces/kits/napi/aafwk/abilityManager/napi_ability_manager.cpp
View File

@ -1,5 +1,5 @@
/*
* Copyright (c) 2021 Huawei Device Co., Ltd.
* Copyright (c) 2021-2022 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
@ -55,7 +55,7 @@ napi_value ParseBundleName(napi_env env, std::string &bundleName, napi_value arg
napi_get_value_string_utf8(env, args, buf, NapiAbilityMgr::BUFFER_LENGTH_MAX, &len);
HILOG_INFO("bundleName= [%{public}s].", buf);
bundleName = std::string(buf);
// create reutrn
// create return
napi_value ret = 0;
NAPI_CALL(env, napi_create_int32(env, 0, &ret));
return ret;
@ -383,7 +383,7 @@ napi_value NAPI_QueryRecentAbilityMissionInfosWrap(
&async_callback_info.asyncWork);
NAPI_CALL(env, napi_queue_async_work(env, async_callback_info.asyncWork));
// create reutrn
// create return
napi_value ret = 0;
NAPI_CALL(env, napi_create_int32(env, 1, &ret));
return ret;
@ -520,7 +520,7 @@ napi_value NAPI_GetpreviousAbilityMissionInfosWrap(napi_env env, napi_callback_i
&async_callback_info.asyncWork);
NAPI_CALL(env, napi_queue_async_work(env, async_callback_info.asyncWork));
// create reutrn
// create return
napi_value ret = 0;
NAPI_CALL(env, napi_create_int32(env, 1, &ret));
return ret;
@ -653,7 +653,7 @@ napi_value NAPI_QueryRunningAbilityMissionInfosWrap(
&async_callback_info.asyncWork);
NAPI_CALL(env, napi_queue_async_work(env, async_callback_info.asyncWork));
// create reutrn
// create return
napi_value ret = 0;
NAPI_CALL(env, napi_create_int32(env, 0, &ret));
return ret;
@ -786,7 +786,7 @@ napi_value NAPI_GetActiveAbilityMissionInfosWrap(
&async_callback_info.asyncWork);
NAPI_CALL(env, napi_queue_async_work(env, async_callback_info.asyncWork));
// create reutrn
// create return
napi_value ret = 0;
NAPI_CALL(env, napi_create_int32(env, 0, &ret));
return ret;
@ -914,7 +914,7 @@ napi_value NAPI_GetAllRunningProcessesWrap(
&async_callback_info.asyncWork);
NAPI_CALL(env, napi_queue_async_work(env, async_callback_info.asyncWork));
// create reutrn
// create return
napi_value ret = 0;
NAPI_CALL(env, napi_create_int32(env, 0, &ret));
return ret;
@ -1032,7 +1032,7 @@ napi_value NAPI_GetActiveProcessInfosWrap(
&async_callback_info.asyncWork);
NAPI_CALL(env, napi_queue_async_work(env, async_callback_info.asyncWork));
// create reutrn
// create return
napi_value ret = 0;
NAPI_CALL(env, napi_create_int32(env, 0, &ret));
return ret;
@ -1150,7 +1150,7 @@ napi_value NAPI_RemoveMissionWrap(
&async_callback_info.asyncWork);
NAPI_CALL(env, napi_queue_async_work(env, async_callback_info.asyncWork));
// create reutrn
// create return
napi_value ret = 0;
NAPI_CALL(env, napi_create_int32(env, 0, &ret));
return ret;
@ -1276,7 +1276,7 @@ napi_value NAPI_RemoveMissionsWrap(
&async_callback_info.asyncWork);
NAPI_CALL(env, napi_queue_async_work(env, async_callback_info.asyncWork));
// create reutrn
// create return
napi_value ret = 0;
NAPI_CALL(env, napi_create_int32(env, 0, &ret));
return ret;
@ -1413,7 +1413,7 @@ napi_value NAPI_ClearMissionsWrap(
&async_callback_info.asyncWork);
NAPI_CALL(env, napi_queue_async_work(env, async_callback_info.asyncWork));
// create reutrn
// create return
napi_value ret = 0;
NAPI_CALL(env, napi_create_int32(env, 0, &ret));
return ret;
@ -1531,7 +1531,7 @@ napi_value NAPI_MoveMissionToTopWrap(
&async_callback_info.asyncWork);
NAPI_CALL(env, napi_queue_async_work(env, async_callback_info.asyncWork));
// create reutrn
// create return
napi_value ret = 0;
NAPI_CALL(env, napi_create_int32(env, 0, &ret));
return ret;
@ -1656,7 +1656,7 @@ napi_value NAPI_KillProcessesByBundleNameWrap(
&async_callback_info.asyncWork);
NAPI_CALL(env, napi_queue_async_work(env, async_callback_info.asyncWork));
// create reutrn
// create return
napi_value ret = 0;
NAPI_CALL(env, napi_create_int32(env, 0, &ret));
return ret;
@ -1780,7 +1780,7 @@ napi_value NAPI_ClearUpApplicationDataWrap(napi_env env, napi_callback_info info
&async_callback_info.asyncWork);
NAPI_CALL(env, napi_queue_async_work(env, async_callback_info.asyncWork));
// create reutrn
// create return
napi_value ret = 0;
NAPI_CALL(env, napi_create_int32(env, 0, &ret));
return ret;
@ -1908,7 +1908,7 @@ napi_value NAPI_GetAbilityMissionSnapshotWrap(
&async_callback_info->asyncWork);
NAPI_CALL(env, napi_queue_async_work(env, async_callback_info->asyncWork));
// create reutrn
// create return
napi_value ret = 0;
NAPI_CALL(env, napi_create_int32(env, 0, &ret));
return ret;

4
interfaces/kits/napi/aafwk/ability_context/ability_context.js
View File

@ -1,5 +1,5 @@
/*
* Copyright (c) 2021 Huawei Device Co., Ltd.
* Copyright (c) 2021-2022 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
@ -47,7 +47,7 @@ class AbilityContext extends Context {
console.log("AbilityContext::startAbilityByCall");
return new Caller(callee);
} else {
console.log("AbilityContext::startAbilityByCall Obtain remoteObject falied");
console.log("AbilityContext::startAbilityByCall Obtain remoteObject failed");
return null;
}
}

14
interfaces/kits/napi/aafwk/app/ability_delegator/js_ability_delegator.cpp
View File

@ -1,5 +1,5 @@
/*
* Copyright (c) 2021 Huawei Device Co., Ltd.
* Copyright (c) 2021-2022 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
@ -469,9 +469,9 @@ NativeValue *JSAbilityDelegator::ParseJSMonitorPara(
return nullptr;
}
std::shared_ptr<NativeReference> refence = nullptr;
refence.reset(engine.CreateReference(value, 1));
monitorRecord.emplace(refence, monitor);
std::shared_ptr<NativeReference> reference = nullptr;
reference.reset(engine.CreateReference(value, 1));
monitorRecord.emplace(reference, monitor);
return engine.CreateNull();
}
@ -532,9 +532,9 @@ NativeValue *JSAbilityDelegator::CreateJsAbilityObject(NativeEngine &engine, con
return nullptr;
}
std::shared_ptr<NativeReference> refence = nullptr;
refence.reset(engine.CreateReference(objValue, 1));
ablityRecord[refence] = remoteObject;
std::shared_ptr<NativeReference> reference = nullptr;
reference.reset(engine.CreateReference(objValue, 1));
ablityRecord[reference] = remoteObject;
return objValue;
}

4
interfaces/kits/napi/aafwk/featureAbility/feature_ability.cpp
View File

@ -1,5 +1,5 @@
/*
* Copyright (c) 2021 Huawei Device Co., Ltd.
* Copyright (c) 2021-2022 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
@ -959,7 +959,7 @@ napi_value UnwrapForResultParam(CallAbilityParam &param, napi_env env, napi_valu
if (jsSettingObj != nullptr) {
param.setting = AbilityStartSetting::GetEmptySetting();
if (!UnwrapAbilityStartSetting(env, jsSettingObj, *(param.setting))) {
HILOG_ERROR("%{public}s, unwrap abilityStartSetting falied.", __func__);
HILOG_ERROR("%{public}s, unwrap abilityStartSetting failed.", __func__);
}
HILOG_INFO("%{public}s abilityStartSetting = %{public}p.", __func__, param.setting.get());
}

22
interfaces/kits/napi/aafwk/formManager/napi_form_manager.cpp
View File

@ -1,5 +1,5 @@
/*
* Copyright (c) 2021 Huawei Device Co., Ltd.
* Copyright (c) 2021-2022 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
@ -457,7 +457,7 @@ napi_value NAPI_DeleteForm(napi_env env, napi_callback_info info)
nullptr,
resourceName,
[](napi_env env, void *data) {
HILOG_INFO("%{public}s, promise runnning", __func__);
HILOG_INFO("%{public}s, promise running", __func__);
AsyncDelFormCallbackInfo *asyncCallbackInfo = (AsyncDelFormCallbackInfo *)data;
InnerDelForm(env, asyncCallbackInfo);
},
@ -789,7 +789,7 @@ napi_value NAPI_RequestForm(napi_env env, napi_callback_info info)
nullptr,
resourceName,
[](napi_env env, void *data) {
HILOG_INFO("%{public}s, promise runnning", __func__);
HILOG_INFO("%{public}s, promise running", __func__);
AsyncRequestFormCallbackInfo *asyncCallbackInfo = (AsyncRequestFormCallbackInfo *)data;
InnerRequestForm(env, asyncCallbackInfo);
},
@ -949,7 +949,7 @@ napi_value NAPI_SetFormNextRefreshTime(napi_env env, napi_callback_info info)
nullptr,
resourceName,
[](napi_env env, void *data) {
HILOG_INFO("%{public}s, promise runnning", __func__);
HILOG_INFO("%{public}s, promise running", __func__);
AsyncNextRefreshTimeFormCallbackInfo *asyncCallbackInfo =
(AsyncNextRefreshTimeFormCallbackInfo *)data;
@ -1106,7 +1106,7 @@ napi_value NAPI_UpdateForm(napi_env env, napi_callback_info info)
nullptr,
resourceName,
[](napi_env env, void *data) {
HILOG_INFO("%{public}s, promise runnning", __func__);
HILOG_INFO("%{public}s, promise running", __func__);
AsyncUpdateFormCallbackInfo *asyncCallbackInfo = (AsyncUpdateFormCallbackInfo *)data;
InnerUpdateForm(env, asyncCallbackInfo);
},
@ -1252,7 +1252,7 @@ napi_value NAPI_CastTempForm(napi_env env, napi_callback_info info)
nullptr,
resourceName,
[](napi_env env, void *data) {
HILOG_INFO("%{public}s, promise runnning", __func__);
HILOG_INFO("%{public}s, promise running", __func__);
AsyncCastTempFormCallbackInfo *asyncCallbackInfo = (AsyncCastTempFormCallbackInfo *)data;
InnerCastTempForm(env, asyncCallbackInfo);
},
@ -1417,7 +1417,7 @@ napi_value NAPI_NotifyVisibleForms(napi_env env, napi_callback_info info)
nullptr,
resourceName,
[](napi_env env, void *data) {
HILOG_INFO("%{public}s, promise runnning", __func__);
HILOG_INFO("%{public}s, promise running", __func__);
AsyncNotifyVisibleFormsCallbackInfo *asyncCallbackInfo =
(AsyncNotifyVisibleFormsCallbackInfo *)data;
@ -1587,7 +1587,7 @@ napi_value NAPI_NotifyInvisibleForms(napi_env env, napi_callback_info info)
nullptr,
resourceName,
[](napi_env env, void *data) {
HILOG_INFO("%{public}s, promise runnning", __func__);
HILOG_INFO("%{public}s, promise running", __func__);
AsyncNotifyInvisibleFormsCallbackInfo *asyncCallbackInfo =
(AsyncNotifyInvisibleFormsCallbackInfo *)data;
@ -1757,7 +1757,7 @@ napi_value NAPI_EnableFormsUpdate(napi_env env, napi_callback_info info)
nullptr,
resourceName,
[](napi_env env, void *data) {
HILOG_INFO("%{public}s, promise runnning", __func__);
HILOG_INFO("%{public}s, promise running", __func__);
AsyncEnableUpdateFormCallbackInfo *asyncCallbackInfo =
(AsyncEnableUpdateFormCallbackInfo *)data;
@ -1926,7 +1926,7 @@ napi_value NAPI_DisableFormsUpdate(napi_env env, napi_callback_info info)
nullptr,
resourceName,
[](napi_env env, void *data) {
HILOG_INFO("%{public}s, promise runnning", __func__);
HILOG_INFO("%{public}s, promise running", __func__);
AsyncDisableUpdateFormCallbackInfo *asyncCallbackInfo =
(AsyncDisableUpdateFormCallbackInfo *)data;
@ -2060,7 +2060,7 @@ napi_value NAPI_CheckFMSReady(napi_env env, napi_callback_info info)
nullptr,
resourceName,
[](napi_env env, void *data) {
HILOG_INFO("%{public}s, promise runnning", __func__);
HILOG_INFO("%{public}s, promise running", __func__);
AsyncCheckFMSReadyCallbackInfo *asyncCallbackInfo =
(AsyncCheckFMSReadyCallbackInfo *)data;

4
interfaces/kits/napi/aafwk/inner/napi_common/napi_common_error.h
View File

@ -1,5 +1,5 @@
/*
* Copyright (c) 2021 Huawei Device Co., Ltd.
* Copyright (c) 2021-2022 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
@ -23,7 +23,7 @@ namespace AppExecFwk {
#define NAPI_ERR_NO_PERMISSION -100
#define NAPI_ERR_INNER_DATA -101 // Internal data error, data allocation fail
#define NAPI_ERR_ACE_ABILITY -102 // Failed to acquire ability object
#define NAPI_ERR_LONG_CALLBACK -103 // Failed to acquire long callack object
#define NAPI_ERR_LONG_CALLBACK -103 // Failed to acquire long callback object
#define NAPI_ERR_PARAM_INVALID -104 // Parameter is invalid
#define NAPI_ERR_ABILITY_TYPE_INVALID -105 // Type of ability is invalid
#define NAPI_ERR_ABILITY_CALL_INVALID -106 // Call the ability interface, the return value is wrong

10
services/abilitymgr/src/ability_manager_proxy.cpp
View File

@ -1,5 +1,5 @@
/*
* Copyright (c) 2021 Huawei Device Co., Ltd.
* Copyright (c) 2021-2022 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
@ -1619,7 +1619,7 @@ void AbilityManagerProxy::GetSystemMemoryAttr(AppExecFwk::SystemMemoryAttr &memo
MessageOption option;
if (!WriteInterfaceToken(data)) {
HILOG_ERROR("WriteInterfaceToken faild");
HILOG_ERROR("WriteInterfaceToken failed");
return;
}
@ -1631,7 +1631,7 @@ void AbilityManagerProxy::GetSystemMemoryAttr(AppExecFwk::SystemMemoryAttr &memo
std::shared_ptr<AppExecFwk::SystemMemoryAttr> remoteRetsult(reply.ReadParcelable<AppExecFwk::SystemMemoryAttr>());
if (remoteRetsult == nullptr) {
HILOG_ERROR("recv SystemMemoryAttr faild");
HILOG_ERROR("recv SystemMemoryAttr failed");
return;
}
@ -2252,7 +2252,7 @@ int AbilityManagerProxy::StartSyncRemoteMissions(const std::string& devId, bool
MessageOption option;
if (!WriteInterfaceToken(data)) {
HILOG_ERROR("WriteInterfaceToken faild");
HILOG_ERROR("WriteInterfaceToken failed");
return ERR_INVALID_VALUE;
}
if (!data.WriteString(devId)) {
@ -2286,7 +2286,7 @@ int32_t AbilityManagerProxy::StopSyncRemoteMissions(const std::string& devId)
MessageOption option;
if (!WriteInterfaceToken(data)) {
HILOG_ERROR("WriteInterfaceToken faild");
HILOG_ERROR("WriteInterfaceToken failed");
return ERR_INVALID_VALUE;
}
if (!data.WriteString(devId)) {

2
services/appmgr/test/unittest/ams_app_life_cycle_test/ams_app_life_cycle_test.cpp
View File

@ -1131,7 +1131,7 @@ HWTEST_F(AmsAppLifeCycleTest, Schedule_045, TestSize.Level1)
* Function: AppLifeCycle
* SubFunction: Schedule
* FunctionPoints: Terminate ability
* CaseDescription: Terminate ability when multiple abilities is backgroung and app is suspended.
* CaseDescription: Terminate ability when multiple abilities is background and app is suspended.
*/
HWTEST_F(AmsAppLifeCycleTest, Schedule_046, TestSize.Level1)
{

4
services/formmgr/src/form_task_mgr.cpp
View File

@ -1,5 +1,5 @@
/*
* Copyright (c) 2021 Huawei Device Co., Ltd.
* Copyright (c) 2021-2022 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
@ -154,7 +154,7 @@ void FormTaskMgr::PostUpdateTaskToHost(const int64_t formId, const FormRecord &r
* @param remoteObject Form provider proxx object.
*/
/**
* @brief Handel form host died(task).
* @brief Handle form host died(task).
* @param remoteHost Form host proxy object.
*/
void FormTaskMgr::PostHostDiedTask(const sptr<IRemoteObject> &remoteHost)

18
services/formmgr/test/unittest/fms_form_sys_event_receiver_test/fms_form_sys_event_receiver_test.cpp
View File

@ -1,5 +1,5 @@
/*
* Copyright (c) 2021 Huawei Device Co., Ltd.
* Copyright (c) 2021-2022 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
@ -161,7 +161,7 @@ void FmsFormSysEventReceiverTest::ClearFormRecord(int64_t formId)
/*
* Feature: FormMgrService
* Function: FormMgr
* SubFunction: OnReceiveEvent Functionss
* SubFunction: OnReceiveEvent Functions
* FunctionPoints: FormMgr OnReceiveEvent interface
* EnvConditions: Mobile that can run ohos test framework
* CaseDescription: Verify if HandleProviderRemoved works.
@ -209,7 +209,7 @@ HWTEST_F(FmsFormSysEventReceiverTest, OnReceiveEvent_001, TestSize.Level0)
/*
* Feature: FormMgrService
* Function: FormMgr
* SubFunction: OnReceiveEvent Functionss
* SubFunction: OnReceiveEvent Functions
* FunctionPoints: FormMgr OnReceiveEvent interface
* EnvConditions: Mobile that can run ohos test framework
* CaseDescription: Verify if HandleBundleDataCleared works.
@ -241,7 +241,7 @@ HWTEST_F(FmsFormSysEventReceiverTest, OnReceiveEvent_002, TestSize.Level0)
/*
* Feature: FormMgrService
* Function: FormMgr
* SubFunction: OnReceiveEvent Functionss
* SubFunction: OnReceiveEvent Functions
* FunctionPoints: FormMgr OnReceiveEvent interface
* EnvConditions: Mobile that can run ohos test framework
* CaseDescription: Verify if HandleBundleDataCleared works.
@ -277,7 +277,7 @@ HWTEST_F(FmsFormSysEventReceiverTest, OnReceiveEvent_003, TestSize.Level0)
/*
* Feature: FormMgrService
* Function: FormMgr
* SubFunction: OnReceiveEvent Functionss
* SubFunction: OnReceiveEvent Functions
* FunctionPoints: FormMgr OnReceiveEvent interface
* EnvConditions: Mobile that can run ohos test framework
* CaseDescription: Verify if HandleBundleDataCleared works.
@ -303,7 +303,7 @@ HWTEST_F(FmsFormSysEventReceiverTest, OnReceiveEvent_004, TestSize.Level0)
/*
* Feature: FormMgrService
* Function: FormMgr
* SubFunction: OnReceiveEvent Functionss
* SubFunction: OnReceiveEvent Functions
* FunctionPoints: FormMgr OnReceiveEvent interface
* EnvConditions: Mobile that can run ohos test framework
* CaseDescription: Verify if HandleBundleDataCleared works.
@ -330,7 +330,7 @@ HWTEST_F(FmsFormSysEventReceiverTest, OnReceiveEvent_005, TestSize.Level0)
/*
* Feature: FormMgrService
* Function: FormMgr
* SubFunction: OnReceiveEvent Functionss
* SubFunction: OnReceiveEvent Functions
* FunctionPoints: FormMgr OnReceiveEvent interface
* EnvConditions: Mobile that can run ohos test framework
* CaseDescription: Verify if HandleBundleDataCleared works.
@ -382,7 +382,7 @@ HWTEST_F(FmsFormSysEventReceiverTest, OnReceiveEvent_006, TestSize.Level0)
/*
* Feature: FormMgrService
* Function: FormMgr
* SubFunction: OnReceiveEvent Functionss
* SubFunction: OnReceiveEvent Functions
* FunctionPoints: FormMgr OnReceiveEvent interface
* EnvConditions: Mobile that can run ohos test framework
* CaseDescription: Verify if HandleProviderUpdated works.
@ -417,7 +417,7 @@ HWTEST_F(FmsFormSysEventReceiverTest, OnReceiveEvent_007, TestSize.Level0)
/*
* Feature: FormMgrService
* Function: FormMgr
* SubFunction: OnReceiveEvent Functionss
* SubFunction: OnReceiveEvent Functions
* FunctionPoints: FormMgr OnReceiveEvent interface
* EnvConditions: Mobile that can run ohos test framework
* CaseDescription: Verify if HandleProviderUpdated works.

14
services/test/moduletest/common/ams/ipc_ams_mgr_test/ams_ipc_ams_mgr_module_test.cpp
View File

@ -1,5 +1,5 @@
/*
* Copyright (c) 2021 Huawei Device Co., Ltd.
* Copyright (c) 2021-2022 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
@ -136,7 +136,7 @@ std::shared_ptr<AMSEventHandler> AmsIpcAmsmgrModuleTest::GetAmsEventHandler()
* SubFunction: AmsmgrIPCInterface
* FunctionPoints: test terminateAbility API,then check the function whether is good or not
* EnvConditions: system running normally
* CaseDescription: excute terminateAbility API 1000 times
* CaseDescription: execute terminateAbility API 1000 times
*/
HWTEST_F(AmsIpcAmsmgrModuleTest, ExcuteAmsmgrIPCInterface_002, TestSize.Level3)
{
@ -176,7 +176,7 @@ HWTEST_F(AmsIpcAmsmgrModuleTest, ExcuteAmsmgrIPCInterface_002, TestSize.Level3)
* SubFunction: AmsmgrIPCInterface
* FunctionPoints: test updateAbilityState API,then check the function whether is good or not
* EnvConditions: system running normally
* CaseDescription: excute updateAbilityState API 1000 times
* CaseDescription: execute updateAbilityState API 1000 times
*/
HWTEST_F(AmsIpcAmsmgrModuleTest, ExcuteAmsmgrIPCInterface_003, TestSize.Level3)
{
@ -218,7 +218,7 @@ HWTEST_F(AmsIpcAmsmgrModuleTest, ExcuteAmsmgrIPCInterface_003, TestSize.Level3)
* SubFunction: AmsmgrIPCInterface
* FunctionPoints: test registerappstatecallback API,then check the function whether is good or not
* EnvConditions: system running normally
* CaseDescription: excute registerappstatecallback API 1000 times
* CaseDescription: execute registerappstatecallback API 1000 times
*/
HWTEST_F(AmsIpcAmsmgrModuleTest, ExcuteAmsmgrIPCInterface_004, TestSize.Level3)
{
@ -258,7 +258,7 @@ HWTEST_F(AmsIpcAmsmgrModuleTest, ExcuteAmsmgrIPCInterface_004, TestSize.Level3)
* SubFunction: AmsmgrIPCInterface
* FunctionPoints: test AbilityBehaviorAnalysis API,then check the function whether is good or not
* EnvConditions: system running normally
* CaseDescription: excute AbilityBehaviorAnalysis API 1000 times
* CaseDescription: execute AbilityBehaviorAnalysis API 1000 times
*/
HWTEST_F(AmsIpcAmsmgrModuleTest, ExcuteAmsmgrIPCInterface_005, TestSize.Level3)
{
@ -302,7 +302,7 @@ HWTEST_F(AmsIpcAmsmgrModuleTest, ExcuteAmsmgrIPCInterface_005, TestSize.Level3)
* SubFunction: AmsmgrIPCInterface
* FunctionPoints: test KillApplication API,then check the function whether is good or not
* EnvConditions: system running normally
* CaseDescription: excute KillApplication API 1000 times
* CaseDescription: execute KillApplication API 1000 times
*/
HWTEST_F(AmsIpcAmsmgrModuleTest, ExcuteAmsmgrIPCInterface_006, TestSize.Level3)
{
@ -342,7 +342,7 @@ HWTEST_F(AmsIpcAmsmgrModuleTest, ExcuteAmsmgrIPCInterface_006, TestSize.Level3)
* SubFunction: AmsmgrIPCInterface
* FunctionPoints: test KillProcessByAbilityToken API,then check the function whether is good or not
* EnvConditions: system running normally
* CaseDescription: excute KillProcessByAbilityToken API 1000 times
* CaseDescription: execute KillProcessByAbilityToken API 1000 times
*/
HWTEST_F(AmsIpcAmsmgrModuleTest, ExcuteAmsmgrIPCInterface_007, TestSize.Level3)
{

26
services/test/moduletest/common/ams/ipc_app_scheduler_test/ams_ipc_app_scheduler_module_test.cpp
View File

@ -1,5 +1,5 @@
/*
* Copyright (c) 2021 Huawei Device Co., Ltd.
* Copyright (c) 2021-2022 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
@ -66,7 +66,7 @@ void AmsIpcAppSchedulerModuleTest::TearDown()
* SubFunction: IApplicationScheduler
* FunctionPoints: test ScheduleForegroundApplication API,then check the function whether is good or not
* EnvConditions: system running normally
* CaseDescription: excute ScheduleForegroundApplication API 10000 times
* CaseDescription: execute ScheduleForegroundApplication API 10000 times
*/
HWTEST_F(AmsIpcAppSchedulerModuleTest, ExcuteApplicationIPCInterface_001, TestSize.Level3)
{
@ -88,7 +88,7 @@ HWTEST_F(AmsIpcAppSchedulerModuleTest, ExcuteApplicationIPCInterface_001, TestSi
* SubFunction: IApplicationScheduler
* FunctionPoints: test ScheduleBackgroundApplication API,then check the function whether is good or not
* EnvConditions: system running normally
* CaseDescription: excute ScheduleBackgroundApplication API 10000 times
* CaseDescription: execute ScheduleBackgroundApplication API 10000 times
*/
HWTEST_F(AmsIpcAppSchedulerModuleTest, ExcuteApplicationIPCInterface_002, TestSize.Level3)
{
@ -110,7 +110,7 @@ HWTEST_F(AmsIpcAppSchedulerModuleTest, ExcuteApplicationIPCInterface_002, TestSi
* SubFunction: IApplicationScheduler
* FunctionPoints: test ScheduleTerminateApplication API,then check the function whether is good or not
* EnvConditions: system running normally
* CaseDescription: excute ScheduleTerminateApplication API 10000 times
* CaseDescription: execute ScheduleTerminateApplication API 10000 times
*/
HWTEST_F(AmsIpcAppSchedulerModuleTest, ExcuteApplicationIPCInterface_003, TestSize.Level3)
{
@ -132,7 +132,7 @@ HWTEST_F(AmsIpcAppSchedulerModuleTest, ExcuteApplicationIPCInterface_003, TestSi
* SubFunction: IApplicationScheduler
* FunctionPoints: test ScheduleTrimMemory API,then check the function whether is good or not
* EnvConditions: system running normally
* CaseDescription: excute ScheduleTrimMemory API 10000 times
* CaseDescription: execute ScheduleTrimMemory API 10000 times
*/
HWTEST_F(AmsIpcAppSchedulerModuleTest, ExcuteApplicationIPCInterface_004, TestSize.Level3)
{
@ -147,7 +147,7 @@ HWTEST_F(AmsIpcAppSchedulerModuleTest, ExcuteApplicationIPCInterface_004, TestSi
client->ScheduleShrinkMemory(level);
mockApplication->Wait();
int getLevel = mockApplication->GetShrinkLevel();
EXPECT_EQ(getLevel, level) << "excute fail, index is " << i;
EXPECT_EQ(getLevel, level) << "execute fail, index is " << i;
}
}
@ -157,7 +157,7 @@ HWTEST_F(AmsIpcAppSchedulerModuleTest, ExcuteApplicationIPCInterface_004, TestSi
* SubFunction: IApplicationScheduler
* FunctionPoints: test scheduleLowMemory API,then check the function whether is good or not
* EnvConditions: system running normally
* CaseDescription: excute LowMemoryWarning API 10000 times
* CaseDescription: execute LowMemoryWarning API 10000 times
*/
HWTEST_F(AmsIpcAppSchedulerModuleTest, ExcuteApplicationIPCInterface_005, TestSize.Level3)
{
@ -179,7 +179,7 @@ HWTEST_F(AmsIpcAppSchedulerModuleTest, ExcuteApplicationIPCInterface_005, TestSi
* SubFunction: IApplicationScheduler
* FunctionPoints: test scheduleProfileChanged API,then check the function whether is good or not
* EnvConditions: system running normally
* CaseDescription: excute scheduleProfileChanged API 10000 times
* CaseDescription: execute scheduleProfileChanged API 10000 times
*/
HWTEST_F(AmsIpcAppSchedulerModuleTest, ExcuteApplicationIPCInterface_006, TestSize.Level3)
{
@ -196,7 +196,7 @@ HWTEST_F(AmsIpcAppSchedulerModuleTest, ExcuteApplicationIPCInterface_006, TestSi
client->ScheduleProfileChanged(profile);
mockApplication->Wait();
bool result = mockApplication->CompareProfile(profile);
EXPECT_EQ(result, true) << "excute fail, index is " << i;
EXPECT_EQ(result, true) << "execute fail, index is " << i;
}
}
@ -206,7 +206,7 @@ HWTEST_F(AmsIpcAppSchedulerModuleTest, ExcuteApplicationIPCInterface_006, TestSi
* SubFunction: IApplicationScheduler
* FunctionPoints: test ScheduleLaunchApplication API,then check the function whether is good or not
* EnvConditions: system running normally
* CaseDescription: excute ScheduleLaunchApplication API 10000 times
* CaseDescription: execute ScheduleLaunchApplication API 10000 times
*/
HWTEST_F(AmsIpcAppSchedulerModuleTest, ExcuteApplicationIPCInterface_008, TestSize.Level3)
{
@ -235,7 +235,7 @@ HWTEST_F(AmsIpcAppSchedulerModuleTest, ExcuteApplicationIPCInterface_008, TestSi
mockApplication->Wait();
bool isEqual = mockApplication->CompareAppLaunchData(launchData);
EXPECT_EQ(true, isEqual) << "excute fail, index is " << i;
EXPECT_EQ(true, isEqual) << "execute fail, index is " << i;
}
}
@ -245,7 +245,7 @@ HWTEST_F(AmsIpcAppSchedulerModuleTest, ExcuteApplicationIPCInterface_008, TestSi
* SubFunction: IApplicationScheduler
* FunctionPoints: test ScheduleCleanAbility API,then check the function whether is good or not
* EnvConditions: system running normally
* CaseDescription: excute ScheduleCleanAbility API 10000 times
* CaseDescription: execute ScheduleCleanAbility API 10000 times
*/
HWTEST_F(AmsIpcAppSchedulerModuleTest, ExcuteApplicationIPCInterface_009, TestSize.Level3)
{
@ -269,7 +269,7 @@ HWTEST_F(AmsIpcAppSchedulerModuleTest, ExcuteApplicationIPCInterface_009, TestSi
* SubFunction: IApplicationScheduler
* FunctionPoints: test ScheduleConfigurationUpdated API,then check the function whether is good or not
* EnvConditions: system running normally
* CaseDescription: excute ScheduleConfigurationUpdated API 10000 times
* CaseDescription: execute ScheduleConfigurationUpdated API 10000 times
*/
HWTEST_F(AmsIpcAppSchedulerModuleTest, ExcuteApplicationIPCInterface_010, TestSize.Level3)
{

10
test/systemtest/common/ams/ams_kit_test/acts_ams_kit_processinfo_test.cpp
View File

@ -1,5 +1,5 @@
/*
* Copyright (c) 2021 Huawei Device Co., Ltd.
* Copyright (c) 2021-2022 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
@ -806,7 +806,7 @@ HWTEST_F(ActsAmsKitProcessInfoTest, AMS_Page_ProcessInfo_2600, Function | Medium
/**
* @tc.number : AMS_Page_ProcessInfo_2700
* @tc.name : ProcessInfo_String_int
* @tc.desc : use the constructor with parameters (PID is mininum, processname is normal string),
* @tc.desc : use the constructor with parameters (PID is minimum, processname is normal string),
* judge whether PID and processname are the same as the parameters
*/
HWTEST_F(ActsAmsKitProcessInfoTest, AMS_Page_ProcessInfo_2700, Function | MediumTest | Level1)
@ -831,7 +831,7 @@ HWTEST_F(ActsAmsKitProcessInfoTest, AMS_Page_ProcessInfo_2700, Function | Medium
/**
* @tc.number : AMS_Page_ProcessInfo_2800
* @tc.name : ProcessInfo_String_int
* @tc.desc : use the constructor with parameters (PID is maxinum, processname is normal string),
* @tc.desc : use the constructor with parameters (PID is maximum, processname is normal string),
* judge whether PID and processname are the same as the parameters
*/
HWTEST_F(ActsAmsKitProcessInfoTest, AMS_Page_ProcessInfo_2800, Function | MediumTest | Level1)
@ -881,7 +881,7 @@ HWTEST_F(ActsAmsKitProcessInfoTest, AMS_Page_ProcessInfo_2900, Function | Medium
/**
* @tc.number : AMS_Page_ProcessInfo_3000
* @tc.name : ProcessInfo_String_int
* @tc.desc : use the constructor with parameters (PID is mininum, processname is special string),
* @tc.desc : use the constructor with parameters (PID is minimum, processname is special string),
* judge whether PID and processname are the same as the parameters
*/
HWTEST_F(ActsAmsKitProcessInfoTest, AMS_Page_ProcessInfo_3000, Function | MediumTest | Level1)
@ -906,7 +906,7 @@ HWTEST_F(ActsAmsKitProcessInfoTest, AMS_Page_ProcessInfo_3000, Function | Medium
/**
* @tc.number : AMS_Page_ProcessInfo_3100
* @tc.name : ProcessInfo_String_int
* @tc.desc : use the constructor with parameters (PID is maxinum, processname is special string),
* @tc.desc : use the constructor with parameters (PID is maximum, processname is special string),
* judge whether PID and processname are the same as the parameters
*/
HWTEST_F(ActsAmsKitProcessInfoTest, AMS_Page_ProcessInfo_3100, Function | MediumTest | Level1)

10
tools/aa/src/test_observer_proxy.cpp
View File

@ -1,5 +1,5 @@
/*
* Copyright (c) 2021 Huawei Device Co., Ltd.
* Copyright (c) 2021-2022 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
@ -25,7 +25,7 @@ TestObserverProxy::TestObserverProxy(const sptr<IRemoteObject> &object) : IRemot
TestObserverProxy::~TestObserverProxy()
{
HILOG_INFO("test observer proxy is destoryed");
HILOG_INFO("test observer proxy is destroyed");
}
void TestObserverProxy::TestStatus(const std::string &msg, const int &resultCode)
@ -42,7 +42,7 @@ void TestObserverProxy::TestStatus(const std::string &msg, const int &resultCode
sptr<IRemoteObject> remote = Remote();
if (remote == nullptr) {
HILOG_ERROR("Failed to send cmd to service due to remote objetc is null");
HILOG_ERROR("Failed to send cmd to service due to remote object is null");
return;
}
@ -78,7 +78,7 @@ void TestObserverProxy::TestFinished(const std::string &msg, const int &resultCo
sptr<IRemoteObject> remote = Remote();
if (remote == nullptr) {
HILOG_ERROR("Failed to send cmd to service due to remote objetc is null");
HILOG_ERROR("Failed to send cmd to service due to remote object is null");
return;
}
@ -116,7 +116,7 @@ ShellCommandResult TestObserverProxy::ExecuteShellCommand(
sptr<IRemoteObject> remote = Remote();
if (remote == nullptr) {
HILOG_ERROR("Failed to send cmd to service due to remote objetc is null");
HILOG_ERROR("Failed to send cmd to service due to remote object is null");
return result;
}