From 4a64616c1f29f4e230ccccfef730bb421fd049e9 Mon Sep 17 00:00:00 2001
From: xuzhongwu <xuzhongwu@huawei.com>
Date: Thu, 3 Jul 2025 12:49:49 +0800
Subject: [PATCH 1/2] device types modify

Signed-off-by: xuzhongwu <xuzhongwu@huawei.com>
---
 .../AVImageGeneratorArkTS/entry/src/main/module.json5           | 2 +-
 .../AVImageGeneratorArkTS/entry/src/ohosTest/module.json5       | 2 +-
 .../AVImageGeneratorNDK/entry/src/main/module.json5             | 2 +-
 .../AVImageGeneratorNDK/entry/src/ohosTest/module.json5         | 2 +-
 .../AVMetadataExtractorArkTS/entry/src/main/module.json5        | 2 +-
 .../AVMetadataExtractorArkTS/entry/src/ohosTest/module.json5    | 2 +-
 .../AVMetadataExtractorNDK/entry/src/main/module.json5          | 2 +-
 .../AVMetadataExtractorNDK/entry/src/ohosTest/module.json5      | 2 +-
 .../AVTranscoder/AVTranscoderArkTS/entry/src/main/module.json5  | 2 +-
 .../AVTranscoderArkTS/entry/src/ohosTest/module.json5           | 2 +-
 .../AVTranscoder/AsyncTranscoder/entry/src/main/module.json5    | 2 +-
 .../AsyncTranscoder/entry/src/ohosTest/module.json5             | 2 +-
 .../Media/SoundPool/SoundPoolArkTS/entry/src/main/module.json5  | 2 +-
 .../SoundPool/SoundPoolArkTS/entry/src/ohosTest/module.json5    | 2 +-
 14 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/code/DocsSample/Media/AVImageGenerator/AVImageGeneratorArkTS/entry/src/main/module.json5 b/code/DocsSample/Media/AVImageGenerator/AVImageGeneratorArkTS/entry/src/main/module.json5
index ce393bdb98..73568a4646 100644
--- a/code/DocsSample/Media/AVImageGenerator/AVImageGeneratorArkTS/entry/src/main/module.json5
+++ b/code/DocsSample/Media/AVImageGenerator/AVImageGeneratorArkTS/entry/src/main/module.json5
@@ -19,7 +19,7 @@
     "description": "$string:module_desc",
     "mainElement": "EntryAbility",
     "deviceTypes": [
-      "phone",
+      "default",
       "tablet",
       "2in1"
     ],
diff --git a/code/DocsSample/Media/AVImageGenerator/AVImageGeneratorArkTS/entry/src/ohosTest/module.json5 b/code/DocsSample/Media/AVImageGenerator/AVImageGeneratorArkTS/entry/src/ohosTest/module.json5
index d3069fb7f9..8c06b9c042 100644
--- a/code/DocsSample/Media/AVImageGenerator/AVImageGeneratorArkTS/entry/src/ohosTest/module.json5
+++ b/code/DocsSample/Media/AVImageGenerator/AVImageGeneratorArkTS/entry/src/ohosTest/module.json5
@@ -17,7 +17,7 @@
     "name": "entry_test",
     "type": "feature",
     "deviceTypes": [
-      "phone",
+      "default",
       "tablet",
       "2in1"
     ],
diff --git a/code/DocsSample/Media/AVImageGenerator/AVImageGeneratorNDK/entry/src/main/module.json5 b/code/DocsSample/Media/AVImageGenerator/AVImageGeneratorNDK/entry/src/main/module.json5
index ce393bdb98..73568a4646 100644
--- a/code/DocsSample/Media/AVImageGenerator/AVImageGeneratorNDK/entry/src/main/module.json5
+++ b/code/DocsSample/Media/AVImageGenerator/AVImageGeneratorNDK/entry/src/main/module.json5
@@ -19,7 +19,7 @@
     "description": "$string:module_desc",
     "mainElement": "EntryAbility",
     "deviceTypes": [
-      "phone",
+      "default",
       "tablet",
       "2in1"
     ],
