From b08d95f56cdb12c29c275b8f0e275f137fe71601 Mon Sep 17 00:00:00 2001 From: zhanghuiyu Date: Mon, 10 Jul 2023 08:41:05 +0000 Subject: [PATCH 1/2] =?UTF-8?q?update=20services/aams/src/accessibility=5F?= =?UTF-8?q?account=5Fdata.cpp.=20=E8=BE=85=E5=8A=A9=E5=BA=94=E7=94=A8?= =?UTF-8?q?=E5=8D=B8=E8=BD=BD=E5=90=8E=E9=85=8D=E7=BD=AE=E6=B8=85=E7=A9=BA?= =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: zhanghuiyu --- services/aams/src/accessibility_account_data.cpp | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/services/aams/src/accessibility_account_data.cpp b/services/aams/src/accessibility_account_data.cpp index c62a20ea..fee7d504 100644 --- a/services/aams/src/accessibility_account_data.cpp +++ b/services/aams/src/accessibility_account_data.cpp @@ -269,6 +269,12 @@ void AccessibilityAccountData::RemoveInstalledAbility(const std::string &bundleN HILOG_DEBUG("Removed %{public}s from InstalledAbility: ", bundleName.c_str()); it = installedAbilities_.erase(it); } else { + std::string targetName = ""; + std::string name = GetConfig()->GetShortkeyTarget(); + if (it->GetName() == name) { + GetConfig()->SetShortkeyTarget(targetName); + GetConfig()->SetShortKeyState(false); + } ++it; } } -- Gitee From 4e174707f9b9975283a30549dc36d09b2f5c0d6c Mon Sep 17 00:00:00 2001 From: zhanghuiyu Date: Mon, 10 Jul 2023 10:29:01 +0000 Subject: [PATCH 2/2] update services/aams/src/accessibility_account_data.cpp. Signed-off-by: zhanghuiyu --- services/aams/src/accessibility_account_data.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/services/aams/src/accessibility_account_data.cpp b/services/aams/src/accessibility_account_data.cpp index fee7d504..81b3bac2 100644 --- a/services/aams/src/accessibility_account_data.cpp +++ b/services/aams/src/accessibility_account_data.cpp @@ -268,13 +268,13 @@ void AccessibilityAccountData::RemoveInstalledAbility(const std::string &bundleN if (it->GetPackageName() == bundleName) { HILOG_DEBUG("Removed %{public}s from InstalledAbility: ", bundleName.c_str()); it = installedAbilities_.erase(it); - } else { std::string targetName = ""; std::string name = GetConfig()->GetShortkeyTarget(); if (it->GetName() == name) { GetConfig()->SetShortkeyTarget(targetName); GetConfig()->SetShortKeyState(false); } + } else { ++it; } } -- Gitee