!9330 新增2in1设备类型-ability

Merge pull request !9330 from 糖宝儿/add2in1_ability

!9330 新增2in1设备类型-ability
Merge pull request !9330 from 糖宝儿/add2in1_ability
3e40f066 · openharmony_ci · Gitee · 63c417cd · 65770a2e · 3e40f066
242 changed file
--- a/ability/ability_runtime/aacommand/AACommand07/entry/src/main/module.json
+++ b/ability/ability_runtime/aacommand/AACommand07/entry/src/main/module.json
@@ -7,7 +7,8 @@
        "mainElement": "MainAbility",
        "deviceTypes": [
            "default",
-      "tablet"
+            "tablet",
+            "2in1"
        ],
        "deliveryWithInstall": true,
        "installationFree": false,

--- a/ability/ability_runtime/aacommand/AACommand08/entry/src/main/module.json
+++ b/ability/ability_runtime/aacommand/AACommand08/entry/src/main/module.json
@@ -7,7 +7,8 @@
        "mainElement": "MainAbility",
        "deviceTypes": [
            "default",
-      "tablet"
+            "tablet",
+            "2in1"
        ],
        "deliveryWithInstall": true,
        "installationFree": false,

--- a/ability/ability_runtime/aacommand/AACommandPrintOneTest/entry/src/main/module.json
+++ b/ability/ability_runtime/aacommand/AACommandPrintOneTest/entry/src/main/module.json
@@ -7,7 +7,8 @@
        "mainElement": "MainAbility",
        "deviceTypes": [
            "default",
-      "tablet"
+            "tablet",
+            "2in1"
        ],
        "deliveryWithInstall": true,
        "installationFree": false,
@@ -36,8 +37,8 @@
        ],
        "requestPermissions": [
            {
-        "name":"ohos.permission.START_ABILITIES_FROM_BACKGROUND",
-        "reason":"need use ohos.permission.START_ABILITIES_FROM_BACKGROUND"
+                "name": "ohos.permission.START_ABILITIES_FROM_BACKGROUND",
+                "reason": "need use ohos.permission.START_ABILITIES_FROM_BACKGROUND"
            }
        ]
    }

--- a/ability/ability_runtime/aacommand/AACommandPrintSync/entry/src/main/module.json
+++ b/ability/ability_runtime/aacommand/AACommandPrintSync/entry/src/main/module.json
@@ -7,7 +7,8 @@
        "mainElement": "MainAbility",
        "deviceTypes": [
            "default",
-      "tablet"
+            "tablet",
+            "2in1"
        ],
        "deliveryWithInstall": true,
        "installationFree": false,

--- a/ability/ability_runtime/aacommand/AACommandPrintSyncTest/entry/src/main/module.json
+++ b/ability/ability_runtime/aacommand/AACommandPrintSyncTest/entry/src/main/module.json
@@ -7,7 +7,8 @@
        "mainElement": "MainAbility",
        "deviceTypes": [
            "default",
-      "tablet"
+            "tablet",
+            "2in1"
        ],
        "deliveryWithInstall": true,
        "installationFree": false,
@@ -36,8 +37,8 @@
        ],
        "requestPermissions": [
            {
-        "name":"ohos.permission.START_ABILITIES_FROM_BACKGROUND",
-        "reason":"need use ohos.permission.START_ABILITIES_FROM_BACKGROUND"
+                "name": "ohos.permission.START_ABILITIES_FROM_BACKGROUND",
+                "reason": "need use ohos.permission.START_ABILITIES_FROM_BACKGROUND"
            }
        ]
    }

--- a/ability/ability_runtime/aacommand/AACommandRelyHap/entry/src/main/module.json
+++ b/ability/ability_runtime/aacommand/AACommandRelyHap/entry/src/main/module.json
@@ -7,7 +7,8 @@
        "mainElement": "MainAbility",
        "deviceTypes": [
            "default",
-      "tablet"
+            "tablet",
+            "2in1"
        ],
        "deliveryWithInstall": true,
        "installationFree": false,

--- a/ability/ability_runtime/aacommand/AACommandpackage/entry/src/main/module.json
+++ b/ability/ability_runtime/aacommand/AACommandpackage/entry/src/main/module.json
@@ -7,7 +7,8 @@
        "mainElement": "MainAbility",
        "deviceTypes": [
            "default",
-      "tablet"
+            "tablet",
+            "2in1"
        ],
        "deliveryWithInstall": true,
        "installationFree": false,

--- a/ability/ability_runtime/aacommand/AACommandtest/entry/src/main/module.json
+++ b/ability/ability_runtime/aacommand/AACommandtest/entry/src/main/module.json
@@ -7,7 +7,8 @@
        "mainElement": "MainAbility",
        "deviceTypes": [
            "default",
-      "tablet"
+            "tablet",
+            "2in1"
        ],
        "deliveryWithInstall": true,
        "installationFree": false,
@@ -36,8 +37,8 @@
        ],
        "requestPermissions": [
            {
-        "name":"ohos.permission.START_ABILITIES_FROM_BACKGROUND",
-        "reason":"need use ohos.permission.START_ABILITIES_FROM_BACKGROUND"
+                "name": "ohos.permission.START_ABILITIES_FROM_BACKGROUND",
+                "reason": "need use ohos.permission.START_ABILITIES_FROM_BACKGROUND"
            }
        ]
    }

--- a/ability/ability_runtime/abilitymanager/actsamscallbackfifthscene/src/main/config.json
+++ b/ability/ability_runtime/abilitymanager/actsamscallbackfifthscene/src/main/config.json
@@ -17,10 +17,11 @@
        "package": "com.example.actsamscallbackfifthscene",
        "name": ".entry",
        "mainAbility": ".MainAbility",