diff --git a/code/DocsSample/Media/AVImageGenerator/AVImageGeneratorNDK/entry/src/ohosTest/module.json5 b/code/DocsSample/Media/AVImageGenerator/AVImageGeneratorNDK/entry/src/ohosTest/module.json5
index d3069fb7f9..8c06b9c042 100644
--- a/code/DocsSample/Media/AVImageGenerator/AVImageGeneratorNDK/entry/src/ohosTest/module.json5
+++ b/code/DocsSample/Media/AVImageGenerator/AVImageGeneratorNDK/entry/src/ohosTest/module.json5
@@ -17,7 +17,7 @@
     "name": "entry_test",
     "type": "feature",
     "deviceTypes": [
-      "phone",
+      "default",
       "tablet",
       "2in1"
     ],
diff --git a/code/DocsSample/Media/AVMetadataExtractor/AVMetadataExtractorArkTS/entry/src/main/module.json5 b/code/DocsSample/Media/AVMetadataExtractor/AVMetadataExtractorArkTS/entry/src/main/module.json5
index ce393bdb98..73568a4646 100644
--- a/code/DocsSample/Media/AVMetadataExtractor/AVMetadataExtractorArkTS/entry/src/main/module.json5
+++ b/code/DocsSample/Media/AVMetadataExtractor/AVMetadataExtractorArkTS/entry/src/main/module.json5
@@ -19,7 +19,7 @@
     "description": "$string:module_desc",
     "mainElement": "EntryAbility",
     "deviceTypes": [
-      "phone",
+      "default",
       "tablet",
       "2in1"
     ],
diff --git a/code/DocsSample/Media/AVMetadataExtractor/AVMetadataExtractorArkTS/entry/src/ohosTest/module.json5 b/code/DocsSample/Media/AVMetadataExtractor/AVMetadataExtractorArkTS/entry/src/ohosTest/module.json5
index d3069fb7f9..8c06b9c042 100644
--- a/code/DocsSample/Media/AVMetadataExtractor/AVMetadataExtractorArkTS/entry/src/ohosTest/module.json5
+++ b/code/DocsSample/Media/AVMetadataExtractor/AVMetadataExtractorArkTS/entry/src/ohosTest/module.json5
@@ -17,7 +17,7 @@
     "name": "entry_test",
     "type": "feature",
     "deviceTypes": [
-      "phone",
+      "default",
       "tablet",
       "2in1"
     ],
diff --git a/code/DocsSample/Media/AVMetadataExtractor/AVMetadataExtractorNDK/entry/src/main/module.json5 b/code/DocsSample/Media/AVMetadataExtractor/AVMetadataExtractorNDK/entry/src/main/module.json5
index ce393bdb98..73568a4646 100644
--- a/code/DocsSample/Media/AVMetadataExtractor/AVMetadataExtractorNDK/entry/src/main/module.json5
+++ b/code/DocsSample/Media/AVMetadataExtractor/AVMetadataExtractorNDK/entry/src/main/module.json5
@@ -19,7 +19,7 @@
     "description": "$string:module_desc",
     "mainElement": "EntryAbility",
     "deviceTypes": [
-      "phone",
+      "default",
       "tablet",
       "2in1"
     ],
diff --git a/code/DocsSample/Media/AVMetadataExtractor/AVMetadataExtractorNDK/entry/src/ohosTest/module.json5 b/code/DocsSample/Media/AVMetadataExtractor/AVMetadataExtractorNDK/entry/src/ohosTest/module.json5
index d3069fb7f9..8c06b9c042 100644
--- a/code/DocsSample/Media/AVMetadataExtractor/AVMetadataExtractorNDK/entry/src/ohosTest/module.json5
+++ b/code/DocsSample/Media/AVMetadataExtractor/AVMetadataExtractorNDK/entry/src/ohosTest/module.json5
@@ -17,7 +17,7 @@
     "name": "entry_test",
     "type": "feature",
     "deviceTypes": [
-      "phone",
+      "default",
       "tablet",
       "2in1"
     ],
diff --git a/code/DocsSample/Media/AVTranscoder/AVTranscoderArkTS/entry/src/main/module.json5 b/code/DocsSample/Media/AVTranscoder/AVTranscoderArkTS/entry/src/main/module.json5
index ce393bdb98..73568a4646 100644
--- a/code/DocsSample/Media/AVTranscoder/AVTranscoderArkTS/entry/src/main/module.json5
+++ b/code/DocsSample/Media/AVTranscoder/AVTranscoderArkTS/entry/src/main/module.json5
@@ -19,7 +19,7 @@
     "description": "$string:module_desc",
     "mainElement": "EntryAbility",
     "deviceTypes": [
-      "phone",
+      "default",
       "tablet",
       "2in1"
     ],
