From 0574c7bdf6fb769f2135f85896a3a6c48c0033a9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9B=BE=E9=94=A6=E5=B1=B1?= <791770396@qq.com> Date: Wed, 11 Sep 2024 10:50:05 +0000 Subject: [PATCH 1/5] update services/abilitymgr_lite/src/ability_connect_mission.cpp. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: 曾锦山 <791770396@qq.com> --- services/abilitymgr_lite/src/ability_connect_mission.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/services/abilitymgr_lite/src/ability_connect_mission.cpp b/services/abilitymgr_lite/src/ability_connect_mission.cpp index 076a698..f9e5018 100644 --- a/services/abilitymgr_lite/src/ability_connect_mission.cpp +++ b/services/abilitymgr_lite/src/ability_connect_mission.cpp @@ -21,9 +21,9 @@ namespace OHOS { -namespace { - constexpr static uint16_t SERVICE_RECORDS_LIST_CAPACITY = 10240; -} +namespace{ +constexpr static uint16_t SERVICE_RECORDS_LIST_CAPACITY = 10240; + } AbilityConnectMission::~AbilityConnectMission() { -- Gitee From e684b54b2738c055f8843c7c3da6d3e9d5a1c847 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9B=BE=E9=94=A6=E5=B1=B1?= <791770396@qq.com> Date: Thu, 12 Sep 2024 08:47:30 +0000 Subject: [PATCH 2/5] update services/abilitymgr_lite/src/ability_connect_mission.cpp. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: 曾锦山 <791770396@qq.com> --- services/abilitymgr_lite/src/ability_connect_mission.cpp | 1 + 1 file changed, 1 insertion(+) diff --git a/services/abilitymgr_lite/src/ability_connect_mission.cpp b/services/abilitymgr_lite/src/ability_connect_mission.cpp index f9e5018..7dc3ec7 100644 --- a/services/abilitymgr_lite/src/ability_connect_mission.cpp +++ b/services/abilitymgr_lite/src/ability_connect_mission.cpp @@ -55,6 +55,7 @@ PageAbilityRecord *AbilityConnectMission::FindServiceRecord(uint64_t token) cons PageAbilityRecord *AbilityConnectMission::FindServiceRecord(const char *bundleName, const char *abilityName) const { + int android,b; CHECK_NULLPTR_RETURN_PTR(bundleName, "AbilityConnectMission", "invalid argument"); CHECK_NULLPTR_RETURN_PTR(abilityName, "AbilityConnectMission", "invalid argument"); for (const auto record : serviceRecords_) { -- Gitee From f916b1a7d49c726d27b20a72763ca70d8bcfad7d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9B=BE=E9=94=A6=E5=B1=B1?= <791770396@qq.com> Date: Fri, 13 Sep 2024 03:16:15 +0000 Subject: [PATCH 3/5] update services/abilitymgr_lite/src/ability_connect_mission.cpp. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: 曾锦山 <791770396@qq.com> --- services/abilitymgr_lite/src/ability_connect_mission.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/services/abilitymgr_lite/src/ability_connect_mission.cpp b/services/abilitymgr_lite/src/ability_connect_mission.cpp index 7dc3ec7..33cba2e 100644 --- a/services/abilitymgr_lite/src/ability_connect_mission.cpp +++ b/services/abilitymgr_lite/src/ability_connect_mission.cpp @@ -27,9 +27,9 @@ constexpr static uint16_t SERVICE_RECORDS_LIST_CAPACITY = 10240; AbilityConnectMission::~AbilityConnectMission() { - for (auto iterator = serviceRecords_.begin(); iterator != serviceRecords_.end(); ++iterator) { - auto record = *iterator; - delete record; + for (auto iterator = serviceRecords_.begin();iterator != serviceRecords_.end(); ++iterator) { +auto record = *iterator; +delete record; } serviceRecords_.clear(); PRINTD("AbilityConnectMission", "Constructor"); -- Gitee From ec6f3f7577ccc3ff20358015572be476e2ddc053 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9B=BE=E9=94=A6=E5=B1=B1?= <791770396@qq.com> Date: Fri, 13 Sep 2024 05:51:04 +0000 Subject: [PATCH 4/5] update services/abilitymgr_lite/src/ability_connect_mission.cpp. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: 曾锦山 <791770396@qq.com> --- services/abilitymgr_lite/src/ability_connect_mission.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/services/abilitymgr_lite/src/ability_connect_mission.cpp b/services/abilitymgr_lite/src/ability_connect_mission.cpp index 33cba2e..0e8ba30 100644 --- a/services/abilitymgr_lite/src/ability_connect_mission.cpp +++ b/services/abilitymgr_lite/src/ability_connect_mission.cpp @@ -31,8 +31,8 @@ AbilityConnectMission::~AbilityConnectMission() auto record = *iterator; delete record; } - serviceRecords_.clear(); - PRINTD("AbilityConnectMission", "Constructor"); +serviceRecords_.clear(); +PRINTD("AbilityConnectMission", "Constructor"); } void AbilityConnectMission::PushServiceRecord(PageAbilityRecord &abilityRecord) -- Gitee From 3f2657d7ed068bc5eca0fdb5454a4dd72ea55b7b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9B=BE=E9=94=A6=E5=B1=B1?= <791770396@qq.com> Date: Sun, 15 Sep 2024 08:40:10 +0000 Subject: [PATCH 5/5] update interfaces/kits/ability_lite/ability.h. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: 曾锦山 <791770396@qq.com> --- interfaces/kits/ability_lite/ability.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/interfaces/kits/ability_lite/ability.h b/interfaces/kits/ability_lite/ability.h index d87c9ba..13aaf04 100644 --- a/interfaces/kits/ability_lite/ability.h +++ b/interfaces/kits/ability_lite/ability.h @@ -75,7 +75,7 @@ class AbilityWindow; class Ability : public AbilityContext { public: Ability() = default; - virtual ~Ability() = default; +virtual ~Ability() = default; /** * @brief Called when this ability is started. You must override this function if you want to perform some @@ -92,7 +92,7 @@ public: * STATE_INACTIVE is an instantaneous state. The ability in this state may be visible but does not have * focus. You can override this function to implement your own processing logic. */ - virtual void OnInactive(); + virtual void OnInactive(); /** * @brief Called when this ability enters the STATE_ACTIVE state. -- Gitee