From 1898339ce9d15aa58b80f93672b913c164e89fbb Mon Sep 17 00:00:00 2001
From: hhd227 <huanghaodong9@h-partners.com>
Date: Wed, 17 Jun 2026 16:17:15 +0800
Subject: [PATCH 1/3] =?UTF-8?q?update:=20=E6=9B=B4=E6=96=B0=E6=96=87?=
 =?UTF-8?q?=E4=BB=B6=20ability=5Fmanager=5Fservice.cpp?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: hhd227 <huanghaodong9@h-partners.com>
---
 services/abilitymgr/src/ability_manager_service.cpp | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/services/abilitymgr/src/ability_manager_service.cpp b/services/abilitymgr/src/ability_manager_service.cpp
index 05ff19770f..36f1987ee2 100644
--- a/services/abilitymgr/src/ability_manager_service.cpp
+++ b/services/abilitymgr/src/ability_manager_service.cpp
@@ -4051,8 +4051,7 @@ int32_t AbilityManagerService::StartExtensionAbility(const Want &want, const spt
         }
     }
     InsightIntentExecuteParam::RemoveInsightIntent(const_cast<Want &>(want));
-    if (extensionType == AppExecFwk::ExtensionAbilityType::VPN ||
-        extensionType == AppExecFwk::ExtensionAbilityType::UI_SERVICE ||
+    if (extensionType == AppExecFwk::ExtensionAbilityType::UI_SERVICE ||
         extensionType == AppExecFwk::ExtensionAbilityType::APP_SERVICE) {
         return StartExtensionAbilityInner(want, callerToken, userId, extensionType, false);
     }

From 05a956b6696a8f7381b180ebd91100c348cccd7c Mon Sep 17 00:00:00 2001
From: hhd227 <huanghaodong9@h-partners.com>
Date: Wed, 17 Jun 2026 16:24:21 +0800
Subject: [PATCH 2/3] =?UTF-8?q?update:=20=E6=9B=B4=E6=96=B0=E6=96=87?=
 =?UTF-8?q?=E4=BB=B6=20ability=5Fmanager=5Fservice.cpp?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: hhd227 <huanghaodong9@h-partners.com>
---
 services/abilitymgr/src/ability_manager_service.cpp | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/services/abilitymgr/src/ability_manager_service.cpp b/services/abilitymgr/src/ability_manager_service.cpp
index 36f1987ee2..9ac146272a 100644
--- a/services/abilitymgr/src/ability_manager_service.cpp
+++ b/services/abilitymgr/src/ability_manager_service.cpp
@@ -4062,9 +4062,6 @@ int AbilityManagerService::ImplicitStartExtensionAbility(const Want &want, const
     int32_t userId, AppExecFwk::ExtensionAbilityType extensionType)
 {
     InsightIntentExecuteParam::RemoveInsightIntent(const_cast<Want &>(want));
-    if (extensionType == AppExecFwk::ExtensionAbilityType::VPN) {
-        return StartExtensionAbilityInner(want, callerToken, userId, extensionType, false, true);
-    }
     return StartExtensionAbilityInner(want, callerToken, userId, extensionType, true, true);
 }
 
@@ -4922,8 +4919,7 @@ int AbilityManagerService::StopExtensionAbility(const Want &want, const sptr<IRe
     TAG_LOGI(AAFwkTag::SERVICE_EXT,
         "bundlename:%{public}s, ability:%{public}s, userId:%{public}d",
         want.GetBundle().c_str(), want.GetElement().GetAbilityName().c_str(), userId);
-    if (extensionType != AppExecFwk::ExtensionAbilityType::VPN &&
-        extensionType != AppExecFwk::ExtensionAbilityType::APP_SERVICE) {
+     if (extensionType != AppExecFwk::ExtensionAbilityType::APP_SERVICE) {
         CHECK_CALLER_IS_SYSTEM_APP;
     }
     EventInfo eventInfo = BuildEventInfo(want, userId);

From 55fdf6d498e6e5115e03bbb1aab9b3bcc266a0cd Mon Sep 17 00:00:00 2001
From: hhd227 <huanghaodong9@h-partners.com>
Date: Mon, 22 Jun 2026 14:57:29 +0800
Subject: [PATCH 3/3] =?UTF-8?q?update:=20=E6=9B=B4=E6=96=B0=E6=96=87?=
 =?UTF-8?q?=E4=BB=B6=20ability=5Fmanager=5Fservice.cpp?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: hhd227 <huanghaodong9@h-partners.com>
---
 services/abilitymgr/src/ability_manager_service.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/services/abilitymgr/src/ability_manager_service.cpp b/services/abilitymgr/src/ability_manager_service.cpp
index 9ac146272a..07185f7e10 100644
--- a/services/abilitymgr/src/ability_manager_service.cpp
+++ b/services/abilitymgr/src/ability_manager_service.cpp
@@ -4919,7 +4919,7 @@ int AbilityManagerService::StopExtensionAbility(const Want &want, const sptr<IRe
     TAG_LOGI(AAFwkTag::SERVICE_EXT,
         "bundlename:%{public}s, ability:%{public}s, userId:%{public}d",
         want.GetBundle().c_str(), want.GetElement().GetAbilityName().c_str(), userId);
-     if (extensionType != AppExecFwk::ExtensionAbilityType::APP_SERVICE) {
+    if (extensionType != AppExecFwk::ExtensionAbilityType::APP_SERVICE) {
         CHECK_CALLER_IS_SYSTEM_APP;
     }
     EventInfo eventInfo = BuildEventInfo(want, userId);