diff --git a/code/DocsSample/Media/AVTranscoder/AVTranscoderArkTS/entry/src/ohosTest/module.json5 b/code/DocsSample/Media/AVTranscoder/AVTranscoderArkTS/entry/src/ohosTest/module.json5
index d3069fb7f9..8c06b9c042 100644
--- a/code/DocsSample/Media/AVTranscoder/AVTranscoderArkTS/entry/src/ohosTest/module.json5
+++ b/code/DocsSample/Media/AVTranscoder/AVTranscoderArkTS/entry/src/ohosTest/module.json5
@@ -17,7 +17,7 @@
     "name": "entry_test",
     "type": "feature",
     "deviceTypes": [
-      "phone",
+      "default",
       "tablet",
       "2in1"
     ],
diff --git a/code/DocsSample/Media/AVTranscoder/AsyncTranscoder/entry/src/main/module.json5 b/code/DocsSample/Media/AVTranscoder/AsyncTranscoder/entry/src/main/module.json5
index ce393bdb98..73568a4646 100644
--- a/code/DocsSample/Media/AVTranscoder/AsyncTranscoder/entry/src/main/module.json5
+++ b/code/DocsSample/Media/AVTranscoder/AsyncTranscoder/entry/src/main/module.json5
@@ -19,7 +19,7 @@
     "description": "$string:module_desc",
     "mainElement": "EntryAbility",
     "deviceTypes": [
-      "phone",
+      "default",
       "tablet",
       "2in1"
     ],
diff --git a/code/DocsSample/Media/AVTranscoder/AsyncTranscoder/entry/src/ohosTest/module.json5 b/code/DocsSample/Media/AVTranscoder/AsyncTranscoder/entry/src/ohosTest/module.json5
index d3069fb7f9..8c06b9c042 100644
--- a/code/DocsSample/Media/AVTranscoder/AsyncTranscoder/entry/src/ohosTest/module.json5
+++ b/code/DocsSample/Media/AVTranscoder/AsyncTranscoder/entry/src/ohosTest/module.json5
@@ -17,7 +17,7 @@
     "name": "entry_test",
     "type": "feature",
     "deviceTypes": [
-      "phone",
+      "default",
       "tablet",
       "2in1"
     ],
diff --git a/code/DocsSample/Media/SoundPool/SoundPoolArkTS/entry/src/main/module.json5 b/code/DocsSample/Media/SoundPool/SoundPoolArkTS/entry/src/main/module.json5
index 9bed6e6fd2..5f204a9e1f 100644
--- a/code/DocsSample/Media/SoundPool/SoundPoolArkTS/entry/src/main/module.json5
+++ b/code/DocsSample/Media/SoundPool/SoundPoolArkTS/entry/src/main/module.json5
@@ -20,7 +20,7 @@
     "description": "$string:module_desc",
     "mainElement": "EntryAbility",
     "deviceTypes": [
-      "phone",
+      "default",
       "tablet",
       "2in1"
     ],
diff --git a/code/DocsSample/Media/SoundPool/SoundPoolArkTS/entry/src/ohosTest/module.json5 b/code/DocsSample/Media/SoundPool/SoundPoolArkTS/entry/src/ohosTest/module.json5
index 6b9889e8cc..c5e8a689f0 100644
--- a/code/DocsSample/Media/SoundPool/SoundPoolArkTS/entry/src/ohosTest/module.json5
+++ b/code/DocsSample/Media/SoundPool/SoundPoolArkTS/entry/src/ohosTest/module.json5
@@ -18,7 +18,7 @@
     "name": "entry_test",
     "type": "feature",
     "deviceTypes": [
-      "phone",
+      "default",
       "tablet",
       "2in1"
     ],
-- 
Gitee


From a86ab96adac1a76fc0c235013595ce4399436ad6 Mon Sep 17 00:00:00 2001
From: xuzhongwu <xuzhongwu@huawei.com>
Date: Thu, 3 Jul 2025 14:53:40 +0800
Subject: [PATCH 2/2] device types modify