-    "srcPath":"",
+        "srcPath": "",
        "deviceType": [
            "default",
-      "tablet"
+            "tablet",
+            "2in1"
        ],
        "distro": {
            "deliveryWithInstall": true,

--- a/ability/ability_runtime/abilitymanager/actsamscallbackfirstscene/src/main/config.json
+++ b/ability/ability_runtime/abilitymanager/actsamscallbackfirstscene/src/main/config.json
@@ -17,10 +17,11 @@
        "package": "com.example.actsamscallbackfirstscene",
        "name": ".entry",
        "mainAbility": ".MainAbility",
-    "srcPath":"",
+        "srcPath": "",
        "deviceType": [
            "default",
-    "tablet"
+            "tablet",
+            "2in1"
        ],
        "distro": {
            "deliveryWithInstall": true,

--- a/ability/ability_runtime/abilitymanager/actsamscallbackfourthscene/src/main/config.json
+++ b/ability/ability_runtime/abilitymanager/actsamscallbackfourthscene/src/main/config.json
@@ -17,10 +17,11 @@
        "package": "com.example.actsamscallbackfourthscene",
        "name": ".entry",
        "mainAbility": ".MainAbility",
-    "srcPath":"",
+        "srcPath": "",
        "deviceType": [
            "default",
-        "tablet"
+            "tablet",
+            "2in1"
        ],
        "distro": {
            "deliveryWithInstall": true,

--- a/ability/ability_runtime/abilitymanager/actsamscallbacksecondscene/src/main/config.json
+++ b/ability/ability_runtime/abilitymanager/actsamscallbacksecondscene/src/main/config.json
@@ -17,10 +17,11 @@
        "package": "com.example.actsamscallbacksecondscene",
        "name": ".entry",
        "mainAbility": ".MainAbility",
-    "srcPath":"",
+        "srcPath": "",
        "deviceType": [
            "default",
-        "tablet"
+            "tablet",
+            "2in1"
        ],
        "distro": {
            "deliveryWithInstall": true,

--- a/ability/ability_runtime/abilitymanager/actsamscallbackthirdscene/src/main/config.json
+++ b/ability/ability_runtime/abilitymanager/actsamscallbackthirdscene/src/main/config.json
@@ -17,10 +17,11 @@
        "package": "com.example.actsamscallbackthirdscene",
        "name": ".entry",
        "mainAbility": ".MainAbility",
-    "srcPath":"",
+        "srcPath": "",
        "deviceType": [
            "default",
-        "tablet"
+            "tablet",
+            "2in1"
        ],
        "distro": {
            "deliveryWithInstall": true,

--- a/ability/ability_runtime/abilitymanager/actsamstestfifthscene/src/main/config.json
+++ b/ability/ability_runtime/abilitymanager/actsamstestfifthscene/src/main/config.json
@@ -17,10 +17,11 @@
        "package": "com.example.actsamstestfifthscene",
        "name": ".entry",
        "mainAbility": ".MainAbility",
-    "srcPath":"",
+        "srcPath": "",
        "deviceType": [
            "default",
-        "tablet"
+            "tablet",
+            "2in1"
        ],
        "distro": {
            "deliveryWithInstall": true,

--- a/ability/ability_runtime/abilitymanager/actsamstestfirstscene/src/main/config.json
+++ b/ability/ability_runtime/abilitymanager/actsamstestfirstscene/src/main/config.json
@@ -17,10 +17,11 @@
        "package": "com.example.actsamstestfirstscene",
        "name": ".entry",
        "mainAbility": ".MainAbility",
-    "srcPath":"",
+        "srcPath": "",
        "deviceType": [
            "default",
-        "tablet"
+            "tablet",
+            "2in1"
        ],
        "distro": {
            "deliveryWithInstall": true,

--- a/ability/ability_runtime/abilitymanager/actsamstestfourthscene/src/main/config.json
+++ b/ability/ability_runtime/abilitymanager/actsamstestfourthscene/src/main/config.json
@@ -17,10 +17,11 @@
        "package": "com.example.actsamstestfourthscene",
        "name": ".entry",
        "mainAbility": ".MainAbility",
-    "srcPath":"",
+        "srcPath": "",
        "deviceType": [
            "default",
-        "tablet"
+            "tablet",
+            "2in1"
        ],
        "distro": {
            "deliveryWithInstall": true,

--- a/ability/ability_runtime/abilitymanager/actsamstestsecondscene/src/main/config.json
+++ b/ability/ability_runtime/abilitymanager/actsamstestsecondscene/src/main/config.json
@@ -17,10 +17,11 @@
        "package": "com.example.actsamstestsecondscene",
        "name": ".entry",
        "mainAbility": ".MainAbility",
-    "srcPath":"",
+        "srcPath": "",
        "deviceType": [
            "default",
-        "tablet"
+            "tablet",
+            "2in1"
        ],
        "distro": {
            "deliveryWithInstall": true,

--- a/ability/ability_runtime/abilitymanager/actsamstestthirdscene/src/main/config.json
+++ b/ability/ability_runtime/abilitymanager/actsamstestthirdscene/src/main/config.json
@@ -17,10 +17,11 @@
        "package": "com.example.actsamstestthirdscene",
        "name": ".entry",
        "mainAbility": ".MainAbility",
-    "srcPath":"",
+        "srcPath": "",
        "deviceType": [
            "default",
-        "tablet"
+            "tablet",
+            "2in1"
        ],
        "distro": {
            "deliveryWithInstall": true,

--- a/ability/ability_runtime/abilitymontior/entry/src/main/module.json
+++ b/ability/ability_runtime/abilitymontior/entry/src/main/module.json
@@ -7,7 +7,8 @@
        "mainElement": "MainAbility",
        "deviceTypes": [
            "default",
-        "tablet"
+            "tablet",
+            "2in1"
        ],
        "deliveryWithInstall": true,
        "installationFree": false,
@@ -62,8 +63,8 @@
        ],
        "requestPermissions": [
            {
-        "name":"ohos.permission.START_ABILITIES_FROM_BACKGROUND",
-        "reason":"need use ohos.permission.START_ABILITIES_FROM_BACKGROUND"
+                "name": "ohos.permission.START_ABILITIES_FROM_BACKGROUND",
+                "reason": "need use ohos.permission.START_ABILITIES_FROM_BACKGROUND"
            }
        ]
    }

--- a/ability/ability_runtime/abilitymultiinstance/amsabilitymultiinstanceappa/entry/src/main/module.json
+++ b/ability/ability_runtime/abilitymultiinstance/amsabilitymultiinstanceappa/entry/src/main/module.json
@@ -7,7 +7,8 @@
        "mainElement": "MainAbility",
        "deviceTypes": [
            "default",
-        "tablet"
+            "tablet",
+            "2in1"
        ],
        "deliveryWithInstall": true,
        "installationFree": false,

--- a/ability/ability_runtime/abilitymultiinstance/amsabilitymultiinstanceappb/entry/src/main/module.json
+++ b/ability/ability_runtime/abilitymultiinstance/amsabilitymultiinstanceappb/entry/src/main/module.json
@@ -7,7 +7,8 @@
        "mainElement": "MainAbility",
        "deviceTypes": [
            "default",
-        "tablet"
+            "tablet",
+            "2in1"
        ],
        "deliveryWithInstall": true,
        "installationFree": false,

--- a/ability/ability_runtime/abilitymultiinstance/amsabilitymultiinstanceappc/entry/src/main/module.json
+++ b/ability/ability_runtime/abilitymultiinstance/amsabilitymultiinstanceappc/entry/src/main/module.json
@@ -7,7 +7,8 @@
        "mainElement": "MainAbility",
        "deviceTypes": [
            "default",
-        "tablet"
+            "tablet",
+            "2in1"
        ],
        "deliveryWithInstall": true,
        "installationFree": false,

--- a/ability/ability_runtime/abilitymultiinstance/amsabilitymultiinstanceappd/entry/src/main/module.json
+++ b/ability/ability_runtime/abilitymultiinstance/amsabilitymultiinstanceappd/entry/src/main/module.json
@@ -7,7 +7,8 @@
        "mainElement": "MainAbility",
        "deviceTypes": [
            "default",
-        "tablet"
+            "tablet",
+            "2in1"
        ],
        "deliveryWithInstall": true,
        "installationFree": false,

--- a/ability/ability_runtime/abilitymultiinstance/amsabilitymultiinstanceappe/src/main/config.json
+++ b/ability/ability_runtime/abilitymultiinstance/amsabilitymultiinstanceappe/src/main/config.json
@@ -22,7 +22,8 @@
        "name": ".MyApplication",
        "deviceType": [
            "default",
-      "tablet"
+            "tablet",
+            "2in1"
        ],
        "distro": {
            "deliveryWithInstall": true,

--- a/ability/ability_runtime/abilitymultiinstance/amsabilitymultiinstancetest/entry/src/main/module.json
+++ b/ability/ability_runtime/abilitymultiinstance/amsabilitymultiinstancetest/entry/src/main/module.json
@@ -7,7 +7,8 @@
        "mainElement": "MainAbility",
        "deviceTypes": [
            "default",
-            "tablet"
+            "tablet",
+            "2in1"
        ],
        "deliveryWithInstall": true,
        "installationFree": false,
@@ -28,7 +29,7 @@
                        "actions": [
                            "action.system.home"
                        ],
-                        "entities":[
+                        "entities": [
                            "entity.system.home"
                        ]
                    }
@@ -37,8 +38,8 @@
        ],
        "requestPermissions": [
            {
-            "name":"ohos.permission.START_ABILITIES_FROM_BACKGROUND",
-            "reason":"need use ohos.permission.START_ABILITIES_FROM_BACKGROUND"
+                "name": "ohos.permission.START_ABILITIES_FROM_BACKGROUND",
+                "reason": "need use ohos.permission.START_ABILITIES_FROM_BACKGROUND"
            }
        ]
    }

--- a/ability/ability_runtime/abilitystagemonitor/abilitystagemonitorassista/entry/src/main/module.json
+++ b/ability/ability_runtime/abilitystagemonitor/abilitystagemonitorassista/entry/src/main/module.json
@@ -7,7 +7,8 @@
        "mainElement": "MainAbility",
        "deviceTypes": [
            "default",
-      "tablet"
+            "tablet",
+            "2in1"
        ],
        "deliveryWithInstall": true,
        "installationFree": false,

--- a/ability/ability_runtime/abilitystagemonitor/abilitystagemonitorassistc/entry/src/main/module.json
+++ b/ability/ability_runtime/abilitystagemonitor/abilitystagemonitorassistc/entry/src/main/module.json
@@ -7,7 +7,8 @@
        "mainElement": "MainAbility2",
        "deviceTypes": [
            "default",
-      "tablet"
+            "tablet",
+            "2in1"
        ],
        "deliveryWithInstall": true,
        "installationFree": false,

--- a/ability/ability_runtime/abilitystagemonitor/abilitystagemonitorassistd/entry/src/main/module.json
+++ b/ability/ability_runtime/abilitystagemonitor/abilitystagemonitorassistd/entry/src/main/module.json
@@ -7,7 +7,8 @@
        "mainElement": "MainAbility3",
        "deviceTypes": [
            "default",
-      "tablet"
+            "tablet",
+            "2in1"
        ],
        "deliveryWithInstall": true,
        "installationFree": false,

--- a/ability/ability_runtime/abilitystagemonitor/abilitystagemonitorassiste/entry/src/main/module.json
+++ b/ability/ability_runtime/abilitystagemonitor/abilitystagemonitorassiste/entry/src/main/module.json
@@ -7,7 +7,8 @@
        "mainElement": "MainAbility4",
        "deviceTypes": [
            "default",
-      "tablet"
+            "tablet",
+            "2in1"
        ],
        "deliveryWithInstall": true,
        "installationFree": false,

--- a/ability/ability_runtime/abilitystagemonitor/abilitystagemonitorassistf/entry/src/main/module.json
+++ b/ability/ability_runtime/abilitystagemonitor/abilitystagemonitorassistf/entry/src/main/module.json
@@ -7,7 +7,8 @@
        "mainElement": "MainAbilityf5",
        "deviceTypes": [
            "default",
-      "tablet"
+            "tablet",
+            "2in1"
        ],
        "deliveryWithInstall": true,
        "installationFree": false,

--- a/ability/ability_runtime/abilitystagemonitor/abilitystagemonitorassistg/entry/src/main/module.json
+++ b/ability/ability_runtime/abilitystagemonitor/abilitystagemonitorassistg/entry/src/main/module.json
@@ -7,7 +7,8 @@
        "mainElement": "MainAbility6",
        "deviceTypes": [
            "default",
-      "tablet"
+            "tablet",
+            "2in1"
        ],
        "deliveryWithInstall": true,
        "installationFree": false,

--- a/ability/ability_runtime/abilitystagemonitor/abilitystagemonitorassisth/entry/src/main/module.json
+++ b/ability/ability_runtime/abilitystagemonitor/abilitystagemonitorassisth/entry/src/main/module.json
@@ -7,7 +7,8 @@
        "mainElement": "MainAbility7",
        "deviceTypes": [
            "default",
-      "tablet"
+            "tablet",
+            "2in1"
        ],
        "deliveryWithInstall": true,
        "installationFree": false,

--- a/ability/ability_runtime/abilitystagemonitor/abilitystagemonitortest/entry/src/main/module.json
+++ b/ability/ability_runtime/abilitystagemonitor/abilitystagemonitortest/entry/src/main/module.json
@@ -7,7 +7,8 @@
        "mainElement": "TestAbility",
        "deviceTypes": [
            "default",
-      "tablet"
+            "tablet",
+            "2in1"
        ],
        "deliveryWithInstall": true,
        "installationFree": false,

--- a/ability/ability_runtime/actsabilitydelegatorcase/entry/src/main/config.json
+++ b/ability/ability_runtime/actsabilitydelegatorcase/entry/src/main/config.json
@@ -18,7 +18,8 @@
        "name": ".MyApplication",
        "deviceType": [
            "default",
-        "tablet"
+            "tablet",
+            "2in1"
        ],
        "distro": {
            "deliveryWithInstall": true,

--- a/ability/ability_runtime/actsabilitymanageretstest/entry/src/main/config.json
+++ b/ability/ability_runtime/actsabilitymanageretstest/entry/src/main/config.json
@@ -20,7 +20,8 @@
        "mainAbility": "com.ohos.acecollaboration.MainAbility",
        "deviceType": [
            "default",
-        "tablet"
+            "tablet",
+            "2in1"
        ],
        "reqPermissions": [
            {

--- a/ability/ability_runtime/actsabilityusertest/entry/src/main/module.json
+++ b/ability/ability_runtime/actsabilityusertest/entry/src/main/module.json
@@ -7,7 +7,8 @@
        "mainElement": "MainAbility",
        "deviceTypes": [
            "default",
-      "tablet"
+            "tablet",
+            "2in1"
        ],
        "deliveryWithInstall": true,
        "installationFree": false,

--- a/ability/ability_runtime/actscalldataabilitytest/entry/src/main/config.json
+++ b/ability/ability_runtime/actscalldataabilitytest/entry/src/main/config.json
@@ -17,7 +17,8 @@
        "mainAbility": ".MainAbility",
        "deviceType": [
            "default",
-        "tablet"
+            "tablet",
+            "2in1"
        ],
        "abilities": [
            {

--- a/ability/ability_runtime/actscalltest/systemappcalleea/entry/src/main/module.json
+++ b/ability/ability_runtime/actscalltest/systemappcalleea/entry/src/main/module.json
@@ -7,7 +7,8 @@
        "mainElement": "MainAbility",
        "deviceTypes": [
            "default",
-            "tablet"
+            "tablet",
+            "2in1"
        ],
        "deliveryWithInstall": true,
        "installationFree": false,
@@ -28,7 +29,7 @@
                        "actions": [
                            "action.system.home"
                        ],
-                        "entities":[
+                        "entities": [
                            "entity.system.home"
                        ]
                    }

--- a/ability/ability_runtime/actscalltest/systemappcallera/entry/src/main/module.json
+++ b/ability/ability_runtime/actscalltest/systemappcallera/entry/src/main/module.json
@@ -7,7 +7,8 @@
        "mainElement": "MainAbility",
        "deviceTypes": [
            "default",
-            "tablet"
+            "tablet",
+            "2in1"
        ],
        "deliveryWithInstall": true,
        "installationFree": false,
@@ -28,7 +29,7 @@
                        "actions": [
                            "action.system.home"
                        ],
-                        "entities":[
+                        "entities": [
                            "entity.system.home"
                        ]
                    }

--- a/ability/ability_runtime/actscalltest/systemappcallerb/entry/src/main/module.json
+++ b/ability/ability_runtime/actscalltest/systemappcallerb/entry/src/main/module.json
@@ -7,7 +7,8 @@
        "mainElement": "MainAbility",
        "deviceTypes": [
            "default",
-            "tablet"
+            "tablet",
+            "2in1"
        ],
        "deliveryWithInstall": true,
        "installationFree": false,
@@ -28,7 +29,7 @@
                        "actions": [
                            "action.system.home"
                        ],
-                        "entities":[
+                        "entities": [
                            "entity.system.home"
                        ]
                    }

--- a/ability/ability_runtime/actscalltest/systemappcallerc/entry/src/main/module.json
+++ b/ability/ability_runtime/actscalltest/systemappcallerc/entry/src/main/module.json
@@ -7,7 +7,8 @@
        "mainElement": "MainAbility",
        "deviceTypes": [
            "default",
-            "tablet"
+            "tablet",
+            "2in1"
        ],
        "deliveryWithInstall": true,
        "installationFree": false,
@@ -28,7 +29,7 @@
                        "actions": [
                            "action.system.home"
                        ],
-                        "entities":[
+                        "entities": [
                            "entity.system.home"
                        ]
                    }

--- a/ability/ability_runtime/actscalltest/systemcallentrytest/entry/src/main/module.json
+++ b/ability/ability_runtime/actscalltest/systemcallentrytest/entry/src/main/module.json
@@ -7,7 +7,8 @@
        "mainElement": "MainAbility",
        "deviceTypes": [
            "default",
-            "tablet"
+            "tablet",
+            "2in1"
        ],
        "deliveryWithInstall": true,
        "installationFree": false,
@@ -28,7 +29,7 @@
                        "actions": [
                            "action.system.home"
                        ],
-                        "entities":[
+                        "entities": [
                            "entity.system.home"
                        ]
                    }
@@ -47,12 +48,12 @@
        ],
        "requestPermissions": [
            {
-            "name":"ohos.permission.GET_BUNDLE_INFO",
-            "reason":"need use ohos.permission.GET_BUNDLE_INFO"
+                "name": "ohos.permission.GET_BUNDLE_INFO",
+                "reason": "need use ohos.permission.GET_BUNDLE_INFO"
            },
            {
-            "name":"ohos.permission.ABILITY_BACKGROUND_COMMUNICATION",
-            "reason":"need use ohos.permission.ABILITY_BACKGROUND_COMMUNICATION"
+                "name": "ohos.permission.ABILITY_BACKGROUND_COMMUNICATION",
+                "reason": "need use ohos.permission.ABILITY_BACKGROUND_COMMUNICATION"
            }
        ]
    }

--- a/ability/ability_runtime/actscalltest/systemcallfeature/entry/src/main/module.json
+++ b/ability/ability_runtime/actscalltest/systemcallfeature/entry/src/main/module.json
@@ -8,7 +8,8 @@
        "mainElement": "MainAbility",
        "deviceTypes": [
            "default",
-            "tablet"
+            "tablet",
+            "2in1"
        ],
        "deliveryWithInstall": true,
        "installationFree": false,
@@ -29,7 +30,7 @@
                        "actions": [
                            "action.system.home"
                        ],
-                        "entities":[
+                        "entities": [
                            "entity.system.home"
                        ]
                    }

--- a/ability/ability_runtime/actscalltest/thirdappa/entry/src/main/module.json
+++ b/ability/ability_runtime/actscalltest/thirdappa/entry/src/main/module.json
@@ -7,7 +7,8 @@
        "mainElement": "MainAbility",
        "deviceTypes": [
            "default",
-            "tablet"
+            "tablet",
+            "2in1"
        ],
        "deliveryWithInstall": true,
        "installationFree": false,
@@ -28,7 +29,7 @@
                        "actions": [
                            "action.system.home"
                        ],
-                        "entities":[
+                        "entities": [
                            "entity.system.home"
                        ]
                    }

--- a/ability/ability_runtime/actscalltest/thirdcalltest/entry/src/main/module.json
+++ b/ability/ability_runtime/actscalltest/thirdcalltest/entry/src/main/module.json
@@ -7,7 +7,8 @@
        "mainElement": "MainAbility",
        "deviceTypes": [
            "default",
-            "tablet"
+            "tablet",
+            "2in1"
        ],
        "deliveryWithInstall": true,
        "installationFree": false,
@@ -28,7 +29,7 @@
                        "actions": [
                            "action.system.home"
                        ],
-                        "entities":[
+                        "entities": [
                            "entity.system.home"
                        ]
                    }

--- a/ability/ability_runtime/actscrosscall/actscrosscalleerely/entry/src/main/module.json
+++ b/ability/ability_runtime/actscrosscall/actscrosscalleerely/entry/src/main/module.json
@@ -6,7 +6,8 @@
        "mainElement": "EntryAbility",
        "deviceTypes": [
            "default",
-      "tablet"
+            "tablet",
+            "2in1"
        ],
        "deliveryWithInstall": true,
        "installationFree": false,

--- a/ability/ability_runtime/actscrosscall/actscrosscallernopermissionrely/entry/src/main/module.json
+++ b/ability/ability_runtime/actscrosscall/actscrosscallernopermissionrely/entry/src/main/module.json
@@ -6,7 +6,8 @@
        "mainElement": "EntryAbility",
        "deviceTypes": [
            "default",
-      "tablet"
+            "tablet",
+            "2in1"
        ],
        "deliveryWithInstall": true,
        "installationFree": false,
@@ -42,9 +43,10 @@
                "type": "service",
                "visible": true
            }
-    ],"requestPermissions": [
+        ],
+        "requestPermissions": [
            {
-        "name":"ohos.permission.ABILITY_BACKGROUND_COMMUNICATION"
+                "name": "ohos.permission.ABILITY_BACKGROUND_COMMUNICATION"
            }
        ]
    }

--- a/ability/ability_runtime/actscrosscall/actscrosscallernormalrely/entry/src/main/module.json
+++ b/ability/ability_runtime/actscrosscall/actscrosscallernormalrely/entry/src/main/module.json
@@ -6,7 +6,8 @@
        "mainElement": "EntryAbility",
        "deviceTypes": [
            "default",
-      "tablet"
+            "tablet",
+            "2in1"
        ],
        "deliveryWithInstall": true,
        "installationFree": false,
@@ -45,10 +46,10 @@
        ],
        "requestPermissions": [
            {
-        "name":"ohos.permission.ABILITY_BACKGROUND_COMMUNICATION"
+                "name": "ohos.permission.ABILITY_BACKGROUND_COMMUNICATION"
            },
            {
-        "name":"ohos.permission.INTERACT_ACROSS_LOCAL_ACCOUNTS"
+                "name": "ohos.permission.INTERACT_ACROSS_LOCAL_ACCOUNTS"
            }
        ]
    }

--- a/ability/ability_runtime/actscrosscall/actscrosscallerrely/entry/src/main/module.json
+++ b/ability/ability_runtime/actscrosscall/actscrosscallerrely/entry/src/main/module.json
@@ -6,7 +6,8 @@
        "mainElement": "EntryAbility",
        "deviceTypes": [
            "default",
-      "tablet"
+            "tablet",
+            "2in1"
        ],
        "deliveryWithInstall": true,
        "installationFree": false,
@@ -44,10 +45,10 @@
        ],
        "requestPermissions": [
            {
-        "name":"ohos.permission.ABILITY_BACKGROUND_COMMUNICATION"
+                "name": "ohos.permission.ABILITY_BACKGROUND_COMMUNICATION"
            },
            {
-        "name":"ohos.permission.INTERACT_ACROSS_LOCAL_ACCOUNTS"
+                "name": "ohos.permission.INTERACT_ACROSS_LOCAL_ACCOUNTS"
            }
        ]
    }

--- a/ability/ability_runtime/actscrosscall/actscrosscalltest/entry/src/main/module.json
+++ b/ability/ability_runtime/actscrosscall/actscrosscalltest/entry/src/main/module.json
@@ -6,7 +6,8 @@
        "mainElement": "TestAbility",
        "deviceTypes": [
            "default",
-      "tablet"
+            "tablet",
+            "2in1"
        ],
        "deliveryWithInstall": true,
        "installationFree": false,
@@ -35,7 +36,7 @@
        ],
        "requestPermissions": [
            {
-        "name":"ohos.permission.START_ABILITIES_FROM_BACKGROUND"
+                "name": "ohos.permission.START_ABILITIES_FROM_BACKGROUND"
            }
        ]
    }

--- a/ability/ability_runtime/actsdataabilityaccessdatasharetest/actsdataabilityaccessdatasharetest/src/main/config.json
+++ b/ability/ability_runtime/actsdataabilityaccessdatasharetest/actsdataabilityaccessdatasharetest/src/main/config.json
@@ -18,7 +18,8 @@
        "name": ".entry",
        "deviceType": [
            "default",
-            "tablet"
+            "tablet",
+            "2in1"
        ],
        "distro": {
            "deliveryWithInstall": true,

--- a/ability/ability_runtime/actsdataabilityaccessdatasharetest/datashareserverhap/entry/src/main/module.json
+++ b/ability/ability_runtime/actsdataabilityaccessdatasharetest/datashareserverhap/entry/src/main/module.json
@@ -7,7 +7,8 @@
        "mainElement": "MainAbility",
        "deviceTypes": [
            "default",
-      "tablet"
+            "tablet",
+            "2in1"
        ],
        "deliveryWithInstall": true,
        "installationFree": false,

--- a/ability/ability_runtime/actsfwkdataaccessortest/actsdataabilityrelyhap/entry/src/main/config.json
+++ b/ability/ability_runtime/actsfwkdataaccessortest/actsdataabilityrelyhap/entry/src/main/config.json
@@ -19,7 +19,8 @@
        "srcPath": "",
        "deviceType": [
            "default",
-        "tablet"
+            "tablet",
+            "2in1"
        ],
        "distro": {
            "deliveryWithInstall": true,

--- a/ability/ability_runtime/actsfwkdataaccessortest/actsfwkdataaccessortest/src/main/config.json
+++ b/ability/ability_runtime/actsfwkdataaccessortest/actsfwkdataaccessortest/src/main/config.json
@@ -18,7 +18,8 @@
        "name": ".entry",
        "deviceType": [
            "default",
-            "tablet"
+            "tablet",
+            "2in1"
        ],
        "distro": {
            "deliveryWithInstall": true,

--- a/ability/ability_runtime/actsmultiplecall/actsappmultiplerely/entry/src/main/module.json
+++ b/ability/ability_runtime/actsmultiplecall/actsappmultiplerely/entry/src/main/module.json
@@ -6,7 +6,8 @@
        "mainElement": "EntryAbility",
        "deviceTypes": [
            "default",
-      "tablet"
+            "tablet",
+            "2in1"
        ],
        "deliveryWithInstall": true,
        "installationFree": false,

--- a/ability/ability_runtime/actsmultiplecall/actsapprely/entry/src/main/module.json
+++ b/ability/ability_runtime/actsmultiplecall/actsapprely/entry/src/main/module.json
@@ -6,7 +6,8 @@
        "mainElement": "EntryAbility",
        "deviceTypes": [
            "default",
-      "tablet"
+            "tablet",
+            "2in1"
        ],
        "deliveryWithInstall": true,
        "installationFree": false,
@@ -45,7 +46,7 @@
        ],
        "requestPermissions": [
            {
-        "name":"ohos.permission.ABILITY_BACKGROUND_COMMUNICATION"
+                "name": "ohos.permission.ABILITY_BACKGROUND_COMMUNICATION"
            }
        ]
    }

--- a/ability/ability_runtime/actsmultiplecall/actsappsinglerely/entry/src/main/module.json
+++ b/ability/ability_runtime/actsmultiplecall/actsappsinglerely/entry/src/main/module.json
@@ -6,7 +6,8 @@
        "mainElement": "EntryAbility",
        "deviceTypes": [
            "default",
-      "tablet"
+            "tablet",
+            "2in1"
        ],
        "deliveryWithInstall": true,
        "installationFree": false,

--- a/ability/ability_runtime/actsmultiplecall/actscallfunction/entry/src/main/module.json
+++ b/ability/ability_runtime/actsmultiplecall/actscallfunction/entry/src/main/module.json
@@ -6,7 +6,8 @@
        "mainElement": "TestAbility",
        "deviceTypes": [
            "default",
-      "tablet"
+            "tablet",
+            "2in1"
        ],
        "deliveryWithInstall": true,
        "installationFree": false,

--- a/ability/ability_runtime/actsqueryfunctiontest/actsgetabilitystatestagetest/entry/src/main/module.json
+++ b/ability/ability_runtime/actsqueryfunctiontest/actsgetabilitystatestagetest/entry/src/main/module.json
@@ -7,7 +7,8 @@
        "mainElement": "MainAbility",
        "deviceTypes": [
            "default",
-      "tablet"
+            "tablet",
+            "2in1"
        ],
        "deliveryWithInstall": true,
        "installationFree": false,
@@ -56,8 +57,8 @@
        ],
        "requestPermissions": [
            {
-        "name":"ohos.permission.START_ABILITIES_FROM_BACKGROUND",
-        "reason":"need use ohos.permission.START_ABILITIES_FROM_BACKGROUND"
+                "name": "ohos.permission.START_ABILITIES_FROM_BACKGROUND",
+                "reason": "need use ohos.permission.START_ABILITIES_FROM_BACKGROUND"
            }
        ]
    }

