回退 'Pull Request !9324 : 新增2in1设备类型-telephone-xts_lite '

telephony/telephonyjstest/call_manager/call_manager_ims2_call/src/main/config.json

@@ -17,12 +17,11 @@
     "package": "com.ohos.actscallmanagerims2calltest",
     "name": ".entry",
     "mainAbility": ".MainAbility",
-        "srcPath": "",
+    "srcPath":"",
     "deviceType": [
       "tablet",
       "default",
-            "phone",
-            "2in1"
+      "phone"
     ],
     "distro": {
       "deliveryWithInstall": true,
@@ -69,16 +68,16 @@
     ],
     "reqPermissions": [
       {
-                "name": "ohos.permission.WRITE_CONTACTS",
-                "reason": "need use ohos.permission.WRITE_CONTACTS"
+        "name":"ohos.permission.WRITE_CONTACTS",
+        "reason":"need use ohos.permission.WRITE_CONTACTS"
       },
       {
-                "name": "ohos.permission.READ_CONTACTS",
-                "reason": "need use ohos.permission.READ_CONTACTS"
+        "name":"ohos.permission.READ_CONTACTS",
+        "reason":"need use ohos.permission.READ_CONTACTS"
       },
       {
-                "name": "ohos.permission.PLACE_CALL",
-                "reason": "need use ohos.permission.PLACE_CALL"
+        "name":"ohos.permission.PLACE_CALL",
+        "reason":"need use ohos.permission.PLACE_CALL"
       }
     ],
     "js": [

telephony/telephonyjstest/cellular_data/cellular_data_abnormal/src/main/config.json

@@ -17,12 +17,11 @@
     "package": "com.ohos.cellulardata",
     "name": ".entry",
     "mainAbility": ".MainAbility",
-        "srcPath": "",
+    "srcPath":"",
     "deviceType": [
       "tablet",
       "default",
-            "phone",
-            "2in1"
+      "phone"
     ],
     "distro": {
       "deliveryWithInstall": true,
@@ -69,12 +68,12 @@
     ],
     "reqPermissions": [
 	   {
-                "name": "ohos.permission.GET_NETWORK_INFO",
-                "reason": "need use ohos.permission.GET_NETWORK_INFO"
+        "name":"ohos.permission.GET_NETWORK_INFO",
+        "reason":"need use ohos.permission.GET_NETWORK_INFO"
       },
 	   {
-                "name": "ohos.permission.INTERNET",
-                "reason": "need use ohos.permission.INTERNET"
+        "name":"ohos.permission.INTERNET",
+        "reason":"need use ohos.permission.INTERNET"
       }
     ],
     "js": [

telephony/telephonyjstest/netmanager_base/actshttpscertificatetest/src/main/config.json

@@ -17,12 +17,11 @@
     "package": "com.ohos.actshttpscertificatetest",
     "name": ".entry",
     "mainAbility": ".MainAbility",
-        "srcPath": "",
+    "srcPath":"",
     "deviceType": [
       "tablet",
       "default",
-            "phone",
-            "2in1"
+      "phone"
     ],
     "distro": {
       "deliveryWithInstall": true,
@@ -69,8 +68,8 @@
     ],
     "reqPermissions": [
 	  {
-                "name": "ohos.permission.INTERNET",
-                "reason": "need use ohos.permission.INTERNET"
+        "name" : "ohos.permission.INTERNET",
+        "reason" : "need use ohos.permission.INTERNET"
       }
     ],
     "js": [

telephony/telephonyjstest/netmanager_base/dns/src/main/config.json

@@ -17,12 +17,11 @@
     "package": "com.ohos.dns",
     "name": ".entry",
     "mainAbility": ".MainAbility",
-        "srcPath": "",
+    "srcPath":"",
     "deviceType": [
       "tablet",
       "default",
-            "phone",
-            "2in1"
+      "phone"
     ],
     "distro": {
       "deliveryWithInstall": true,
@@ -69,12 +68,12 @@
     ],
     "reqPermissions": [
 	  {
-                "name": "ohos.permission.GET_NETWORK_INFO",
-                "reason": "need use ohos.permission.GET_NETWORK_INFO"
+        "name":"ohos.permission.GET_NETWORK_INFO",
+        "reason":"need use ohos.permission.GET_NETWORK_INFO"
       },
 	  {
-                "name": "ohos.permission.INTERNET",
-                "reason": "need use ohos.permission.INTERNET"
+        "name":"ohos.permission.INTERNET",
+        "reason":"need use ohos.permission.INTERNET"
       }
     ],
     "js": [

telephony/telephonyjstest/netmanager_base/jshttp/src/main/config.json

@@ -17,12 +17,11 @@
     "package": "com.ohos.jshttp",
     "name": ".entry",
     "mainAbility": ".MainAbility",
-        "srcPath": "",
+    "srcPath":"",
     "deviceType": [
       "tablet",
       "default",
-            "phone",
-            "2in1"
+      "phone"
     ],
     "distro": {
       "deliveryWithInstall": true,
@@ -69,12 +68,12 @@
     ],
     "reqPermissions": [
 	  {
-                "name": "ohos.permission.GET_NETWORK_INFO",
-                "reason": "need use ohos.permission.GET_NETWORK_INFO"
+        "name":"ohos.permission.GET_NETWORK_INFO",
+        "reason":"need use ohos.permission.GET_NETWORK_INFO"
       },
 	  {
-                "name": "ohos.permission.INTERNET",
-                "reason": "need use ohos.permission.INTERNET"
+        "name":"ohos.permission.INTERNET",
+        "reason":"need use ohos.permission.INTERNET"
       }
     ],
     "js": [

telephony/telephonyjstest/netmanager_base/network_nopermission/src/main/config.json

@@ -18,8 +18,7 @@
     "deviceType": [
       "tablet",
       "default",
-            "phone",
-            "2in1"
+      "phone"
     ],
     "abilities": [
       {
@@ -66,7 +65,7 @@
     },
     "package": "com.ohos.network_nopermission",
     "name": ".entry",
-        "srcPath": "",
+    "srcPath":"",
     "js": [
       {
         "pages": [

telephony/telephonyjstest/netmanager_base/network_nowifi/src/main/config.json

@@ -18,8 +18,7 @@
     "deviceType": [
       "tablet",
       "default",
-            "phone",
-            "2in1"
+      "phone"
     ],
     "abilities": [
       {
@@ -61,8 +60,8 @@
     ],
     "reqPermissions": [
       {
-                "name": "ohos.permission.GET_NETWORK_INFO",
-                "reason": "need use ohos.permission.GET_NETWORK_INFO"
+        "name":"ohos.permission.GET_NETWORK_INFO",
+        "reason":"need use ohos.permission.GET_NETWORK_INFO"
       }
     ],
     "distro": {

telephony/telephonyjstest/netmanager_base/network_wifi/src/main/config.json

@@ -18,8 +18,7 @@
     "deviceType": [
       "tablet",
       "default",
-            "phone",
-            "2in1"
+      "phone"
     ],
     "abilities": [
       {
@@ -61,8 +60,8 @@
     ],
     "reqPermissions": [
       {
-                "name": "ohos.permission.GET_NETWORK_INFO",
-                "reason": "need use ohos.permission.GET_NETWORK_INFO"
+        "name":"ohos.permission.GET_NETWORK_INFO",
+        "reason":"need use ohos.permission.GET_NETWORK_INFO"
       }
     ],
     "distro": {

telephony/telephonyjstest/netmanager_base/register/src/main/config.json

@@ -17,12 +17,11 @@
     "package": "com.ohos.register",
     "name": ".entry",
     "mainAbility": ".MainAbility",
-        "srcPath": "",
+    "srcPath":"",
     "deviceType": [
       "tablet",
       "default",
-            "phone",
-            "2in1"
+      "phone"
     ],
     "distro": {
       "deliveryWithInstall": true,
@@ -69,12 +68,12 @@
     ],
     "reqPermissions": [ 
 	    {
-                "name": "ohos.permission.GET_NETWORK_INFO",
-                "reason": "need use ohos.permission.GET_NETWORK_INFO"
+        "name":"ohos.permission.GET_NETWORK_INFO",
+        "reason":"need use ohos.permission.GET_NETWORK_INFO"
       },
 	    {
-                "name": "ohos.permission.INTERNET",
-                "reason": "need use ohos.permission.INTERNET"
+        "name":"ohos.permission.INTERNET",
+        "reason":"need use ohos.permission.INTERNET"
       }
     ],
     "js": [

telephony/telephonyjstest/netmanager_base/socket/src/main/config.json

@@ -17,12 +17,11 @@
     "package": "com.ohos.socket",
     "name": ".entry",
     "mainAbility": ".MainAbility",
-        "srcPath": "",
+    "srcPath":"",
     "deviceType": [
       "tablet",
       "default",
-            "phone",
-            "2in1"
+      "phone"
     ],
     "distro": {
       "deliveryWithInstall": true,
@@ -69,12 +68,12 @@
     ],
     "reqPermissions": [ 
 	    {
-                "name": "ohos.permission.GET_NETWORK_INFO",
-                "reason": "need use ohos.permission.GET_NETWORK_INFO"
+        "name":"ohos.permission.GET_NETWORK_INFO",
+        "reason":"need use ohos.permission.GET_NETWORK_INFO"
       },
 	    {
-                "name": "ohos.permission.INTERNET",
-                "reason": "need use ohos.permission.INTERNET"
+        "name":"ohos.permission.INTERNET",
+        "reason":"need use ohos.permission.INTERNET"
       }
     ],
     "js": [

telephony/telephonyjstest/netmanager_base/system_fetch/src/main/config.json

@@ -16,13 +16,12 @@
   "module": {
     "name": ".entry",
     "mainAbility": ".MainAbility",
-        "srcPath": "",
+    "srcPath":"",
     "deviceType": [
       "tablet",
       "default",
       "phone",
-            "tablet",
-            "2in1"
+      "tablet"
     ],
     "abilities": [
       {
@@ -70,8 +69,8 @@
     },
     "reqPermissions": [
       {
-                "name": "ohos.permission.INTERNET",
-                "reason": "need use ohos.permission.INTERNET"
+        "name":"ohos.permission.INTERNET",
+        "reason":"need use ohos.permission.INTERNET"
       }
     ],
     "package": "com.ohos.system_fetch",

telephony/telephonyjstest/netmanager_http/entry/src/main/config.json

@@ -21,8 +21,7 @@
     "deviceType": [
       "tablet",
       "default",
-            "phone",
-            "2in1"
+      "phone"
     ],
     "distro": {
       "deliveryWithInstall": true,
@@ -70,12 +69,12 @@
     ],
     "reqPermissions": [
 	    {
-                "name": "ohos.permission.GET_NETWORK_INFO",
-                "reason": "need use ohos.permission.GET_NETWORK_INFO"
+        "name":"ohos.permission.GET_NETWORK_INFO",
+        "reason":"need use ohos.permission.GET_NETWORK_INFO"
       },
 	    {
-                "name": "ohos.permission.INTERNET",
-                "reason": "need use ohos.permission.INTERNET"
+        "name":"ohos.permission.INTERNET",
+        "reason":"need use ohos.permission.INTERNET"
       }
     ],
     "js": [
@@ -103,6 +102,7 @@
           "pages/Counter",
           "pages/Flex",
           "pages/GridContainer"
+
         ],
         "name": ".MainAbility",
         "window": {

telephony/telephonyjstest/netmanager_socket/entry/src/main/config.json

@@ -21,8 +21,7 @@
     "deviceType": [
       "tablet",
       "default",
-            "phone",
-            "2in1"
+      "phone"
     ],
     "distro": {
       "deliveryWithInstall": true,
@@ -74,12 +73,12 @@
         "reason": "need use ohos.permission.LOCATION"
       },
 	    {
-                "name": "ohos.permission.GET_NETWORK_INFO",
-                "reason": "need use ohos.permission.GET_NETWORK_INFO"
+        "name":"ohos.permission.GET_NETWORK_INFO",
+        "reason":"need use ohos.permission.GET_NETWORK_INFO"
       },
 	    {
-                "name": "ohos.permission.INTERNET",
-                "reason": "need use ohos.permission.INTERNET"
+        "name":"ohos.permission.INTERNET",
+        "reason":"need use ohos.permission.INTERNET"
       }
     ],
     "js": [
@@ -107,6 +106,7 @@
           "pages/Counter",
           "pages/Flex",
           "pages/GridContainer"
+
         ],
         "name": ".MainAbility",
         "window": {

telephony/telephonyjstest/network_search/network_search_errors/src/main/config.json

@@ -17,12 +17,11 @@
     "package": "com.ohos.networksearch",
     "name": ".entry",
     "mainAbility": ".MainAbility",
-        "srcPath": "",
+    "srcPath":"",
     "deviceType": [
       "tablet",
       "default",
-            "phone",
-            "2in1"
+      "phone"
     ],
     "distro": {
       "deliveryWithInstall": true,
@@ -69,12 +68,12 @@
     ],
     "reqPermissions": [
 	   {
-                "name": "ohos.permission.GET_NETWORK_INFO",
-                "reason": "need use ohos.permission.GET_NETWORK_INFO"
+        "name":"ohos.permission.GET_NETWORK_INFO",
+        "reason":"need use ohos.permission.GET_NETWORK_INFO"
       },
 	   {
-                "name": "ohos.permission.INTERNET",
-                "reason": "need use ohos.permission.INTERNET"
+        "name":"ohos.permission.INTERNET",
+        "reason":"need use ohos.permission.INTERNET"
       }
     ],
     "js": [

telephony/telephonyjstest/observer/entry/src/main/config.json

@@ -21,8 +21,7 @@
     "deviceType": [
       "tablet",
       "default",
-            "phone",
-            "2in1"
+      "phone"
     ],
     "distro": {
       "deliveryWithInstall": true,
@@ -70,8 +69,8 @@
     ],
     "reqPermissions": [
 	    {
-                "name": "ohos.permission.GET_NETWORK_INFO",
-                "reason": "need use ohos.permission.GET_NETWORK_INFO"
+        "name":"ohos.permission.GET_NETWORK_INFO",
+        "reason":"need use ohos.permission.GET_NETWORK_INFO"
       }
     ],
     "js": [
@@ -99,6 +98,7 @@
           "pages/Counter",
           "pages/Flex",
           "pages/GridContainer"
+
         ],
         "name": ".MainAbility",
         "window": {

telephony/telephonyjstest/radiostatistic/entry/src/main/config.json

@@ -21,8 +21,7 @@
     "deviceType": [
       "tablet",
       "default",
-            "phone",
-            "2in1"
+      "phone"
     ],
     "distro": {
       "deliveryWithInstall": true,
@@ -70,8 +69,8 @@
     ],
     "reqPermissions": [
   	  {
-                "name": "ohos.permission.GET_NETWORK_INFO",
-                "reason": "need use ohos.permission.GET_NETWORK_INFO"
+        "name":"ohos.permission.GET_NETWORK_INFO",
+        "reason":"need use ohos.permission.GET_NETWORK_INFO"
       }
     ],
     "js": [
@@ -99,6 +98,7 @@
           "pages/Counter",
           "pages/Flex",
           "pages/GridContainer"
+
         ],
         "name": ".MainAbility",
         "window": {

telephony/telephonyjstest/sim/sim_manager_function_test/src/main/config.json

@@ -17,12 +17,11 @@
     "package": "com.ohos.simmanagertest",
     "name": ".entry",
     "mainAbility": ".MainAbility",
-        "srcPath": "",
+    "srcPath":"",
     "deviceType": [
       "tablet",
       "default",
-            "phone",
-            "2in1"
+      "phone"
     ],
     "distro": {
       "deliveryWithInstall": true,

telephony/telephonyjstest/sms_mms/sms_mms_error/src/main/config.json

@@ -17,12 +17,11 @@
     "package": "com.ohos.smsmms",
     "name": ".entry",
     "mainAbility": ".MainAbility",
-        "srcPath": "",
+    "srcPath":"",
     "deviceType": [
       "tablet",
       "default",
-            "phone",
-            "2in1"
+      "phone"
     ],
     "distro": {
       "deliveryWithInstall": true,

telephony/telephonyjstest/telephony_base/call_manager/src/main/config.json

@@ -17,12 +17,11 @@
     "package": "com.ohos.call_manager",
     "name": ".entry",
     "mainAbility": ".MainAbility",
-        "srcPath": "",
+    "srcPath":"",
     "deviceType": [
       "tablet",
       "default",
-            "phone",
-            "2in1"
+      "phone"
     ],
     "distro": {
       "deliveryWithInstall": true,
@@ -69,8 +68,8 @@
     ],
     "reqPermissions": [
 	    {
-                "name": "ohos.permission.GET_NETWORK_INFO",
-                "reason": "need use ohos.permission.GET_NETWORK_INFO"
+        "name":"ohos.permission.GET_NETWORK_INFO",
+        "reason":"need use ohos.permission.GET_NETWORK_INFO"
       }
     ],
     "js": [

testfwk/uitest/src/main/config.json

@@ -21,8 +21,7 @@
     "deviceType": [
       "tablet",
       "default",
-            "phone",
-            "2in1"
+      "phone"
     ],
     "distro": {
       "moduleType": "entry",

testfwk/uitestScene/entry/src/main/module.json

@@ -7,8 +7,7 @@
     "deviceTypes": [
       "tablet",
       "default",
-            "phone",
-            "2in1"
+      "phone"
     ],
     "deliveryWithInstall": true,
     "installationFree": false,

theme/screenlock_ets/entry/src/main/config.json

@@ -17,11 +17,11 @@
     "package": "com.acts.theme.screenlocktest",
     "name": ".MyApplication",
     "mainAbility": "com.acts.theme.screenlocktest.MainAbility",
+
     "deviceType": [
       "tablet",
       "default",
-            "phone",
-            "2in1"
+      "phone"
     ],
     "distro": {
       "deliveryWithInstall": true,

theme/wallpaper_authority_ets/entry/src/main/config.json

@@ -17,10 +17,10 @@
     "package": "com.acts.theme.wallpaperauthoritytest",
     "name": ".MyApplication",
     "mainAbility": "com.acts.theme.wallpaperauthoritytest.MainAbility",
+
     "deviceType": [
       "tablet",
-            "default",
-            "2in1"
+      "default"
     ],
     "distro": {
       "deliveryWithInstall": true,

theme/wallpaper_ets/entry/src/main/config.json

@@ -17,10 +17,10 @@
     "package": "com.acts.theme.wallpapertest",
     "name": ".MyApplication",
     "mainAbility": "com.acts.theme.wallpapertest.MainAbility",
+
     "deviceType": [
       "tablet",
-            "default",
-            "2in1"
+      "default"
     ],
     "distro": {
       "deliveryWithInstall": true,

time/dateTimeTest/entry/src/main/module.json

@@ -8,8 +8,7 @@
     "deviceTypes": [
       "tablet",
       "default",
-            "phone",
-            "2in1"
+      "phone"
     ],
     "deliveryWithInstall": true,
     "installationFree": false,

time/timeTest/entry/src/main/module.json

@@ -7,8 +7,7 @@
     "mainElement": "MainAbility",
     "deviceTypes": [
       "tablet",
-            "default",
-            "2in1"
+      "default"
     ],
     "deliveryWithInstall": true,
     "installationFree": false,

time/timeauthorityTest/entry/src/main/module.json

@@ -7,8 +7,7 @@
     "mainElement": "MainAbility",
     "deviceTypes": [
       "tablet",
-            "default",
-            "2in1"
+      "default"
     ],
     "deliveryWithInstall": true,
     "installationFree": false,
@@ -37,12 +36,12 @@
     ],
     "requestPermissions": [
       {
-                "name": "ohos.permission.SET_TIME",
-                "reason": "need use ohos.permission.SET_TIME."
+        "name":"ohos.permission.SET_TIME",
+        "reason":"need use ohos.permission.SET_TIME."
       },
       {
-                "name": "ohos.permission.SET_TIME_ZONE",
-                "reason": "need use ohos.permission.SET_TIME_ZONE."
+        "name":"ohos.permission.SET_TIME_ZONE",
+        "reason":"need use ohos.permission.SET_TIME_ZONE."
       }
     ]
   }

usb/usb_standard/src/main/config.json

@@ -18,8 +18,7 @@
         "deviceType": [
             "tablet",
             "default",
-            "phone",
-            "2in1"
+            "phone"
         ],
         "distro": {
             "deliveryWithInstall": true,

useriam/face_auth/js_api_test/function_test/userauth/src/main/config.json

@@ -23,8 +23,7 @@
             "phone",
             "tablet",
             "tv",
-            "wearable",
-            "2in1"
+            "wearable"
         ],
         "distro": {
             "deliveryWithInstall": true,

useriam/face_auth/js_api_test/function_test/userauthnopermission/src/main/config.json

@@ -23,8 +23,7 @@
             "phone",
             "tablet",
             "tv",
-            "wearable",
-            "2in1"
+            "wearable"
         ],
         "distro": {
             "deliveryWithInstall": true,
@@ -92,6 +91,7 @@
                 }
             }
         ],
+       
         "testRunner": {
             "name": "OpenHarmonyTestRunner",
             "srcPath": "TestRunner"

useriam/face_auth/js_api_test/function_test/userauthpart2/src/main/config.json

@@ -23,8 +23,7 @@
             "phone",
             "tablet",
             "tv",
-            "wearable",
-            "2in1"
+            "wearable"
         ],
         "distro": {
             "deliveryWithInstall": true,

validator/acts_validator/src/main/module.json

@@ -7,8 +7,7 @@
     "mainElement": "MainAbility",
     "deviceTypes": [
       "default",
-            "tablet",
-            "2in1"
+      "tablet"
     ],
     "deliveryWithInstall": true,
     "installationFree": false,

wukong/actswukongtest/entry/src/main/module.json

@@ -9,8 +9,7 @@
       "tablet",
       "default",
       "phone",
-            "tablet",
-            "2in1"
+      "tablet"
     ],
     "deliveryWithInstall": true,
     "installationFree": false,

xts/device_attest/entry/src/main/module.json

@@ -7,15 +7,13 @@
         "mainElement": "MainAbility",
         "deviceTypes": [
             "tablet",
-            "default",
-            "2in1"
+            "default"
         ],
         "deliveryWithInstall": true,
         "installationFree": false,
         "uiSyntax": "ets",
         "pages": "$profile:main_pages",
-        "abilities": [
-            {
+        "abilities": [{
             "name": "com.example.DeviceAttest.MainAbility",
             "srcEntrance": "./ets/MainAbility/MainAbility.ts",
             "description": "$string:phone_entry_main",
@@ -23,17 +21,15 @@
             "label": "$string:entry_label",
             "visible": true,
             "orientation": "portrait",
-                "skills": [
-                    {
+            "skills": [{
                 "actions": [
                     "action.system.home"
                 ],
                 "entities": [
                     "entity.system.home"
                 ]
-                    }
-                ]
-            }
-        ]
+            }]
+        }]
+       
     }
 }
\ No newline at end of file