Signed-off-by: xuzhongwu <xuzhongwu@huawei.com>
---
 .../AVImageGeneratorArkTS/entry/src/main/module.json5          | 3 +--
 .../AVImageGeneratorArkTS/entry/src/ohosTest/module.json5      | 3 +--
 .../AVImageGeneratorNDK/entry/src/main/module.json5            | 3 +--
 .../AVImageGeneratorNDK/entry/src/ohosTest/module.json5        | 3 +--
 .../AVMetadataExtractorArkTS/entry/src/main/module.json5       | 3 +--
 .../AVMetadataExtractorArkTS/entry/src/ohosTest/module.json5   | 3 +--
 .../AVMetadataExtractorNDK/entry/src/main/module.json5         | 3 +--
 .../AVMetadataExtractorNDK/entry/src/ohosTest/module.json5     | 3 +--
 .../AVTranscoder/AVTranscoderArkTS/entry/src/main/module.json5 | 3 +--
 .../AVTranscoderArkTS/entry/src/ohosTest/module.json5          | 3 +--
 .../AVTranscoder/AsyncTranscoder/entry/src/main/module.json5   | 3 +--
 .../AsyncTranscoder/entry/src/ohosTest/module.json5            | 3 +--
 .../Media/SoundPool/SoundPoolArkTS/entry/src/main/module.json5 | 3 +--
 .../SoundPool/SoundPoolArkTS/entry/src/ohosTest/module.json5   | 3 +--
 14 files changed, 14 insertions(+), 28 deletions(-)

diff --git a/code/DocsSample/Media/AVImageGenerator/AVImageGeneratorArkTS/entry/src/main/module.json5 b/code/DocsSample/Media/AVImageGenerator/AVImageGeneratorArkTS/entry/src/main/module.json5
index 73568a4646..e5080a1087 100644
--- a/code/DocsSample/Media/AVImageGenerator/AVImageGeneratorArkTS/entry/src/main/module.json5
+++ b/code/DocsSample/Media/AVImageGenerator/AVImageGeneratorArkTS/entry/src/main/module.json5
@@ -20,8 +20,7 @@
     "mainElement": "EntryAbility",
     "deviceTypes": [
       "default",
-      "tablet",
-      "2in1"
+      "tablet"
     ],
     "deliveryWithInstall": true,
     "installationFree": false,
diff --git a/code/DocsSample/Media/AVImageGenerator/AVImageGeneratorArkTS/entry/src/ohosTest/module.json5 b/code/DocsSample/Media/AVImageGenerator/AVImageGeneratorArkTS/entry/src/ohosTest/module.json5
index 8c06b9c042..f6bdce9946 100644
--- a/code/DocsSample/Media/AVImageGenerator/AVImageGeneratorArkTS/entry/src/ohosTest/module.json5
+++ b/code/DocsSample/Media/AVImageGenerator/AVImageGeneratorArkTS/entry/src/ohosTest/module.json5
@@ -18,8 +18,7 @@
     "type": "feature",
     "deviceTypes": [
       "default",
-      "tablet",
-      "2in1"
+      "tablet"
     ],
     "deliveryWithInstall": true,
     "installationFree": false
diff --git a/code/DocsSample/Media/AVImageGenerator/AVImageGeneratorNDK/entry/src/main/module.json5 b/code/DocsSample/Media/AVImageGenerator/AVImageGeneratorNDK/entry/src/main/module.json5
index 73568a4646..e5080a1087 100644
--- a/code/DocsSample/Media/AVImageGenerator/AVImageGeneratorNDK/entry/src/main/module.json5
+++ b/code/DocsSample/Media/AVImageGenerator/AVImageGeneratorNDK/entry/src/main/module.json5
@@ -20,8 +20,7 @@
     "mainElement": "EntryAbility",
     "deviceTypes": [
       "default",
-      "tablet",
-      "2in1"
+      "tablet"
     ],
     "deliveryWithInstall": true,
     "installationFree": false,
