diff --git a/.gitee/ISSUE_TEMPLATE.zh-CN.md b/.gitee/ISSUE_TEMPLATE.zh-CN.md new file mode 100644 index 0000000000000000000000000000000000000000..651e02cef6e623d3385eb4c83d633d73e141cd56 --- /dev/null +++ b/.gitee/ISSUE_TEMPLATE.zh-CN.md @@ -0,0 +1,11 @@ +### 该问题是怎么引起的? + + + +### 重现步骤 + + + +### 报错信息 + + diff --git a/.gitee/PULL_REQUEST_TEMPLATE.zh-CN.md b/.gitee/PULL_REQUEST_TEMPLATE.zh-CN.md new file mode 100644 index 0000000000000000000000000000000000000000..dd9a0f04c7616fc9722fc857dc6ed6d499b2c201 --- /dev/null +++ b/.gitee/PULL_REQUEST_TEMPLATE.zh-CN.md @@ -0,0 +1,12 @@ +### 相关的Issue + + +### 原因(目的、解决的问题等) + + +### 描述(做了什么,变更了什么) + + +### 测试用例(新增、改动、可能影响的功能) + + diff --git a/services/abilitymgr_lite/include/util/abilityms_log.h b/services/abilitymgr_lite/include/util/abilityms_log.h index d16a59056a9621329427c4f8f84cd3fb13849583..159f2982fb76de18334ea74d7e8eaf9053bb6137 100755 --- a/services/abilitymgr_lite/include/util/abilityms_log.h +++ b/services/abilitymgr_lite/include/util/abilityms_log.h @@ -16,9 +16,7 @@ #ifndef OHOS_LOGGING_H #define OHOS_LOGGING_H -#ifndef APP_PLATFORM_WATCHGT #include "log.h" -#endif namespace OHOS { #undef LOG_TAG diff --git a/services/abilitymgr_lite/src/ability_service.cpp b/services/abilitymgr_lite/src/ability_service.cpp index 4cd2f32a59320703c94d8d427f3ff89e88b4bef2..fdd7885e9103bba738d3df5fdfc2170fe47e5eb9 100755 --- a/services/abilitymgr_lite/src/ability_service.cpp +++ b/services/abilitymgr_lite/src/ability_service.cpp @@ -233,7 +233,7 @@ int32_t AbilityService::ForceStopBundle(uint16_t token) return PARAM_NULL_ERROR; } if (launcherRecord->GetState() != SCHEDULE_ACTIVE) { - return SchedulerLifecycleInner(LAUNCHER_TOKEN, STATE_ACTIVE); + return SchedulerLifecycle(LAUNCHER_TOKEN, STATE_ACTIVE); } return ERR_OK; }