--- a/ability/ability_runtime/actsqueryfunctiontest/actsgetappcontextstageatest/entry/src/main/module.json
+++ b/ability/ability_runtime/actsqueryfunctiontest/actsgetappcontextstageatest/entry/src/main/module.json
@@ -7,7 +7,8 @@
        "mainElement": "MainAbility",
        "deviceTypes": [
            "default",
-      "tablet"
+            "tablet",
+            "2in1"
        ],
        "deliveryWithInstall": true,
        "installationFree": false,

--- a/ability/ability_runtime/actsqueryfunctiontest/actsgetappcontextstagebtest/entry/src/main/module.json
+++ b/ability/ability_runtime/actsqueryfunctiontest/actsgetappcontextstagebtest/entry/src/main/module.json
@@ -7,7 +7,8 @@
        "mainElement": "MainAbility",
        "deviceTypes": [
            "default",
-      "tablet"
+            "tablet",
+            "2in1"
        ],
        "deliveryWithInstall": true,
        "installationFree": false,

--- a/ability/ability_runtime/actsqueryfunctiontest/actsgetappcontexttest/entry/src/main/module.json
+++ b/ability/ability_runtime/actsqueryfunctiontest/actsgetappcontexttest/entry/src/main/module.json
@@ -7,7 +7,8 @@
        "mainElement": "MainAbility",
        "deviceTypes": [
            "default",
-      "tablet"
+            "tablet",
+            "2in1"
        ],
        "deliveryWithInstall": true,
        "installationFree": false,