diff --git a/code/DocsSample/Media/AVImageGenerator/AVImageGeneratorNDK/entry/src/ohosTest/module.json5 b/code/DocsSample/Media/AVImageGenerator/AVImageGeneratorNDK/entry/src/ohosTest/module.json5
index 8c06b9c042..f6bdce9946 100644
--- a/code/DocsSample/Media/AVImageGenerator/AVImageGeneratorNDK/entry/src/ohosTest/module.json5
+++ b/code/DocsSample/Media/AVImageGenerator/AVImageGeneratorNDK/entry/src/ohosTest/module.json5
@@ -18,8 +18,7 @@
     "type": "feature",
     "deviceTypes": [
       "default",
-      "tablet",
-      "2in1"
+      "tablet"
     ],
     "deliveryWithInstall": true,
     "installationFree": false
diff --git a/code/DocsSample/Media/AVMetadataExtractor/AVMetadataExtractorArkTS/entry/src/main/module.json5 b/code/DocsSample/Media/AVMetadataExtractor/AVMetadataExtractorArkTS/entry/src/main/module.json5
index 73568a4646..e5080a1087 100644
--- a/code/DocsSample/Media/AVMetadataExtractor/AVMetadataExtractorArkTS/entry/src/main/module.json5
+++ b/code/DocsSample/Media/AVMetadataExtractor/AVMetadataExtractorArkTS/entry/src/main/module.json5
@@ -20,8 +20,7 @@
     "mainElement": "EntryAbility",
     "deviceTypes": [
       "default",
-      "tablet",
-      "2in1"
+      "tablet"
     ],
     "deliveryWithInstall": true,
     "installationFree": false,
diff --git a/code/DocsSample/Media/AVMetadataExtractor/AVMetadataExtractorArkTS/entry/src/ohosTest/module.json5 b/code/DocsSample/Media/AVMetadataExtractor/AVMetadataExtractorArkTS/entry/src/ohosTest/module.json5
index 8c06b9c042..f6bdce9946 100644
--- a/code/DocsSample/Media/AVMetadataExtractor/AVMetadataExtractorArkTS/entry/src/ohosTest/module.json5
+++ b/code/DocsSample/Media/AVMetadataExtractor/AVMetadataExtractorArkTS/entry/src/ohosTest/module.json5
@@ -18,8 +18,7 @@
     "type": "feature",
     "deviceTypes": [
       "default",
-      "tablet",
-      "2in1"
+      "tablet"
     ],
     "deliveryWithInstall": true,
     "installationFree": false
diff --git a/code/DocsSample/Media/AVMetadataExtractor/AVMetadataExtractorNDK/entry/src/main/module.json5 b/code/DocsSample/Media/AVMetadataExtractor/AVMetadataExtractorNDK/entry/src/main/module.json5
index 73568a4646..e5080a1087 100644
--- a/code/DocsSample/Media/AVMetadataExtractor/AVMetadataExtractorNDK/entry/src/main/module.json5
+++ b/code/DocsSample/Media/AVMetadataExtractor/AVMetadataExtractorNDK/entry/src/main/module.json5
@@ -20,8 +20,7 @@
     "mainElement": "EntryAbility",
     "deviceTypes": [
       "default",
-      "tablet",
-      "2in1"
+      "tablet"
     ],
     "deliveryWithInstall": true,
     "installationFree": false,
diff --git a/code/DocsSample/Media/AVMetadataExtractor/AVMetadataExtractorNDK/entry/src/ohosTest/module.json5 b/code/DocsSample/Media/AVMetadataExtractor/AVMetadataExtractorNDK/entry/src/ohosTest/module.json5
index 8c06b9c042..f6bdce9946 100644
--- a/code/DocsSample/Media/AVMetadataExtractor/AVMetadataExtractorNDK/entry/src/ohosTest/module.json5
+++ b/code/DocsSample/Media/AVMetadataExtractor/AVMetadataExtractorNDK/entry/src/ohosTest/module.json5
@@ -18,8 +18,7 @@
     "type": "feature",
     "deviceTypes": [
       "default",
-      "tablet",
-      "2in1"
+      "tablet"
     ],
     "deliveryWithInstall": true,
     "installationFree": false
