From bc053fcd1a95c2fbd7fe4a162b990635c515a0c4 Mon Sep 17 00:00:00 2001
From: "zhangyafei.echo" <zhangyafei12@huawei.com>
Date: Sat, 13 Apr 2024 18:41:06 +0800
Subject: [PATCH] fix moveto foreground timeout. Sig:SIG_ApplicationFramework
 Feature or BugFix: Feature Binary Source: No

Signed-off-by: zhangyafei.echo <zhangyafei12@huawei.com>
Change-Id: Iab9278771398f2dd22709d9a3c439f4192d948f2
---
 .../include/ability_connect_manager.h         |  1 -
 .../src/ability_connect_manager.cpp           | 23 +++----------------
 2 files changed, 3 insertions(+), 21 deletions(-)

diff --git a/services/abilitymgr/include/ability_connect_manager.h b/services/abilitymgr/include/ability_connect_manager.h
index d0f0eec32de..b4f9f916d78 100644
--- a/services/abilitymgr/include/ability_connect_manager.h
+++ b/services/abilitymgr/include/ability_connect_manager.h
@@ -515,7 +515,6 @@ private:
     std::shared_ptr<AbilityRecord> GetExtensionFromServiceMapInner(const sptr<IRemoteObject> &token);
     std::shared_ptr<AbilityRecord> GetExtensionFromServiceMapInner(int32_t abilityRecordId);
     std::shared_ptr<AbilityRecord> GetExtensionFromTerminatingMapInner(const sptr<IRemoteObject> &token);
-    std::shared_ptr<AbilityRecord> GetAutoFillExtFromTerminatingMap(const sptr<IRemoteObject> &token);
     int TerminateAbilityInner(const sptr<IRemoteObject> &token);
     bool IsLauncher(std::shared_ptr<AbilityRecord> serviceExtension) const;
     void KillProcessesByUserId() const;
diff --git a/services/abilitymgr/src/ability_connect_manager.cpp b/services/abilitymgr/src/ability_connect_manager.cpp
index 9f751d77d82..3d00ed665d2 100644
--- a/services/abilitymgr/src/ability_connect_manager.cpp
+++ b/services/abilitymgr/src/ability_connect_manager.cpp
@@ -781,19 +781,6 @@ void AbilityConnectManager::OnAppStateChanged(const AppInfo &info)
     });
 }
 
-std::shared_ptr<AbilityRecord> AbilityConnectManager::GetAutoFillExtFromTerminatingMap(const sptr<IRemoteObject> &token)
-{
-    auto abilityRecord = GetExtensionFromTerminatingMapInner(token);
-    if (abilityRecord != nullptr) {
-        auto extensionAbilityType = abilityRecord->GetAbilityInfo().extensionAbilityType;
-        if (!(extensionAbilityType == AppExecFwk::ExtensionAbilityType::AUTO_FILL_PASSWORD ||
-            extensionAbilityType == AppExecFwk::ExtensionAbilityType::AUTO_FILL_SMART)) {
-            abilityRecord = nullptr;
-        }
-    }
-    return abilityRecord;
-}
-
 int AbilityConnectManager::AbilityTransitionDone(const sptr<IRemoteObject> &token, int state)
 {
     HITRACE_METER_NAME(HITRACE_TAG_ABILITY_MANAGER, __PRETTY_FUNCTION__);
@@ -801,13 +788,9 @@ int AbilityConnectManager::AbilityTransitionDone(const sptr<IRemoteObject> &toke
     int targetState = AbilityRecord::ConvertLifeCycleToAbilityState(static_cast<AbilityLifeCycleState>(state));
     std::string abilityState = AbilityRecord::ConvertAbilityState(static_cast<AbilityState>(targetState));
     std::shared_ptr<AbilityRecord> abilityRecord;
-    if (targetState == AbilityState::INACTIVE
-        || targetState == AbilityState::FOREGROUND) {
-        abilityRecord = GetExtensionFromServiceMapInner(token);
-        if (abilityRecord == nullptr) {
-            abilityRecord = GetAutoFillExtFromTerminatingMap(token);
-        }
-    } else if (targetState == AbilityState::BACKGROUND) {
+    if (targetState == AbilityState::INACTIVE ||
+        targetState == AbilityState::FOREGROUND ||
+        targetState == AbilityState::BACKGROUND) {
         abilityRecord = GetExtensionFromServiceMapInner(token);
         if (abilityRecord == nullptr) {
             abilityRecord = GetExtensionFromTerminatingMapInner(token);
-- 
Gitee