From bf8a06724ab82f00a9d3d0610509d7c7b1bc8683 Mon Sep 17 00:00:00 2001 From: Mupceet Date: Tue, 1 Nov 2022 10:44:51 +0800 Subject: [PATCH] update Signed-off-by: Mupceet --- services/aams/src/accessibility_account_data.cpp | 6 ++++-- services/aams/src/accessible_ability_manager_service.cpp | 1 + 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/services/aams/src/accessibility_account_data.cpp b/services/aams/src/accessibility_account_data.cpp index 71f943b5d..2f54a9d84 100644 --- a/services/aams/src/accessibility_account_data.cpp +++ b/services/aams/src/accessibility_account_data.cpp @@ -50,6 +50,8 @@ uint32_t AccessibilityAccountData::GetAccessibilityState() HILOG_INFO(); uint32_t state = 0; if (!connectedA11yAbilities_.empty() || !connectingA11yAbilities_.empty()) { + HILOG_DEBUG("connectingA11yAbilities[%{public}zu] connectedA11yAbilities[%{public}zu]", + connectingA11yAbilities_.size(), connectedA11yAbilities_.size()); state |= STATE_ACCESSIBILITY_ENABLED; if (!config_->GetEnabledState()) { config_->SetEnabled(true); @@ -281,7 +283,7 @@ void AccessibilityAccountData::RemoveInstalledAbility(const std::string &bundleN for (auto it = installedAbilities_.begin(); it != installedAbilities_.end();) { if (it->GetPackageName() == bundleName) { HILOG_DEBUG("Removed %{public}s from InstalledAbility: ", bundleName.c_str()); - installedAbilities_.erase(it); + it = installedAbilities_.erase(it); } else { ++it; } @@ -328,7 +330,7 @@ const sptr AccessibilityAccountData::GetAccessibi const std::map> AccessibilityAccountData::GetConnectedA11yAbilities() { - HILOG_DEBUG("start."); + HILOG_DEBUG("connectedA11yAbilities size[%{public}zu]", connectedA11yAbilities_.size()); return connectedA11yAbilities_; } diff --git a/services/aams/src/accessible_ability_manager_service.cpp b/services/aams/src/accessible_ability_manager_service.cpp index 74ba8e6d9..78af0a3f3 100644 --- a/services/aams/src/accessible_ability_manager_service.cpp +++ b/services/aams/src/accessible_ability_manager_service.cpp @@ -772,6 +772,7 @@ RetError AccessibleAbilityManagerService::InnerDisableAbility(const std::string HILOG_ERROR("RemoveEnabledAbility failed"); return ret; } + accountData->RemoveConnectingA11yAbility(name); accountData->UpdateAbilities(); return RET_OK; }