From b76697998debf16e0e6fb84e2cd639a4a803d9f4 Mon Sep 17 00:00:00 2001 From: csw_linux <2501267175@example.com> Date: Tue, 25 Jun 2024 19:02:37 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E5=8D=95=E5=8F=B7=EF=BC=9A#IA87UA=20?= =?UTF-8?q?=E6=8F=8F=E8=BF=B0=EF=BC=9A=E5=BC=80=E5=8F=91=E8=80=85=E6=89=8B?= =?UTF-8?q?=E6=9C=BAoricle=E7=9A=844.1=E7=89=88=E6=9C=AC=E8=81=94=E7=B3=BB?= =?UTF-8?q?=E4=BA=BA=E6=8B=A8=E6=89=93=E7=94=B5=E8=AF=9D=E7=9B=B8=E6=AF=94?= =?UTF-8?q?=E7=AB=9E=E5=93=81=E5=AD=98=E5=9C=A8=E5=8A=A3=E5=8C=96=EF=BC=8C?= =?UTF-8?q?=E5=88=86=E6=9E=90=E5=BE=97=E7=9F=A5=E8=8E=B7=E5=8F=96=E5=BF=AB?= =?UTF-8?q?=E7=85=A7=E7=9A=84=E7=BA=BF=E7=A8=8B=E9=98=BB=E5=A1=9E=E4=BA=86?= =?UTF-8?q?gettoken=E4=B8=BB=E7=BA=BF=E7=A8=8B=EF=BC=8C=E8=8E=B7=E5=8F=96?= =?UTF-8?q?=E5=BF=AB=E7=85=A7=E5=85=88=E4=BA=8E=E4=B8=BB=E7=BA=BF=E7=A8=8B?= =?UTF-8?q?=E6=8A=A2=E5=8D=A0=E4=BA=86=E5=90=8C=E4=B8=80=E6=8A=8A=E9=94=81?= =?UTF-8?q?=EF=BC=8C=E5=AF=BC=E8=87=B4=E6=AD=A4=E5=A4=84=E5=AD=98=E5=9C=A8?= =?UTF-8?q?=E4=B8=8D=E5=BA=94=E8=AF=A5=E7=9A=84=E5=8A=A3=E5=8C=96=20?= =?UTF-8?q?=E9=97=AE=E9=A2=98=E6=A0=B9=E5=9B=A0=EF=BC=9A=E9=94=81=E5=86=B2?= =?UTF-8?q?=E7=AA=81=20=E8=A7=A3=E5=86=B3=E6=96=B9=E6=A1=88=EF=BC=9A?= =?UTF-8?q?=E5=8E=BB=E9=94=81=20=E6=98=AF=E5=90=A6=E5=AE=8C=E6=88=90?= =?UTF-8?q?=E5=8F=98=E6=88=90=E8=A7=84=E8=8C=83=E8=87=AA=E6=A3=80=EF=BC=9A?= =?UTF-8?q?Y=20=E6=98=AF=E5=90=A6=E7=BC=96=E8=AF=91=E4=B8=94=E9=AA=8C?= =?UTF-8?q?=E8=AF=81=E9=80=9A=E8=BF=87=EF=BC=9AY=20=E5=BD=B1=E5=93=8D?= =?UTF-8?q?=E7=9A=84=E8=AE=BE=E5=A4=87=E4=B8=8E=E5=B9=B3=E5=8F=B0=E8=8C=83?= =?UTF-8?q?=E5=9B=B4=EF=BC=9A7885=E5=9B=A2=E9=98=9F=20=E5=9B=A2=E9=98=9F?= =?UTF-8?q?=EF=BC=9A=E9=B8=BF=E6=B9=96=E4=B8=87=E8=81=94?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- services/abilitymgr/src/mission_list_manager.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/services/abilitymgr/src/mission_list_manager.cpp b/services/abilitymgr/src/mission_list_manager.cpp index d8b1bf0be31..36faca58cf0 100644 --- a/services/abilitymgr/src/mission_list_manager.cpp +++ b/services/abilitymgr/src/mission_list_manager.cpp @@ -215,7 +215,7 @@ int MissionListManager::StartAbility(const std::shared_ptr &curre int MissionListManager::MinimizeAbility(const sptr &token, bool fromUser) { TAG_LOGI(AAFwkTag::ABILITYMGR, "fromUser:%{public}d.", fromUser); - std::lock_guard guard(managerLock_); + //std::lock_guard guard(managerLock_); // check if ability is in list to avoid user create fake token. CHECK_POINTER_AND_RETURN_LOG(GetAbilityRecordByTokenInner(token), INNER_ERR, "Minimize ability fail, ability is not in mission list."); -- Gitee From 226f2c75422fc842b4de2bb38cee84b8b961eed4 Mon Sep 17 00:00:00 2001 From: csw_linux <2501267175@example.com> Date: Wed, 26 Jun 2024 10:46:42 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E5=8D=95=E5=8F=B7=EF=BC=9AIA87UA=20?= =?UTF-8?q?=E6=8F=8F=E8=BF=B0=EF=BC=9A=E5=BC=80=E5=8F=91=E8=80=85=E6=89=8B?= =?UTF-8?q?=E6=9C=BAoricle=E7=9A=844.1=E7=89=88=E6=9C=AC=E8=81=94=E7=B3=BB?= =?UTF-8?q?=E4=BA=BA=E6=8B=A8=E6=89=93=E7=94=B5=E8=AF=9D=E7=9B=B8=E6=AF=94?= =?UTF-8?q?=E7=AB=9E=E5=93=81=E5=AD=98=E5=9C=A8=E5=8A=A3=E5=8C=96=EF=BC=8C?= =?UTF-8?q?=E5=88=86=E6=9E=90=E5=BE=97=E7=9F=A5=E8=8E=B7=E5=8F=96=E5=BF=AB?= =?UTF-8?q?=E7=85=A7=E7=9A=84=E7=BA=BF=E7=A8=8B=E9=98=BB=E5=A1=9E=E4=BA=86?= =?UTF-8?q?gettoken=E4=B8=BB=E7=BA=BF=E7=A8=8B=EF=BC=8C=E8=8E=B7=E5=8F=96?= =?UTF-8?q?=E5=BF=AB=E7=85=A7=E5=85=88=E4=BA=8E=E4=B8=BB=E7=BA=BF=E7=A8=8B?= =?UTF-8?q?=E6=8A=A2=E5=8D=A0=E4=BA=86=E5=90=8C=E4=B8=80=E6=8A=8A=E9=94=81?= =?UTF-8?q?=EF=BC=8C=E5=AF=BC=E8=87=B4=E6=AD=A4=E5=A4=84=E5=AD=98=E5=9C=A8?= =?UTF-8?q?=E4=B8=8D=E5=BA=94=E8=AF=A5=E7=9A=84=E5=8A=A3=E5=8C=96=20?= =?UTF-8?q?=E9=97=AE=E9=A2=98=E6=A0=B9=E5=9B=A0=EF=BC=9A=E8=8E=B7=E5=8F=96?= =?UTF-8?q?=E5=BF=AB=E7=85=A7=E6=B5=81=E7=A8=8B=E5=8A=A0=E4=BA=86=E4=B8=8D?= =?UTF-8?q?=E5=BF=85=E8=A6=81=E7=9A=84=E9=94=81=20=E8=A7=A3=E5=86=B3?= =?UTF-8?q?=E6=96=B9=E6=A1=88=EF=BC=9A=E5=8E=BB=E9=94=81=20=E6=98=AF?= =?UTF-8?q?=E5=90=A6=E5=AE=8C=E6=88=90=E5=8F=98=E6=88=90=E8=A7=84=E8=8C=83?= =?UTF-8?q?=E8=87=AA=E6=A3=80=EF=BC=9AY=20=E6=98=AF=E5=90=A6=E7=BC=96?= =?UTF-8?q?=E8=AF=91=E4=B8=94=E9=AA=8C=E8=AF=81=E9=80=9A=E8=BF=87=EF=BC=9A?= =?UTF-8?q?Y=20=E5=BD=B1=E5=93=8D=E7=9A=84=E8=AE=BE=E5=A4=87=E4=B8=8E?= =?UTF-8?q?=E5=B9=B3=E5=8F=B0=E8=8C=83=E5=9B=B4=EF=BC=9A7885=E6=89=8B?= =?UTF-8?q?=E6=9C=BA=E5=9B=A2=E9=98=9F=20=E5=9B=A2=E9=98=9F=EF=BC=9A?= =?UTF-8?q?=E9=B8=BF=E6=B9=96=E4=B8=87=E8=81=94?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- services/abilitymgr/src/mission_list_manager.cpp | 1 - 1 file changed, 1 deletion(-) diff --git a/services/abilitymgr/src/mission_list_manager.cpp b/services/abilitymgr/src/mission_list_manager.cpp index 36faca58cf0..83f5ae0b3b1 100644 --- a/services/abilitymgr/src/mission_list_manager.cpp +++ b/services/abilitymgr/src/mission_list_manager.cpp @@ -215,7 +215,6 @@ int MissionListManager::StartAbility(const std::shared_ptr &curre int MissionListManager::MinimizeAbility(const sptr &token, bool fromUser) { TAG_LOGI(AAFwkTag::ABILITYMGR, "fromUser:%{public}d.", fromUser); - //std::lock_guard guard(managerLock_); // check if ability is in list to avoid user create fake token. CHECK_POINTER_AND_RETURN_LOG(GetAbilityRecordByTokenInner(token), INNER_ERR, "Minimize ability fail, ability is not in mission list."); -- Gitee