--- a/ability/ability_runtime/actsqueryfunctiontest/actsgetcurrenttopabilitystageatest/entry/src/main/module.json
+++ b/ability/ability_runtime/actsqueryfunctiontest/actsgetcurrenttopabilitystageatest/entry/src/main/module.json
@@ -7,7 +7,8 @@
        "mainElement": "MainAbility",
        "deviceTypes": [
            "default",
-      "tablet"
+            "tablet",
+            "2in1"
        ],
        "deliveryWithInstall": true,
        "installationFree": false,

--- a/ability/ability_runtime/actsqueryfunctiontest/actsgetcurrenttopabilitystagebtest/entry/src/main/module.json
+++ b/ability/ability_runtime/actsqueryfunctiontest/actsgetcurrenttopabilitystagebtest/entry/src/main/module.json
@@ -7,7 +7,8 @@
        "mainElement": "MainAbility",
        "deviceTypes": [
            "default",
-      "tablet"
+            "tablet",
+            "2in1"
        ],
        "deliveryWithInstall": true,
        "installationFree": false,

--- a/ability/ability_runtime/actsrequestdialogtest/actsrequestdialog/entry/src/main/module.json
+++ b/ability/ability_runtime/actsrequestdialogtest/actsrequestdialog/entry/src/main/module.json
@@ -7,7 +7,8 @@
        "mainElement": "MainAbility",
        "deviceTypes": [
            "default",
-        "tablet"
+            "tablet",
+            "2in1"
        ],
        "deliveryWithInstall": true,
        "installationFree": false,
@@ -40,7 +41,7 @@
                "icon": "$media:icon",
                "label": "$string:entry_label",
                "visible": true,
-        "launchType":"standard",
+                "launchType": "standard",
                "orientation": "portrait"
            }
        ]

--- a/ability/ability_runtime/actsrevokequickfixtest/entry/src/main/module.json
+++ b/ability/ability_runtime/actsrevokequickfixtest/entry/src/main/module.json
@@ -6,7 +6,8 @@
        "mainElement": "TestAbility",
        "deviceTypes": [
            "default",
-      "tablet"
+            "tablet",
+            "2in1"
        ],
        "deliveryWithInstall": true,
        "installationFree": false,

--- a/ability/ability_runtime/actsserviceabilityclienttest/actsserviceabilityclienttest/src/main/config.json
+++ b/ability/ability_runtime/actsserviceabilityclienttest/actsserviceabilityclienttest/src/main/config.json
@@ -17,10 +17,11 @@
        "package": "com.amsst.stserviceabilityclient",
        "name": ".entry",
        "mainAbility": ".MainAbility",
-    "srcPath":"",
+        "srcPath": "",
        "deviceType": [
            "default",
-        "tablet"
+            "tablet",
+            "2in1"
        ],
        "distro": {
            "deliveryWithInstall": true,

--- a/ability/ability_runtime/actsshellcommandfunctionalitytest/ActsExecuteShellCommandTest/entry/src/main/module.json
+++ b/ability/ability_runtime/actsshellcommandfunctionalitytest/ActsExecuteShellCommandTest/entry/src/main/module.json
@@ -7,7 +7,8 @@
        "mainElement": "MainAbility",
        "deviceTypes": [
            "default",
-        "tablet"
+            "tablet",
+            "2in1"
        ],
        "deliveryWithInstall": true,
        "installationFree": false,

--- a/ability/ability_runtime/actsshellcommandfunctionalitytest/ActsKillProcessWithAccountCloseRelyHap/entry/src/main/module.json
+++ b/ability/ability_runtime/actsshellcommandfunctionalitytest/ActsKillProcessWithAccountCloseRelyHap/entry/src/main/module.json
@@ -7,7 +7,8 @@
        "mainElement": "MainAbility",
        "deviceTypes": [
            "default",
-        "tablet"
+            "tablet",
+            "2in1"
        ],
        "deliveryWithInstall": true,
        "installationFree": false,

--- a/ability/ability_runtime/actsshellcommandfunctionalitytest/actsshellcommandcontroltest/entry/src/main/module.json
+++ b/ability/ability_runtime/actsshellcommandfunctionalitytest/actsshellcommandcontroltest/entry/src/main/module.json
@@ -7,7 +7,8 @@
        "mainElement": "MainAbility",
        "deviceTypes": [
            "default",
-      "tablet"
+            "tablet",
+            "2in1"
        ],
        "deliveryWithInstall": true,
        "installationFree": false,

--- a/ability/ability_runtime/actsstartrunnertest/entry/src/main/module.json
+++ b/ability/ability_runtime/actsstartrunnertest/entry/src/main/module.json
@@ -7,7 +7,8 @@
        "mainElement": "MainAbility",
        "deviceTypes": [
            "default",
-      "tablet"
+            "tablet",
+            "2in1"
        ],
        "deliveryWithInstall": true,
        "installationFree": false,

--- a/ability/ability_runtime/actsstserviceabilityclientcase/entry/src/main/config.json
+++ b/ability/ability_runtime/actsstserviceabilityclientcase/entry/src/main/config.json
@@ -19,7 +19,8 @@
        "mainAbility": "com.amsst.actsstserviceabilityclientcasetest.MainAbility",
        "deviceType": [
            "default",
-        "tablet"
+            "tablet",
+            "2in1"
        ],
        "distro": {
            "deliveryWithInstall": true,

--- a/ability/ability_runtime/actssupportfunction/actsonandoffscreentest/entry/src/main/module.json
+++ b/ability/ability_runtime/actssupportfunction/actsonandoffscreentest/entry/src/main/module.json
@@ -7,7 +7,8 @@
        "mainElement": "MainAbility",
        "deviceTypes": [
            "default",
-        "tablet"
+            "tablet",
+            "2in1"
        ],
        "deliveryWithInstall": true,
        "installationFree": false,
@@ -38,8 +39,8 @@
        ],
        "requestPermissions": [
            {
-        "name":"ohos.permission.START_ABILITIES_FROM_BACKGROUND",
-        "reason":"need use ohos.permission.START_ABILITIES_FROM_BACKGROUND"
+                "name": "ohos.permission.START_ABILITIES_FROM_BACKGROUND",
+                "reason": "need use ohos.permission.START_ABILITIES_FROM_BACKGROUND"
            }
        ]
    }

--- a/ability/ability_runtime/actssupportfunction/actssupportfunctiontest/entry/src/main/module.json
+++ b/ability/ability_runtime/actssupportfunction/actssupportfunctiontest/entry/src/main/module.json
@@ -7,7 +7,8 @@
        "mainElement": "MainAbility",
        "deviceTypes": [
            "default",
-        "tablet"
+            "tablet",
+            "2in1"
        ],
        "deliveryWithInstall": true,
        "installationFree": false,
@@ -38,8 +39,8 @@
        ],
        "requestPermissions": [
            {
-        "name":"ohos.permission.START_ABILITIES_FROM_BACKGROUND",
-        "reason":"need use ohos.permission.START_ABILITIES_FROM_BACKGROUND"
+                "name": "ohos.permission.START_ABILITIES_FROM_BACKGROUND",
+                "reason": "need use ohos.permission.START_ABILITIES_FROM_BACKGROUND"
            }
        ]
    }

--- a/ability/ability_runtime/actssupportfunction/faonandoffscreen/entry/src/main/config.json
+++ b/ability/ability_runtime/actssupportfunction/faonandoffscreen/entry/src/main/config.json
@@ -18,7 +18,8 @@
        "mainAbility": ".MainAbility",
        "deviceType": [
            "default",
-        "tablet"
+            "tablet",
+            "2in1"
        ],
        "distro": {
            "deliveryWithInstall": true,

--- a/ability/ability_runtime/actssupportfunction/fasupportfunction/entry/src/main/config.json
+++ b/ability/ability_runtime/actssupportfunction/fasupportfunction/entry/src/main/config.json
@@ -18,7 +18,8 @@
        "mainAbility": ".MainAbility",
        "deviceType": [
            "default",
-        "tablet"
+            "tablet",
+            "2in1"
        ],
        "distro": {
            "deliveryWithInstall": true,

--- a/ability/ability_runtime/actssupportfunction/fasupportfunction/fasupportfunctiontwo/src/main/config.json
+++ b/ability/ability_runtime/actssupportfunction/fasupportfunction/fasupportfunctiontwo/src/main/config.json
@@ -18,7 +18,8 @@
        "mainAbility": ".MainAbility",
        "deviceType": [
            "default",
-        "tablet"
+            "tablet",
+            "2in1"
        ],
        "distro": {
            "deliveryWithInstall": true,

--- a/ability/ability_runtime/actssupportfunction/fasupportfunctionthree/entry/src/main/config.json
+++ b/ability/ability_runtime/actssupportfunction/fasupportfunctionthree/entry/src/main/config.json
@@ -18,7 +18,8 @@
        "mainAbility": ".MainAbility",
        "deviceType": [
            "default",
-        "tablet"
+            "tablet",
+            "2in1"
        ],
        "distro": {
            "deliveryWithInstall": true,

--- a/ability/ability_runtime/actssupportfunction/stageonandoffscreen/entry/src/main/module.json
+++ b/ability/ability_runtime/actssupportfunction/stageonandoffscreen/entry/src/main/module.json
@@ -7,7 +7,8 @@
        "mainElement": "MainAbility",
        "deviceTypes": [
            "default",
-        "tablet"
+            "tablet",
+            "2in1"
        ],
        "deliveryWithInstall": true,
        "installationFree": false,

--- a/ability/ability_runtime/actssupportfunction/stagesupportfunction/entry/src/main/module.json
+++ b/ability/ability_runtime/actssupportfunction/stagesupportfunction/entry/src/main/module.json
@@ -7,7 +7,8 @@
        "mainElement": "MainAbility",
        "deviceTypes": [
            "default",
-        "tablet"
+            "tablet",
+            "2in1"
        ],
        "deliveryWithInstall": true,
        "installationFree": false,

--- a/ability/ability_runtime/actssystemapitest/entry/src/main/module.json
+++ b/ability/ability_runtime/actssystemapitest/entry/src/main/module.json
@@ -7,7 +7,8 @@
        "mainElement": "MainAbility",
        "deviceTypes": [
            "default",
-      "tablet"
+            "tablet",
+            "2in1"
        ],
        "deliveryWithInstall": true,
        "installationFree": false,

--- a/ability/ability_runtime/actsuiextensiontest/uiextensionprovider/entry/src/main/module.json
+++ b/ability/ability_runtime/actsuiextensiontest/uiextensionprovider/entry/src/main/module.json
@@ -7,7 +7,8 @@
        "mainElement": "MainAbility",
        "deviceTypes": [
            "default",
-      "tablet"
+            "tablet",
+            "2in1"
        ],
        "deliveryWithInstall": true,
        "installationFree": false,

--- a/ability/ability_runtime/actsuiextensiontest/uiextensiontest/entry/src/main/module.json
+++ b/ability/ability_runtime/actsuiextensiontest/uiextensiontest/entry/src/main/module.json
@@ -7,7 +7,8 @@
        "mainElement": "TestAbility",
        "deviceTypes": [
            "default",
-      "tablet"
+            "tablet",
+            "2in1"
        ],
        "deliveryWithInstall": true,
        "installationFree": false,

--- a/ability/ability_runtime/actsusers/ActsAmsUsersApi7AppA/entry/src/main/config.json
+++ b/ability/ability_runtime/actsusers/ActsAmsUsersApi7AppA/entry/src/main/config.json
@@ -19,7 +19,8 @@
        "srcPath": "",
        "deviceType": [
            "default",
-      "tablet"
+            "tablet",
+            "2in1"
        ],
        "distro": {
            "deliveryWithInstall": true,

--- a/ability/ability_runtime/actsusers/ActsAmsUsersKillProcessAppA/entry/src/main/module.json
+++ b/ability/ability_runtime/actsusers/ActsAmsUsersKillProcessAppA/entry/src/main/module.json
@@ -7,7 +7,8 @@
        "mainElement": "MainAbility",
        "deviceTypes": [
            "default",
-      "tablet"
+            "tablet",
+            "2in1"
        ],
        "deliveryWithInstall": true,
        "installationFree": false,
@@ -34,6 +35,5 @@
                ]
            }
        ]
-    
    }
 }
