From 68fa8a99774938ae326676e4eb35ef41b1bc4755 Mon Sep 17 00:00:00 2001
From: mamingshuai <mamingshuai1@huawei.com>
Date: Wed, 7 Apr 2021 14:22:04 +0800
Subject: [PATCH 1/3] add issue and pr template

---
 .gitee/ISSUE_TEMPLATE.zh-CN.md        | 11 +++++++++++
 .gitee/PULL_REQUEST_TEMPLATE.zh-CN.md | 12 ++++++++++++
 2 files changed, 23 insertions(+)
 create mode 100644 .gitee/ISSUE_TEMPLATE.zh-CN.md
 create mode 100644 .gitee/PULL_REQUEST_TEMPLATE.zh-CN.md

diff --git a/.gitee/ISSUE_TEMPLATE.zh-CN.md b/.gitee/ISSUE_TEMPLATE.zh-CN.md
new file mode 100644
index 0000000..651e02c
--- /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 0000000..dd9a0f0
--- /dev/null
+++ b/.gitee/PULL_REQUEST_TEMPLATE.zh-CN.md
@@ -0,0 +1,12 @@
+### 相关的Issue
+    
+    
+### 原因（目的、解决的问题等）
+
+
+### 描述（做了什么，变更了什么）
+
+
+### 测试用例（新增、改动、可能影响的功能）
+    
+    
-- 
Gitee


From a1cda49a44d528633159058a2ace0f829049459c Mon Sep 17 00:00:00 2001
From: wangdengjia <wangdengjia@huawei.com>
Date: Thu, 20 May 2021 19:54:56 +0800
Subject: [PATCH 2/3] IssueNo:#I3S9OD Description:add ams log.h file
 Sig:startup Feature or Bugfix:Bugfix Binary Source:No

---
 services/abilitymgr_lite/include/util/abilityms_log.h | 2 --
 1 file changed, 2 deletions(-)

diff --git a/services/abilitymgr_lite/include/util/abilityms_log.h b/services/abilitymgr_lite/include/util/abilityms_log.h
index d16a590..159f298 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
-- 
Gitee


From 6f426ba3894f4a82e44f78a81c86de2cb423259e Mon Sep 17 00:00:00 2001
From: Zhaoyuan <z00466077@china.huawei.com>
Date: Mon, 28 Jun 2021 10:04:31 +0800
Subject: [PATCH 3/3] fix forcestopbundle life cycle

---
 services/abilitymgr_lite/src/ability_service.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/services/abilitymgr_lite/src/ability_service.cpp b/services/abilitymgr_lite/src/ability_service.cpp
index 4cd2f32..fdd7885 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;
 }
-- 
Gitee