!9690 回退：新增2in1设备类型

Merge pull request !9690 from 糖宝儿/2in1rollback_residue

!9690 回退：新增2in1设备类型
Merge pull request !9690 from 糖宝儿/2in1rollback_residue
307557db · openharmony_ci · Gitee · baa35668 · 5c50a52a · 307557db
5 changed file
--- a/distributeddatamgr/preferencesdatagroupidtest/src/main/module.json
+++ b/distributeddatamgr/preferencesdatagroupidtest/src/main/module.json
@@ -7,8 +7,7 @@
    "deviceTypes": [
      "default",
      "tablet",
-      "phone",
+      "phone"
-      "2in1"
  ],
    "deliveryWithInstall": true,
    "installationFree": false,

--- a/distributeddatamgr/relationalstoredatagroupidtest/src/main/module.json
+++ b/distributeddatamgr/relationalstoredatagroupidtest/src/main/module.json
@@ -7,8 +7,7 @@
    "deviceTypes": [
      "default",
      "tablet",
-      "phone",
+      "phone"
-      "2in1"
  ],
    "deliveryWithInstall": true,
    "installationFree": false,

--- a/driver/device_manager/src/main/config.json
+++ b/driver/device_manager/src/main/config.json
@@ -18,8 +18,7 @@
        "deviceType": [
            "tablet",
            "default",
-            "phone",
+            "phone"
-            "2in1"
        ],
        "distro": {
            "deliveryWithInstall": true,

--- a/multimedia/image/image_js_standard/image/src/main/config.json
+++ b/multimedia/image/image_js_standard/image/src/main/config.json
@@ -62,8 +62,7 @@
            "phone",
            "tablet",
            "tv",
-            "wearable",
+            "wearable"
-            "2in1"
        ],
        "mainAbility": ".MainAbility",
        "distro": {

--- a/storage/backupextensiontest/entry/src/main/module.json
+++ b/storage/backupextensiontest/entry/src/main/module.json
@@ -8,8 +8,7 @@
        "deviceTypes": [
            "tablet",
            "default",
-            "phone",
+            "phone"
-            "2in1"
        ],
        "deliveryWithInstall": true,
        "installationFree": false,