\ No newline at end of file
--- a/ability/ability_runtime/actsusers/ActsAmsUsersKillProcessAppB/entry/src/main/module.json
+++ b/ability/ability_runtime/actsusers/ActsAmsUsersKillProcessAppB/entry/src/main/module.json
@@ -7,7 +7,8 @@
        "mainElement": "MainAbility",
        "deviceTypes": [
            "default",
-      "tablet"
+            "tablet",
+            "2in1"
        ],
        "deliveryWithInstall": true,
        "installationFree": false,

--- a/ability/ability_runtime/actsusers/ActsAmsUsersKillProcessAppC/entry/src/main/module.json
+++ b/ability/ability_runtime/actsusers/ActsAmsUsersKillProcessAppC/entry/src/main/module.json
@@ -7,7 +7,8 @@
        "mainElement": "MainAbility",
        "deviceTypes": [
            "default",
-      "tablet"
+            "tablet",
+            "2in1"
        ],
        "deliveryWithInstall": true,
        "installationFree": false,

--- a/ability/ability_runtime/actsusers/ActsAmsUsersSystemTest/entry/src/main/module.json
+++ b/ability/ability_runtime/actsusers/ActsAmsUsersSystemTest/entry/src/main/module.json
@@ -7,7 +7,8 @@
        "mainElement": "MainAbility",
        "deviceTypes": [
            "default",
-        "tablet"
+            "tablet",
+            "2in1"
        ],
        "deliveryWithInstall": true,
        "installationFree": false,
@@ -27,7 +28,7 @@
                        "actions": [
                            "action.system.home"
                        ],
-                        "entities":[
+                        "entities": [
                            "entity.system.home"
                        ]
                    }
@@ -82,8 +83,8 @@
                "reason": "need use ohos.permission.GET_RUNNING_INFO"
            },
            {
-            "name":"ohos.permission.START_ABILITIES_FROM_BACKGROUND",
-            "reason":"need use ohos.permission.START_ABILITIES_FROM_BACKGROUND"
+                "name": "ohos.permission.START_ABILITIES_FROM_BACKGROUND",
+                "reason": "need use ohos.permission.START_ABILITIES_FROM_BACKGROUND"
            }
        ]
    }

--- a/ability/ability_runtime/actsusers/ActsAmsUsersThirdTest/entry/src/main/module.json
+++ b/ability/ability_runtime/actsusers/ActsAmsUsersThirdTest/entry/src/main/module.json
@@ -7,7 +7,8 @@
        "mainElement": "MainAbility",
        "deviceTypes": [
            "default",
-            "tablet"
+            "tablet",
+            "2in1"
        ],
        "deliveryWithInstall": true,
        "installationFree": false,
@@ -27,7 +28,7 @@
                        "actions": [
                            "action.system.home"
                        ],
-                        "entities":[
+                        "entities": [
                            "entity.system.home"
                        ]
                    }
@@ -54,8 +55,8 @@
        ],
        "requestPermissions": [
            {
-            "name":"ohos.permission.START_ABILITIES_FROM_BACKGROUND",
-            "reason":"need use ohos.permission.START_ABILITIES_FROM_BACKGROUND"
+                "name": "ohos.permission.START_ABILITIES_FROM_BACKGROUND",
+                "reason": "need use ohos.permission.START_ABILITIES_FROM_BACKGROUND"
            }
        ]
    }

--- a/ability/ability_runtime/amscontextualinforquery/actsamsstaticabilitystagecontexttest/entry/src/main/module.json
+++ b/ability/ability_runtime/amscontextualinforquery/actsamsstaticabilitystagecontexttest/entry/src/main/module.json
@@ -7,7 +7,8 @@
        "mainElement": "com.acts.stabilitystagecontext.MainAbility",
        "deviceTypes": [
            "default",
-            "tablet"
+            "tablet",
+            "2in1"
        ],
        "deliveryWithInstall": true,
        "installationFree": false,
@@ -27,7 +28,7 @@
                        "actions": [
                            "action.system.home"
                        ],
-                        "entities":[
+                        "entities": [
                            "entity.system.home"
                        ]
                    }
@@ -36,12 +37,12 @@
        ],
        "requestPermissions": [
            {
-            "name":"ohos.permission.CLEAN_BACKGROUND_PROCESSES",
-            "reason":"need use ohos.permission.CLEAN_BACKGROUND_PROCESSES"
+                "name": "ohos.permission.CLEAN_BACKGROUND_PROCESSES",
+                "reason": "need use ohos.permission.CLEAN_BACKGROUND_PROCESSES"
            },
            {
-            "name":"ohos.permission.GET_BUNDLE_INFO",
-            "reason":"need use ohos.permission.GET_BUNDLE_INFO"
+                "name": "ohos.permission.GET_BUNDLE_INFO",
+                "reason": "need use ohos.permission.GET_BUNDLE_INFO"
            },
            {
                "name": "ohos.permission.GET_BUNDLE_INFO_PRIVILEGED",

--- a/ability/ability_runtime/amscontextualinforquery/actsamsstatichapa/entry/src/main/module.json
+++ b/ability/ability_runtime/amscontextualinforquery/actsamsstatichapa/entry/src/main/module.json
@@ -7,7 +7,8 @@
        "mainElement": "MainAbility",
        "deviceTypes": [
            "default",
-      "tablet"
+            "tablet",
+            "2in1"
        ],
        "deliveryWithInstall": true,
        "installationFree": false,
@@ -36,16 +37,16 @@
        ],
        "requestPermissions": [
            {
-        "name":"ohos.permission.USE_BLUETOOTH",
-        "reason":"need use ohos.permission.USE_BLUETOOTH"
+                "name": "ohos.permission.USE_BLUETOOTH",
+                "reason": "need use ohos.permission.USE_BLUETOOTH"
            },
            {
-        "name":"ohos.permission.CLEAN_BACKGROUND_PROCESSES",
-        "reason":"need use ohos.permission.CLEAN_BACKGROUND_PROCESSES"
+                "name": "ohos.permission.CLEAN_BACKGROUND_PROCESSES",
+                "reason": "need use ohos.permission.CLEAN_BACKGROUND_PROCESSES"
            },
            {
-        "name":"ohos.permission.GET_BUNDLE_INFO",
-        "reason":"need use ohos.permission.GET_BUNDLE_INFO"
+                "name": "ohos.permission.GET_BUNDLE_INFO",
+                "reason": "need use ohos.permission.GET_BUNDLE_INFO"
            }
        ]
    }

--- a/ability/ability_runtime/amscontextualinforquery/actsamsstatichapb/entry/src/main/module.json
+++ b/ability/ability_runtime/amscontextualinforquery/actsamsstatichapb/entry/src/main/module.json
@@ -7,7 +7,8 @@
        "mainElement": "MainAbility",
        "deviceTypes": [
            "default",
-      "tablet"
+            "tablet",
+            "2in1"
        ],
        "deliveryWithInstall": true,
        "installationFree": false,
@@ -36,16 +37,16 @@
        ],
        "requestPermissions": [
            {
-        "name":"ohos.permission.USE_BLUETOOTH",
-        "reason":"need use ohos.permission.USE_BLUETOOTH"
+                "name": "ohos.permission.USE_BLUETOOTH",
+                "reason": "need use ohos.permission.USE_BLUETOOTH"
            },
            {
-        "name":"ohos.permission.CLEAN_BACKGROUND_PROCESSES",
-        "reason":"need use ohos.permission.CLEAN_BACKGROUND_PROCESSES"
+                "name": "ohos.permission.CLEAN_BACKGROUND_PROCESSES",
+                "reason": "need use ohos.permission.CLEAN_BACKGROUND_PROCESSES"
            },
            {
-        "name":"ohos.permission.GET_BUNDLE_INFO",
-        "reason":"need use ohos.permission.GET_BUNDLE_INFO"
+                "name": "ohos.permission.GET_BUNDLE_INFO",
+                "reason": "need use ohos.permission.GET_BUNDLE_INFO"
            }
        ]
    }

--- a/ability/ability_runtime/amscontextualinforquery/actsamsstaticinfomationquerytest/entry/src/main/module.json
+++ b/ability/ability_runtime/amscontextualinforquery/actsamsstaticinfomationquerytest/entry/src/main/module.json
@@ -7,7 +7,8 @@
        "mainElement": "com.acts.staticinfomationquery.MainAbility",
        "deviceTypes": [
            "default",
-            "tablet"
+            "tablet",
+            "2in1"
        ],
        "deliveryWithInstall": true,
        "installationFree": false,
@@ -27,7 +28,7 @@
                        "actions": [
                            "action.system.home"
                        ],
-                        "entities":[
+                        "entities": [
                            "entity.system.home"
                        ]
                    }
@@ -36,16 +37,16 @@
        ],
        "requestPermissions": [
            {
-            "name":"ohos.permission.CLEAN_BACKGROUND_PROCESSES",
-            "reason":"need use ohos.permission.CLEAN_BACKGROUND_PROCESSES"
+                "name": "ohos.permission.CLEAN_BACKGROUND_PROCESSES",
+                "reason": "need use ohos.permission.CLEAN_BACKGROUND_PROCESSES"
            },
            {
-            "name":"ohos.permission.GET_BUNDLE_INFO",
-            "reason":"need use ohos.permission.GET_BUNDLE_INFO"
+                "name": "ohos.permission.GET_BUNDLE_INFO",
+                "reason": "need use ohos.permission.GET_BUNDLE_INFO"
            },
            {
-            "name":"ohos.permission.GET_BUNDLE_INFO_PRIVILEGED",
-            "reason":"need use ohos.permission.GET_BUNDLE_INFO_PRIVILEGED"
+                "name": "ohos.permission.GET_BUNDLE_INFO_PRIVILEGED",
+                "reason": "need use ohos.permission.GET_BUNDLE_INFO_PRIVILEGED"
            }
        ]
    }

--- a/ability/ability_runtime/amscontextualinforquery/actsamsstaticinformationmultipletest/entry/src/main/module.json
+++ b/ability/ability_runtime/amscontextualinforquery/actsamsstaticinformationmultipletest/entry/src/main/module.json
@@ -7,7 +7,8 @@
        "mainElement": "MainAbility",
        "deviceTypes": [
            "default",
-      "tablet"
+            "tablet",
+            "2in1"
        ],
        "deliveryWithInstall": true,
        "installationFree": false,

--- a/ability/ability_runtime/amscontextualinforquery/actsamsstaticinformationmultitest/entry/src/main/module.json
+++ b/ability/ability_runtime/amscontextualinforquery/actsamsstaticinformationmultitest/entry/src/main/module.json
@@ -7,7 +7,8 @@
        "mainElement": "MainAbility",
        "deviceTypes": [
            "default",
-            "tablet"
+            "tablet",
+            "2in1"
        ],
        "deliveryWithInstall": true,
        "installationFree": false,
@@ -27,7 +28,7 @@
                        "actions": [
                            "action.system.home"
                        ],
-                        "entities":[
+                        "entities": [
                            "entity.system.home"
                        ]
                    }
@@ -36,16 +37,16 @@
        ],
        "requestPermissions": [
            {
-            "name":"ohos.permission.USE_BLUETOOTH",
-            "reason":"need use ohos.permission.USE_BLUETOOTH"
+                "name": "ohos.permission.USE_BLUETOOTH",
+                "reason": "need use ohos.permission.USE_BLUETOOTH"
            },
            {
-            "name":"ohos.permission.CLEAN_BACKGROUND_PROCESSES",
-            "reason":"need use ohos.permission.CLEAN_BACKGROUND_PROCESSES"
+                "name": "ohos.permission.CLEAN_BACKGROUND_PROCESSES",
+                "reason": "need use ohos.permission.CLEAN_BACKGROUND_PROCESSES"
            },
            {
-            "name":"ohos.permission.GET_BUNDLE_INFO",
-            "reason":"need use ohos.permission.GET_BUNDLE_INFO"
+                "name": "ohos.permission.GET_BUNDLE_INFO",
+                "reason": "need use ohos.permission.GET_BUNDLE_INFO"
            }
        ]
    }