diff --git a/code/DocsSample/Media/AVTranscoder/AVTranscoderArkTS/entry/src/main/module.json5 b/code/DocsSample/Media/AVTranscoder/AVTranscoderArkTS/entry/src/main/module.json5
index 73568a4646..e5080a1087 100644
--- a/code/DocsSample/Media/AVTranscoder/AVTranscoderArkTS/entry/src/main/module.json5
+++ b/code/DocsSample/Media/AVTranscoder/AVTranscoderArkTS/entry/src/main/module.json5
@@ -20,8 +20,7 @@
     "mainElement": "EntryAbility",
     "deviceTypes": [
       "default",
-      "tablet",
-      "2in1"
+      "tablet"
     ],
     "deliveryWithInstall": true,
     "installationFree": false,
diff --git a/code/DocsSample/Media/AVTranscoder/AVTranscoderArkTS/entry/src/ohosTest/module.json5 b/code/DocsSample/Media/AVTranscoder/AVTranscoderArkTS/entry/src/ohosTest/module.json5
index 8c06b9c042..f6bdce9946 100644
--- a/code/DocsSample/Media/AVTranscoder/AVTranscoderArkTS/entry/src/ohosTest/module.json5
+++ b/code/DocsSample/Media/AVTranscoder/AVTranscoderArkTS/entry/src/ohosTest/module.json5
@@ -18,8 +18,7 @@
     "type": "feature",
     "deviceTypes": [
       "default",
-      "tablet",
-      "2in1"
+      "tablet"
     ],
     "deliveryWithInstall": true,
     "installationFree": false
diff --git a/code/DocsSample/Media/AVTranscoder/AsyncTranscoder/entry/src/main/module.json5 b/code/DocsSample/Media/AVTranscoder/AsyncTranscoder/entry/src/main/module.json5
index 73568a4646..e5080a1087 100644
--- a/code/DocsSample/Media/AVTranscoder/AsyncTranscoder/entry/src/main/module.json5
+++ b/code/DocsSample/Media/AVTranscoder/AsyncTranscoder/entry/src/main/module.json5
@@ -20,8 +20,7 @@
     "mainElement": "EntryAbility",
     "deviceTypes": [
       "default",
-      "tablet",
-      "2in1"
+      "tablet"
     ],
     "deliveryWithInstall": true,
     "installationFree": false,
diff --git a/code/DocsSample/Media/AVTranscoder/AsyncTranscoder/entry/src/ohosTest/module.json5 b/code/DocsSample/Media/AVTranscoder/AsyncTranscoder/entry/src/ohosTest/module.json5
index 8c06b9c042..f6bdce9946 100644
--- a/code/DocsSample/Media/AVTranscoder/AsyncTranscoder/entry/src/ohosTest/module.json5
+++ b/code/DocsSample/Media/AVTranscoder/AsyncTranscoder/entry/src/ohosTest/module.json5
@@ -18,8 +18,7 @@
     "type": "feature",
     "deviceTypes": [
       "default",
-      "tablet",
-      "2in1"
+      "tablet"
     ],
     "deliveryWithInstall": true,
     "installationFree": false
diff --git a/code/DocsSample/Media/SoundPool/SoundPoolArkTS/entry/src/main/module.json5 b/code/DocsSample/Media/SoundPool/SoundPoolArkTS/entry/src/main/module.json5
index 5f204a9e1f..f193e13dc4 100644
--- a/code/DocsSample/Media/SoundPool/SoundPoolArkTS/entry/src/main/module.json5
+++ b/code/DocsSample/Media/SoundPool/SoundPoolArkTS/entry/src/main/module.json5
@@ -21,8 +21,7 @@
     "mainElement": "EntryAbility",
     "deviceTypes": [
       "default",
-      "tablet",
-      "2in1"
+      "tablet"
     ],
     "deliveryWithInstall": true,
     "installationFree": false,
diff --git a/code/DocsSample/Media/SoundPool/SoundPoolArkTS/entry/src/ohosTest/module.json5 b/code/DocsSample/Media/SoundPool/SoundPoolArkTS/entry/src/ohosTest/module.json5
index c5e8a689f0..c3fd9dda30 100644
--- a/code/DocsSample/Media/SoundPool/SoundPoolArkTS/entry/src/ohosTest/module.json5
+++ b/code/DocsSample/Media/SoundPool/SoundPoolArkTS/entry/src/ohosTest/module.json5
@@ -19,8 +19,7 @@
     "type": "feature",
     "deviceTypes": [
       "default",
-      "tablet",
-      "2in1"
+      "tablet"
     ],
     "deliveryWithInstall": true,
     "installationFree": false
-- 
Gitee