!6203 xts修改json中deviceType属性

Merge pull request !6203 from chengxingzhen/master

ability/ability_runtime/abilitymultiinstance/amsabilitymultiinstancetest/entry/src/main/module.json

@@ -6,7 +6,8 @@
         "description": "$string:phone_entry_dsc",
         "mainElement": "MainAbility",
         "deviceTypes": [
-            "default"
+            "default",
+            "tablet"
         ],
         "deliveryWithInstall": true,
         "installationFree": false,

ability/ability_runtime/actsfwkdataaccessortest/actsdataabilityrelyhap/entry/src/main/config.json

@@ -18,7 +18,8 @@
     "mainAbility": ".MainAbility",
     "srcPath": "",
     "deviceType": [
-      "default"
+        "default",
+        "tablet"
     ],
     "distro": {
       "deliveryWithInstall": true,

ability/ability_runtime/actsfwkdataaccessortest/actsfwkdataaccessortest/src/main/config.json

@@ -17,7 +17,8 @@
         "package": "com.amsst.fwkdataaccessor",
         "name": ".entry",
         "deviceType": [
-            "default"
+            "default",
+            "tablet"
         ],
         "distro": {
             "deliveryWithInstall": true,

ability/ability_runtime/actssingleton/SystemSingletonExtensionFalse/entry/src/main/module.json

@@ -6,8 +6,8 @@
     "description": "$string:entry_desc",
     "mainElement": "MainAbility",
     "deviceTypes": [
-      "default",
-      "tablet"
+        "default",
+        "tablet"
     ],
     "deliveryWithInstall": true,
     "installationFree": false,

ability/ability_runtime/actsstserviceabilityclientcase/entry/src/main/config.json

@@ -18,7 +18,8 @@
     "name": ".entry",
     "mainAbility": "com.amsst.actsstserviceabilityclientcasetest.MainAbility",
     "deviceType": [
-      "default"
+        "default",
+        "tablet"
     ],
     "distro": {
       "deliveryWithInstall": true,

ability/ability_runtime/actsusers/ActsAmsUsersExtensionSystemTest/entry/src/main/module.json

@@ -6,7 +6,8 @@
     "description": "$string:phone_entry_dsc",
     "mainElement": "MainAbility",
     "deviceTypes": [
-      "default"
+    "default",
+    "tablet"
     ],
     "deliveryWithInstall": true,
     "installationFree": false,

ability/ability_runtime/actsusers/ActsAmsUsersExtensionThirdTest/entry/src/main/module.json

@@ -6,7 +6,8 @@
     "description": "$string:phone_entry_dsc",
     "mainElement": "MainAbility",
     "deviceTypes": [
-      "default"
+    "default",
+    "tablet"
     ],
     "deliveryWithInstall": true,
     "installationFree": false,

ability/ability_runtime/actsusers/ActsAmsUsersSystemTest/entry/src/main/module.json

@@ -6,7 +6,8 @@
         "description": "$string:phone_entry_dsc",
         "mainElement": "MainAbility",
         "deviceTypes": [
-            "default"
+        "default",
+        "tablet"
         ],
         "deliveryWithInstall": true,
         "installationFree": false,

ability/ability_runtime/amscontextualinforquery/actsamsextensionmodulehap/entry/src/main/module.json

@@ -6,7 +6,8 @@
     "description": "$string:phone_entry_dsc",
     "mainElement": "MainAbility",
     "deviceTypes": [
-      "default"
+        "default",
+        "tablet"
     ],
     "deliveryWithInstall": true,
     "installationFree": false,

ability/ability_runtime/amscontextualinforquery/actsamsstaticextensioninfohap/entry/src/main/module.json

@@ -6,7 +6,8 @@
     "description": "$string:phone_entry_dsc",
     "mainElement": "com.example.staticextensioninfotest.MainAbility",
     "deviceTypes": [
-      "default"
+    "default",
+    "tablet"
     ],
     "deliveryWithInstall": true,
     "installationFree": false,

ability/ability_runtime/amscontextualinforquery/actsamsstaticextensioninfotest/entry/src/main/ets/test/Ability.test.ets

@@ -126,7 +126,7 @@ export default function abilityTest() {
         expect(data.backgroundImg).assertEqual("");
         expect(data.supportedModes).assertEqual(0);
         expect(data.reqCapabilities.length).assertEqual(0);
-        expect(data.deviceTypes.length).assertEqual(1);
+        expect(data.deviceTypes.length).assertEqual(2);
         expect(data.deviceTypes[0]).assertEqual("default");
         expect(data.moduleName).assertEqual("phone")
         expect(data.mainAbilityName).assertEqual("com.example.staticextensioninfo.MainAbility");
@@ -308,7 +308,7 @@ export default function abilityTest() {
         expect(data.backgroundImg).assertEqual("");
         expect(data.supportedModes).assertEqual(0);
         expect(data.reqCapabilities.length).assertEqual(0);
-        expect(data.deviceTypes.length).assertEqual(1);
+        expect(data.deviceTypes.length).assertEqual(2);
         expect(data.deviceTypes[0]).assertEqual("default");
         expect(data.moduleName).assertEqual("phone")
         expect(data.mainAbilityName).assertEqual("com.example.staticextensioninfotest.MainAbility");

ability/ability_runtime/amscontextualinforquery/actsamsstaticextensioninfotest/entry/src/main/module.json

@@ -6,7 +6,8 @@
         "description": "$string:phone_entry_dsc",
         "mainElement": "com.example.staticextensioninfo.MainAbility",
         "deviceTypes": [
-            "default"
+            "default",
+            "tablet"
         ],
         "deliveryWithInstall": true,
         "installationFree": false,

ability/ability_runtime/apicover/apicoverhaptest/entry/src/main/module.json

@@ -6,7 +6,8 @@
       "description": "$string:phone_entry_dsc",
       "mainElement": "MainAbility",
       "deviceTypes": [
-        "default"
+        "default",
+        "tablet"
       ],
       "deliveryWithInstall": true,
       "installationFree": false,

ability/ability_runtime/non_concurrent/actsthirdapponerelytest/entry/src/main/module.json

@@ -6,7 +6,8 @@
     "description": "$string:phone_entry_dsc",
     "mainElement": "MainAbility",
     "deviceTypes": [
-      "default"
+        "default",
+        "tablet"
     ],
     "deliveryWithInstall": true,
     "installationFree": false,