--- a/ability/ability_runtime/amscontextualinforquery/actsamsstaticquerytesttwohap/entry/src/main/module.json
+++ b/ability/ability_runtime/amscontextualinforquery/actsamsstaticquerytesttwohap/entry/src/main/module.json
@@ -7,7 +7,8 @@
        "mainElement": "MainAbility",
        "deviceTypes": [
            "default",
-            "tablet"
+            "tablet",
+            "2in1"
        ],
        "deliveryWithInstall": true,
        "installationFree": false,
@@ -27,7 +28,7 @@
                        "actions": [
                            "action.system.home"
                        ],
-                        "entities":[
+                        "entities": [
                            "entity.system.home"
                        ]
                    }
@@ -43,6 +44,5 @@
                "orientation": "portrait"
            }
        ]
-
    }
 }
\ No newline at end of file
--- a/ability/ability_runtime/amsdatauriutils/src/main/config.json
+++ b/ability/ability_runtime/amsdatauriutils/src/main/config.json
@@ -18,7 +18,8 @@
        "name": ".entry",
        "deviceType": [
            "default",
-            "tablet"
+            "tablet",
+            "2in1"
        ],
        "distro": {
            "deliveryWithInstall": true,

--- a/ability/ability_runtime/amsdisplayIdtest/actsamsspecifytesthap/entry/src/main/module.json
+++ b/ability/ability_runtime/amsdisplayIdtest/actsamsspecifytesthap/entry/src/main/module.json
@@ -7,7 +7,8 @@
        "mainElement": "MainAbility",
        "deviceTypes": [
            "default",
-        "tablet"
+            "tablet",
+            "2in1"
        ],
        "deliveryWithInstall": true,
        "installationFree": false,

--- a/ability/ability_runtime/amsdisplayIdtest/actsamsstartabilityforresulttest/entry/src/main/module.json
+++ b/ability/ability_runtime/amsdisplayIdtest/actsamsstartabilityforresulttest/entry/src/main/module.json
@@ -7,7 +7,8 @@
        "mainElement": "MainAbility",
        "deviceTypes": [
            "default",
-        "tablet"
+            "tablet",
+            "2in1"
        ],
        "deliveryWithInstall": true,
        "installationFree": false,

--- a/ability/ability_runtime/amsdisplayIdtest/actsamsstartabilitytest/entry/src/main/module.json
+++ b/ability/ability_runtime/amsdisplayIdtest/actsamsstartabilitytest/entry/src/main/module.json
@@ -7,7 +7,8 @@
        "mainElement": "MainAbility",
        "deviceTypes": [
            "default",
-            "tablet"
+            "tablet",
+            "2in1"
        ],
        "deliveryWithInstall": true,
        "installationFree": false,
@@ -27,7 +28,7 @@
                        "actions": [
                            "action.system.home"
                        ],
-                        "entities":[
+                        "entities": [
                            "entity.system.home"
                        ]
                    }
@@ -48,8 +49,8 @@
                "reason": "need use ohos.permission.GET_BUNDLE_INFO_PRIVILEGED"
            },
            {
-            "name":"ohos.permission.START_ABILITIES_FROM_BACKGROUND",
-            "reason":"need use ohos.permission.START_ABILITIES_FROM_BACKGROUND"
+                "name": "ohos.permission.START_ABILITIES_FROM_BACKGROUND",
+                "reason": "need use ohos.permission.START_ABILITIES_FROM_BACKGROUND"
            }
        ]
    }

--- a/ability/ability_runtime/amsgetabilityprocessinfo/actsgetabilityprocessinfotest/src/main/config.json
+++ b/ability/ability_runtime/amsgetabilityprocessinfo/actsgetabilityprocessinfotest/src/main/config.json
--- a/ability/ability_runtime/apicover/apicoverhaptest/entry/src/main/module.json
+++ b/ability/ability_runtime/apicover/apicoverhaptest/entry/src/main/module.json
--- a/ability/ability_runtime/apicover/fasupplement/entry/src/main/config.json
+++ b/ability/ability_runtime/apicover/fasupplement/entry/src/main/config.json
--- a/ability/ability_runtime/apicover/formmodule/entry/src/main/module.json
+++ b/ability/ability_runtime/apicover/formmodule/entry/src/main/module.json
--- a/ability/ability_runtime/apicover/stagesupplement/entry/src/main/module.json
+++ b/ability/ability_runtime/apicover/stagesupplement/entry/src/main/module.json
--- a/ability/ability_runtime/apitest/entry/src/main/module.json
+++ b/ability/ability_runtime/apitest/entry/src/main/module.json
--- a/ability/ability_runtime/context/actscontexttest/src/main/config.json
+++ b/ability/ability_runtime/context/actscontexttest/src/main/config.json
--- a/ability/ability_runtime/context/actscreatemodulecontextassist/entry/src/main/module.json
+++ b/ability/ability_runtime/context/actscreatemodulecontextassist/entry/src/main/module.json
--- a/ability/ability_runtime/context/actscreatemodulecontextassistone/entry/src/main/module.json
+++ b/ability/ability_runtime/context/actscreatemodulecontextassistone/entry/src/main/module.json
--- a/ability/ability_runtime/context/actscreatemodulecontexttest/entry/src/main/module.json
+++ b/ability/ability_runtime/context/actscreatemodulecontexttest/entry/src/main/module.json
--- a/ability/ability_runtime/context/actsfa8contexttest/entry/src/main/config.json
+++ b/ability/ability_runtime/context/actsfa8contexttest/entry/src/main/config.json
--- a/ability/ability_runtime/context/actsfacontexttest/entry/src/main/config.json
+++ b/ability/ability_runtime/context/actsfacontexttest/entry/src/main/config.json
--- a/ability/ability_runtime/context/actsstageappcontext/actsstageappcontexttest/entry/src/main/module.json
+++ b/ability/ability_runtime/context/actsstageappcontext/actsstageappcontexttest/entry/src/main/module.json
--- a/ability/ability_runtime/context/actsstagecontext/actsstagecontextassistone/entry/src/main/module.json
+++ b/ability/ability_runtime/context/actsstagecontext/actsstagecontextassistone/entry/src/main/module.json
--- a/ability/ability_runtime/context/actsstagecontext/actsstagecontextassisttwo/entry/src/main/module.json
+++ b/ability/ability_runtime/context/actsstagecontext/actsstagecontextassisttwo/entry/src/main/module.json
--- a/ability/ability_runtime/context/actsstagecontext/actsstagecontextpropertiestest/entry/src/main/module.json
+++ b/ability/ability_runtime/context/actsstagecontext/actsstagecontextpropertiestest/entry/src/main/module.json
--- a/ability/ability_runtime/context/actsstagecontexttest/entry/src/main/module.json
+++ b/ability/ability_runtime/context/actsstagecontexttest/entry/src/main/module.json
--- a/ability/ability_runtime/context/actsstagecontexttest/module1/src/main/module.json
+++ b/ability/ability_runtime/context/actsstagecontexttest/module1/src/main/module.json
--- a/ability/ability_runtime/context/scene/contextapp/entry/src/main/module.json
+++ b/ability/ability_runtime/context/scene/contextapp/entry/src/main/module.json
--- a/ability/ability_runtime/context/scene/defpermission/src/main/config.json
+++ b/ability/ability_runtime/context/scene/defpermission/src/main/config.json
--- a/ability/ability_runtime/context/scene/fa8app/entry/src/main/config.json
+++ b/ability/ability_runtime/context/scene/fa8app/entry/src/main/config.json
--- a/ability/ability_runtime/fa/faapplicationinfo/src/main/config.json
+++ b/ability/ability_runtime/fa/faapplicationinfo/src/main/config.json
--- a/ability/ability_runtime/fa/faconfigurationconstant/src/main/config.json
+++ b/ability/ability_runtime/fa/faconfigurationconstant/src/main/config.json
--- a/ability/ability_runtime/fa/facoverapi/src/main/config.json
+++ b/ability/ability_runtime/fa/facoverapi/src/main/config.json
--- a/ability/ability_runtime/faapicover/faapicoverhaptest/entry/src/main/config.json
+++ b/ability/ability_runtime/faapicover/faapicoverhaptest/entry/src/main/config.json
--- a/ability/ability_runtime/faapicover/faauxiliary/entry/src/main/config.json
+++ b/ability/ability_runtime/faapicover/faauxiliary/entry/src/main/config.json
--- a/ability/ability_runtime/featureability/actsfeatureabilitytest/entry/src/main/config.json
+++ b/ability/ability_runtime/featureability/actsfeatureabilitytest/entry/src/main/config.json
--- a/ability/ability_runtime/featureability/sceneproject/finishwithresultemptytest/src/main/config.json
+++ b/ability/ability_runtime/featureability/sceneproject/finishwithresultemptytest/src/main/config.json
--- a/ability/ability_runtime/featureability/sceneproject/finishwithresultpromiseparameterstest/src/main/config.json
+++ b/ability/ability_runtime/featureability/sceneproject/finishwithresultpromiseparameterstest/src/main/config.json
--- a/ability/ability_runtime/featureability/sceneproject/finishwithresulttest/src/main/config.json
+++ b/ability/ability_runtime/featureability/sceneproject/finishwithresulttest/src/main/config.json
--- a/ability/ability_runtime/featureability/sceneproject/getcallingbundletest/src/main/config.json
+++ b/ability/ability_runtime/featureability/sceneproject/getcallingbundletest/src/main/config.json
--- a/ability/ability_runtime/featureability/sceneproject/startability/src/main/config.json
+++ b/ability/ability_runtime/featureability/sceneproject/startability/src/main/config.json
--- a/ability/ability_runtime/featureability/sceneproject/startabilityforresult/src/main/config.json
+++ b/ability/ability_runtime/featureability/sceneproject/startabilityforresult/src/main/config.json
--- a/ability/ability_runtime/featureability/sceneproject/terminateabilitytest/src/main/config.json
+++ b/ability/ability_runtime/featureability/sceneproject/terminateabilitytest/src/main/config.json
--- a/ability/ability_runtime/formmanager/fa/formhostst_ets/formsystemhost/entry/src/main/config.json
+++ b/ability/ability_runtime/formmanager/fa/formhostst_ets/formsystemhost/entry/src/main/config.json
--- a/ability/ability_runtime/formmanager/fa/formhostst_ets/formsystemhostb/entry/src/main/config.json
+++ b/ability/ability_runtime/formmanager/fa/formhostst_ets/formsystemhostb/entry/src/main/config.json
--- a/ability/ability_runtime/formmanager/fa/formhostst_ets/formsystemhostc/entry/src/main/config.json
+++ b/ability/ability_runtime/formmanager/fa/formhostst_ets/formsystemhostc/entry/src/main/config.json
--- a/ability/ability_runtime/formmanager/fa/formhostst_ets/formsystemhostd/entry/src/main/config.json
+++ b/ability/ability_runtime/formmanager/fa/formhostst_ets/formsystemhostd/entry/src/main/config.json
--- a/ability/ability_runtime/formmanager/fa/formhostst_ets/formsystemhoste/entry/src/main/config.json
+++ b/ability/ability_runtime/formmanager/fa/formhostst_ets/formsystemhoste/entry/src/main/config.json
--- a/ability/ability_runtime/formmanager/fa/formhostst_ets/formsystemhostf/entry/src/main/config.json
+++ b/ability/ability_runtime/formmanager/fa/formhostst_ets/formsystemhostf/entry/src/main/config.json
--- a/ability/ability_runtime/formmanager/fa/formhostst_ets/formsystemhostg/entry/src/main/config.json
+++ b/ability/ability_runtime/formmanager/fa/formhostst_ets/formsystemhostg/entry/src/main/config.json
--- a/ability/ability_runtime/formmanager/fa/formhostst_ets/formsystemhosti/entry/src/main/config.json
+++ b/ability/ability_runtime/formmanager/fa/formhostst_ets/formsystemhosti/entry/src/main/config.json
--- a/ability/ability_runtime/formmanager/fa/formhostst_ets/formsystemhostj/entry/src/main/config.json
+++ b/ability/ability_runtime/formmanager/fa/formhostst_ets/formsystemhostj/entry/src/main/config.json
--- a/ability/ability_runtime/formmanager/fa/formhostst_ets/formsystemhostk/entry/src/main/config.json
+++ b/ability/ability_runtime/formmanager/fa/formhostst_ets/formsystemhostk/entry/src/main/config.json
--- a/ability/ability_runtime/formmanager/fa/formhostst_ets/formsystemhostl/entry/src/main/config.json
+++ b/ability/ability_runtime/formmanager/fa/formhostst_ets/formsystemhostl/entry/src/main/config.json
--- a/ability/ability_runtime/formmanager/fa/formhostst_ets/formsystemhostn/entry/src/main/config.json
+++ b/ability/ability_runtime/formmanager/fa/formhostst_ets/formsystemhostn/entry/src/main/config.json
--- a/ability/ability_runtime/formmanager/fa/formhostst_ets/formsystemhostnoperm/entry/src/main/config.json
+++ b/ability/ability_runtime/formmanager/fa/formhostst_ets/formsystemhostnoperm/entry/src/main/config.json
--- a/ability/ability_runtime/formmanager/fa/formhostst_ets/formsystemhosto/entry/src/main/config.json
+++ b/ability/ability_runtime/formmanager/fa/formhostst_ets/formsystemhosto/entry/src/main/config.json
--- a/ability/ability_runtime/formmanager/fa/formhostst_ets/formsystemhostp/entry/src/main/config.json
+++ b/ability/ability_runtime/formmanager/fa/formhostst_ets/formsystemhostp/entry/src/main/config.json
--- a/ability/ability_runtime/formmanager/fa/formproviderst_ets/formsupplyapplicationA/entry/src/main/config.json
+++ b/ability/ability_runtime/formmanager/fa/formproviderst_ets/formsupplyapplicationA/entry/src/main/config.json
--- a/ability/ability_runtime/formmanager/fa/formproviderst_ets/formsupplyapplicationB/entry/src/main/config.json
+++ b/ability/ability_runtime/formmanager/fa/formproviderst_ets/formsupplyapplicationB/entry/src/main/config.json
--- a/ability/ability_runtime/formmanager/fa/formproviderst_ets/formsupplyapplicationC/entry/src/main/config.json
+++ b/ability/ability_runtime/formmanager/fa/formproviderst_ets/formsupplyapplicationC/entry/src/main/config.json
--- a/ability/ability_runtime/formmanager/fa/formproviderst_ets/formsupplyapplicationD/entry/src/main/config.json
+++ b/ability/ability_runtime/formmanager/fa/formproviderst_ets/formsupplyapplicationD/entry/src/main/config.json
--- a/ability/ability_runtime/formmanager/fa/formproviderst_ets/formsupplyapplicationE/entry/src/main/config.json
+++ b/ability/ability_runtime/formmanager/fa/formproviderst_ets/formsupplyapplicationE/entry/src/main/config.json
--- a/ability/ability_runtime/formmanager/fa/formproviderst_ets/formsupplyapplicationF/entry/src/main/config.json
+++ b/ability/ability_runtime/formmanager/fa/formproviderst_ets/formsupplyapplicationF/entry/src/main/config.json
--- a/ability/ability_runtime/formmanager/fa/formproviderst_ets/formsupplyapplicationG/entry/src/main/config.json
+++ b/ability/ability_runtime/formmanager/fa/formproviderst_ets/formsupplyapplicationG/entry/src/main/config.json
--- a/ability/ability_runtime/formmanager/fa/formproviderst_ets/formsupplyapplicationH/entry/src/main/config.json
+++ b/ability/ability_runtime/formmanager/fa/formproviderst_ets/formsupplyapplicationH/entry/src/main/config.json
--- a/ability/ability_runtime/formmanager/fa/formproviderst_ets/formsupplyapplicationNotSysApp/entry/src/main/config.json
+++ b/ability/ability_runtime/formmanager/fa/formproviderst_ets/formsupplyapplicationNotSysApp/entry/src/main/config.json
--- a/ability/ability_runtime/formmanager/fa/formproviderst_ets/formsystemprovidera/entry/src/main/config.json
+++ b/ability/ability_runtime/formmanager/fa/formproviderst_ets/formsystemprovidera/entry/src/main/config.json
--- a/ability/ability_runtime/formmanager/fa/formproviderst_ets/formsystemproviderb/entry/src/main/config.json
+++ b/ability/ability_runtime/formmanager/fa/formproviderst_ets/formsystemproviderb/entry/src/main/config.json
--- a/ability/ability_runtime/formmanager/fa/formproviderst_ets/formsystemproviderc/entry/src/main/config.json
+++ b/ability/ability_runtime/formmanager/fa/formproviderst_ets/formsystemproviderc/entry/src/main/config.json
--- a/ability/ability_runtime/formmanager/fa/formproviderst_ets/formsystemproviderd/entry/src/main/config.json
+++ b/ability/ability_runtime/formmanager/fa/formproviderst_ets/formsystemproviderd/entry/src/main/config.json
--- a/ability/ability_runtime/formmanager/fa/formsystemtest_ets/formacquiretest/entry/src/main/config.json
+++ b/ability/ability_runtime/formmanager/fa/formsystemtest_ets/formacquiretest/entry/src/main/config.json
--- a/ability/ability_runtime/formmanager/fa/formsystemtest_ets/formacquiretest2/entry/src/main/config.json
+++ b/ability/ability_runtime/formmanager/fa/formsystemtest_ets/formacquiretest2/entry/src/main/config.json
--- a/ability/ability_runtime/formmanager/fa/formsystemtest_ets/formdeletetest/entry/src/main/config.json
+++ b/ability/ability_runtime/formmanager/fa/formsystemtest_ets/formdeletetest/entry/src/main/config.json
--- a/ability/ability_runtime/formmanager/fa/formsystemtest_ets/formdynamicrefreshtest/entry/src/main/config.json
+++ b/ability/ability_runtime/formmanager/fa/formsystemtest_ets/formdynamicrefreshtest/entry/src/main/config.json
--- a/ability/ability_runtime/formmanager/fa/formsystemtest_ets/formfuzztest/entry/src/main/config.json
+++ b/ability/ability_runtime/formmanager/fa/formsystemtest_ets/formfuzztest/entry/src/main/config.json
--- a/ability/ability_runtime/formmanager/fa/formsystemtest_ets/formgetformsinfotest/formsoneandonetest/entry/src/main/config.json
+++ b/ability/ability_runtime/formmanager/fa/formsystemtest_ets/formgetformsinfotest/formsoneandonetest/entry/src/main/config.json
--- a/ability/ability_runtime/formmanager/fa/formsystemtest_ets/formgetformsinfotest/formsoneandtwotest/entry/src/main/config.json
+++ b/ability/ability_runtime/formmanager/fa/formsystemtest_ets/formgetformsinfotest/formsoneandtwotest/entry/src/main/config.json
--- a/ability/ability_runtime/formmanager/fa/formsystemtest_ets/formgetformsinfotest/formsoneandzerotest/entry/src/main/config.json
+++ b/ability/ability_runtime/formmanager/fa/formsystemtest_ets/formgetformsinfotest/formsoneandzerotest/entry/src/main/config.json
--- a/ability/ability_runtime/formmanager/fa/formsystemtest_ets/formgetformsinfotest/formswithoutpermtest/entry/src/main/config.json
+++ b/ability/ability_runtime/formmanager/fa/formsystemtest_ets/formgetformsinfotest/formswithoutpermtest/entry/src/main/config.json
--- a/ability/ability_runtime/formmanager/fa/formsystemtest_ets/formgetformsinfotest/formszerotest/entry/src/main/config.json
+++ b/ability/ability_runtime/formmanager/fa/formsystemtest_ets/formgetformsinfotest/formszerotest/entry/src/main/config.json
--- a/ability/ability_runtime/formmanager/fa/formsystemtest_ets/formhostdeathrecipienttest/entry/src/main/config.json
+++ b/ability/ability_runtime/formmanager/fa/formsystemtest_ets/formhostdeathrecipienttest/entry/src/main/config.json
--- a/ability/ability_runtime/formmanager/fa/formsystemtest_ets/formreleasetest/entry/src/main/config.json
+++ b/ability/ability_runtime/formmanager/fa/formsystemtest_ets/formreleasetest/entry/src/main/config.json
--- a/ability/ability_runtime/formmanager/fa/formsystemtest_ets/formstatetest_disable/entry/src/main/config.json
+++ b/ability/ability_runtime/formmanager/fa/formsystemtest_ets/formstatetest_disable/entry/src/main/config.json
--- a/ability/ability_runtime/formmanager/fa/formsystemtest_ets/formstatetest_enable/entry/src/main/config.json
+++ b/ability/ability_runtime/formmanager/fa/formsystemtest_ets/formstatetest_enable/entry/src/main/config.json
--- a/ability/ability_runtime/formmanager/fa/formsystemtest_ets/formstresstest/entry/src/main/config.json
+++ b/ability/ability_runtime/formmanager/fa/formsystemtest_ets/formstresstest/entry/src/main/config.json
--- a/ability/ability_runtime/formmanager/fa/formsystemtest_ets/formupdatefreshtest/entry/src/main/config.json
+++ b/ability/ability_runtime/formmanager/fa/formsystemtest_ets/formupdatefreshtest/entry/src/main/config.json
--- a/ability/ability_runtime/formmanager/stage/actsformprovidergetformsinfo/entry/src/main/module.json
+++ b/ability/ability_runtime/formmanager/stage/actsformprovidergetformsinfo/entry/src/main/module.json
--- a/ability/ability_runtime/formmanager/stage/actsformprovidergetformsinfo/module1/src/main/module.json
+++ b/ability/ability_runtime/formmanager/stage/actsformprovidergetformsinfo/module1/src/main/module.json
--- a/ability/ability_runtime/formmanager/stage/actsformprovidergetformsinfo/module2/src/main/module.json
+++ b/ability/ability_runtime/formmanager/stage/actsformprovidergetformsinfo/module2/src/main/module.json
--- a/ability/ability_runtime/freeinstalltest/connectabilityfatest/actsfreeinstallconnectabilityfatest/entry/src/main/config.json
+++ b/ability/ability_runtime/freeinstalltest/connectabilityfatest/actsfreeinstallconnectabilityfatest/entry/src/main/config.json
--- a/ability/ability_runtime/freeinstalltest/connectabilityfatest/connectdifferentapplication/entry/src/main/module.json
+++ b/ability/ability_runtime/freeinstalltest/connectabilityfatest/connectdifferentapplication/entry/src/main/module.json
--- a/ability/ability_runtime/freeinstalltest/connectabilityfatest/connectfamyapplication1/entry/src/main/config.json
+++ b/ability/ability_runtime/freeinstalltest/connectabilityfatest/connectfamyapplication1/entry/src/main/config.json
--- a/ability/ability_runtime/freeinstalltest/connectabilityfatest/connectfamyapplication10/entry/src/main/config.json
+++ b/ability/ability_runtime/freeinstalltest/connectabilityfatest/connectfamyapplication10/entry/src/main/config.json
--- a/ability/ability_runtime/freeinstalltest/connectabilityfatest/connectfamyapplication11/entry/src/main/config.json
+++ b/ability/ability_runtime/freeinstalltest/connectabilityfatest/connectfamyapplication11/entry/src/main/config.json
--- a/ability/ability_runtime/freeinstalltest/connectabilityfatest/connectfamyapplication2/entry/src/main/config.json
+++ b/ability/ability_runtime/freeinstalltest/connectabilityfatest/connectfamyapplication2/entry/src/main/config.json
--- a/ability/ability_runtime/freeinstalltest/connectabilityfatest/connectfamyapplication4/entry/src/main/config.json
+++ b/ability/ability_runtime/freeinstalltest/connectabilityfatest/connectfamyapplication4/entry/src/main/config.json
--- a/ability/ability_runtime/freeinstalltest/connectabilityfatest/connectfamyapplication5/entry/src/main/config.json
+++ b/ability/ability_runtime/freeinstalltest/connectabilityfatest/connectfamyapplication5/entry/src/main/config.json
--- a/ability/ability_runtime/freeinstalltest/connectabilityfatest/connectfamyapplication6/entry/src/main/config.json
+++ b/ability/ability_runtime/freeinstalltest/connectabilityfatest/connectfamyapplication6/entry/src/main/config.json
--- a/ability/ability_runtime/freeinstalltest/connectabilityfatest/connectfamyapplication7/entry/src/main/config.json
+++ b/ability/ability_runtime/freeinstalltest/connectabilityfatest/connectfamyapplication7/entry/src/main/config.json
--- a/ability/ability_runtime/freeinstalltest/connectabilityfatest/connectfamyapplication8/entry/src/main/config.json
+++ b/ability/ability_runtime/freeinstalltest/connectabilityfatest/connectfamyapplication8/entry/src/main/config.json
--- a/ability/ability_runtime/freeinstalltest/connectabilityfatest/connectfamyapplication9/entry/src/main/config.json
+++ b/ability/ability_runtime/freeinstalltest/connectabilityfatest/connectfamyapplication9/entry/src/main/config.json
--- a/ability/ability_runtime/freeinstalltest/mockservice/entry/src/main/module.json
+++ b/ability/ability_runtime/freeinstalltest/mockservice/entry/src/main/module.json
--- a/ability/ability_runtime/freeinstalltest/mockservicetimeout/entry/src/main/module.json
+++ b/ability/ability_runtime/freeinstalltest/mockservicetimeout/entry/src/main/module.json
--- a/ability/ability_runtime/freeinstalltest/startabilityfatest/actsstartabilitynotargetbundlelistfatest/entry/src/main/config.json
+++ b/ability/ability_runtime/freeinstalltest/startabilityfatest/actsstartabilitynotargetbundlelistfatest/entry/src/main/config.json
--- a/ability/ability_runtime/freeinstalltest/startabilityfatest/atomizationfaentry/entry/src/main/config.json
+++ b/ability/ability_runtime/freeinstalltest/startabilityfatest/atomizationfaentry/entry/src/main/config.json
--- a/ability/ability_runtime/freeinstalltest/startabilityfatest/famyapplication1/entry/src/main/config.json
+++ b/ability/ability_runtime/freeinstalltest/startabilityfatest/famyapplication1/entry/src/main/config.json
--- a/ability/ability_runtime/freeinstalltest/startabilityforresultfatest/actsstartabilityforresultnotargetfatest/entry/src/main/config.json
+++ b/ability/ability_runtime/freeinstalltest/startabilityforresultfatest/actsstartabilityforresultnotargetfatest/entry/src/main/config.json
--- a/ability/ability_runtime/freeinstalltest/startabilityforresultfatest/atomizationresultfaentry/entry/src/main/config.json
+++ b/ability/ability_runtime/freeinstalltest/startabilityforresultfatest/atomizationresultfaentry/entry/src/main/config.json
--- a/ability/ability_runtime/freeinstalltest/startabilityforresultfatest/faresultmyapplication1/entry/src/main/config.json
+++ b/ability/ability_runtime/freeinstalltest/startabilityforresultfatest/faresultmyapplication1/entry/src/main/config.json
--- a/ability/ability_runtime/freeinstalltest/startabilityforresultstagetest/actsfreeinstallstartabilityforresultstagetest/entry/src/main/module.json
+++ b/ability/ability_runtime/freeinstalltest/startabilityforresultstagetest/actsfreeinstallstartabilityforresultstagetest/entry/src/main/module.json
--- a/ability/ability_runtime/freeinstalltest/startabilityforresultstagetest/actsstartabilityforresultnotargetbundleliststagetest/entry/src/main/module.json
+++ b/ability/ability_runtime/freeinstalltest/startabilityforresultstagetest/actsstartabilityforresultnotargetbundleliststagetest/entry/src/main/module.json
--- a/ability/ability_runtime/freeinstalltest/startabilityforresultstagetest/atomizationresultstageentry/entry/src/main/module.json
+++ b/ability/ability_runtime/freeinstalltest/startabilityforresultstagetest/atomizationresultstageentry/entry/src/main/module.json
--- a/ability/ability_runtime/freeinstalltest/startabilityforresultstagetest/atomizationresultstagehm2/entry/src/main/module.json
+++ b/ability/ability_runtime/freeinstalltest/startabilityforresultstagetest/atomizationresultstagehm2/entry/src/main/module.json
--- a/ability/ability_runtime/freeinstalltest/startabilityforresultstagetest/atomizationresultstagehnm2/entry/src/main/module.json
+++ b/ability/ability_runtime/freeinstalltest/startabilityforresultstagetest/atomizationresultstagehnm2/entry/src/main/module.json
--- a/ability/ability_runtime/freeinstalltest/startabilityforresultstagetest/stageresultmyapplication1/entry/src/main/module.json
+++ b/ability/ability_runtime/freeinstalltest/startabilityforresultstagetest/stageresultmyapplication1/entry/src/main/module.json
--- a/ability/ability_runtime/freeinstalltest/startabilitystagetest/actsfreeinstallstartabilitystagetest/entry/src/main/module.json
+++ b/ability/ability_runtime/freeinstalltest/startabilitystagetest/actsfreeinstallstartabilitystagetest/entry/src/main/module.json
--- a/ability/ability_runtime/freeinstalltest/startabilitystagetest/actsstartabilitynotargetbundleliststagetest/entry/src/main/module.json
+++ b/ability/ability_runtime/freeinstalltest/startabilitystagetest/actsstartabilitynotargetbundleliststagetest/entry/src/main/module.json
--- a/ability/ability_runtime/freeinstalltest/startabilitystagetest/atomizationstageentry/entry/src/main/module.json
+++ b/ability/ability_runtime/freeinstalltest/startabilitystagetest/atomizationstageentry/entry/src/main/module.json
--- a/ability/ability_runtime/freeinstalltest/startabilitystagetest/atomizationstagehm2/entry/src/main/module.json
+++ b/ability/ability_runtime/freeinstalltest/startabilitystagetest/atomizationstagehm2/entry/src/main/module.json
--- a/ability/ability_runtime/freeinstalltest/startabilitystagetest/atomizationstagehm4/entry/src/main/module.json
+++ b/ability/ability_runtime/freeinstalltest/startabilitystagetest/atomizationstagehm4/entry/src/main/module.json
--- a/ability/ability_runtime/freeinstalltest/startabilitystagetest/stagemyapplication1/entry/src/main/module.json
+++ b/ability/ability_runtime/freeinstalltest/startabilitystagetest/stagemyapplication1/entry/src/main/module.json
--- a/ability/ability_runtime/newwant/actsnewwantapi7relyhap/entry/src/main/config.json
+++ b/ability/ability_runtime/newwant/actsnewwantapi7relyhap/entry/src/main/config.json
--- a/ability/ability_runtime/newwant/actsnewwantarelyhap/entry/src/main/module.json
+++ b/ability/ability_runtime/newwant/actsnewwantarelyhap/entry/src/main/module.json
--- a/ability/ability_runtime/newwant/actsnewwantbrelyhap/entry/src/main/module.json
+++ b/ability/ability_runtime/newwant/actsnewwantbrelyhap/entry/src/main/module.json
--- a/ability/ability_runtime/newwant/actsnewwantrelyhap/entry/src/main/module.json
+++ b/ability/ability_runtime/newwant/actsnewwantrelyhap/entry/src/main/module.json
--- a/ability/ability_runtime/newwant/actsnewwanttest/entry/src/main/module.json
+++ b/ability/ability_runtime/newwant/actsnewwanttest/entry/src/main/module.json
--- a/ability/ability_runtime/non_concurrent/acts_systemappa_test/entry/src/main/module.json
+++ b/ability/ability_runtime/non_concurrent/acts_systemappa_test/entry/src/main/module.json
--- a/ability/ability_runtime/non_concurrent/acts_systemappone_rely_test/entry/src/main/module.json
+++ b/ability/ability_runtime/non_concurrent/acts_systemappone_rely_test/entry/src/main/module.json
--- a/ability/ability_runtime/registerjserror/ActsRegisterJsErrorRely/entry/src/main/module.json
+++ b/ability/ability_runtime/registerjserror/ActsRegisterJsErrorRely/entry/src/main/module.json
--- a/ability/ability_runtime/registerjserror/ActsRegisterJsErrorTest/entry/src/main/module.json
+++ b/ability/ability_runtime/registerjserror/ActsRegisterJsErrorTest/entry/src/main/module.json
--- a/ability/ability_runtime/stage/actsdebuggabletest/actsdebuggabletest/entry/src/main/module.json
+++ b/ability/ability_runtime/stage/actsdebuggabletest/actsdebuggabletest/entry/src/main/module.json
--- a/ability/ability_runtime/stage/actsdebuggabletest/timeout/entry/src/main/module.json
+++ b/ability/ability_runtime/stage/actsdebuggabletest/timeout/entry/src/main/module.json
--- a/ability/ability_runtime/stage/actslifecyclemultihap2/entry/src/main/module.json
+++ b/ability/ability_runtime/stage/actslifecyclemultihap2/entry/src/main/module.json
--- a/ability/ability_runtime/stage/actslifecyclemultihap3/entry/src/main/module.json
+++ b/ability/ability_runtime/stage/actslifecyclemultihap3/entry/src/main/module.json
--- a/ability/ability_runtime/stage/actslifecyclemultihaptest/entry/src/main/module.json
+++ b/ability/ability_runtime/stage/actslifecyclemultihaptest/entry/src/main/module.json
--- a/ability/ability_runtime/stage/actslifecyclemultihaptest/hap4/src/main/module.json
+++ b/ability/ability_runtime/stage/actslifecyclemultihaptest/hap4/src/main/module.json
--- a/ability/ability_runtime/stage/actslifecyclesinglehaptest/entry/src/main/module.json
+++ b/ability/ability_runtime/stage/actslifecyclesinglehaptest/entry/src/main/module.json
--- a/ability/ability_runtime/stage/actsuripermission/actsassistanthap/entry/src/main/module.json
+++ b/ability/ability_runtime/stage/actsuripermission/actsassistanthap/entry/src/main/module.json
--- a/ability/ability_runtime/stage/actsuripermission/actsassistanthap/hap4/src/main/module.json
+++ b/ability/ability_runtime/stage/actsuripermission/actsassistanthap/hap4/src/main/module.json
--- a/ability/ability_runtime/stage/actsuripermission/actsfasupporturi/entry/src/main/config.json
+++ b/ability/ability_runtime/stage/actsuripermission/actsfasupporturi/entry/src/main/config.json
--- a/ability/ability_runtime/stage/actsuripermission/actstempuripermissionhaptest/entry/src/main/module.json
+++ b/ability/ability_runtime/stage/actsuripermission/actstempuripermissionhaptest/entry/src/main/module.json
--- a/ability/ability_runtime/stage/actswindowstagelifecyclemultihaptest/entry/src/main/module.json
+++ b/ability/ability_runtime/stage/actswindowstagelifecyclemultihaptest/entry/src/main/module.json
--- a/ability/ability_runtime/stage/actswindowstagelifecyclemultihaptest/hap4/src/main/module.json
+++ b/ability/ability_runtime/stage/actswindowstagelifecyclemultihaptest/hap4/src/main/module.json
--- a/ability/ability_runtime/stage/actswindowstagelifecyclesinglehaptest/entry/src/main/module.json
+++ b/ability/ability_runtime/stage/actswindowstagelifecyclesinglehaptest/entry/src/main/module.json
--- a/ability/ability_runtime/stopserviceextension/ActsStopServiceExtensionRely/entry/src/main/module.json
+++ b/ability/ability_runtime/stopserviceextension/ActsStopServiceExtensionRely/entry/src/main/module.json
--- a/ability/ability_runtime/stopserviceextension/ActsStopServiceExtensionTest/entry/src/main/module.json
+++ b/ability/ability_runtime/stopserviceextension/ActsStopServiceExtensionTest/entry/src/main/module.json
--- a/ability/ability_runtime/want/actsgetwantalltest/src/main/config.json
+++ b/ability/ability_runtime/want/actsgetwantalltest/src/main/config.json
--- a/ability/ability_runtime/want/sceneProject/actsgetwantalltesthap/src/main/config.json
+++ b/ability/ability_runtime/want/sceneProject/actsgetwantalltesthap/src/main/config.json
--- a/ability/ability_runtime/workercontextcover/workercontexttest/entry/src/main/module.json
+++ b/ability/ability_runtime/workercontextcover/workercontexttest/entry/src/main/module.json
--- a/ability/dmsfwk/continuationmanagertest/src/main/config.json
+++ b/ability/dmsfwk/continuationmanagertest/src/main/config.json