rollback 2in1

Signed-off-by: N txl <tangxianglei@huawei.com>

rollback 2in1
Signed-off-by: N txl <tangxianglei@huawei.com>
0acb67b3 · txl · f51186e1 · 0acb67b3 · 0acb67b3 · 0acb67b3
94 changed file
--- a/inputmethod/InputMethodAuthorityTest/entry/src/main/module.json
+++ b/inputmethod/InputMethodAuthorityTest/entry/src/main/module.json
@@ -8,8 +8,7 @@
        "deviceTypes": [
            "tablet",
            "default",
-            "phone",
+            "phone"
-            "2in1"
        ],
        "deliveryWithInstall": true,
        "installationFree": false,

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

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

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

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

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

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

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

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

--- a/multimedia/audio/audio_js_standard/AudioCapturer/src/main/config.json
+++ b/multimedia/audio/audio_js_standard/AudioCapturer/src/main/config.json
@@ -19,8 +19,7 @@
        "deviceType": [
            "tablet",
            "default",
-            "phone",
+            "phone"
-            "2in1"
        ],
        "distro": {
            "deliveryWithInstall": true,

--- a/multimedia/audio/audio_js_standard/AudioCapturerChangeInfo/src/main/config.json
+++ b/multimedia/audio/audio_js_standard/AudioCapturerChangeInfo/src/main/config.json
@@ -19,8 +19,7 @@
        "deviceType": [
            "tablet",
            "default",
-            "phone",
+            "phone"
-            "2in1"
        ],
        "distro": {
            "deliveryWithInstall": true,

--- a/multimedia/audio/audio_js_standard/AudioEventManagement/src/main/config.json
+++ b/multimedia/audio/audio_js_standard/AudioEventManagement/src/main/config.json
@@ -49,8 +49,7 @@
            "phone",
            "tablet",
            "tv",
-            "wearable",
+            "wearable"
-            "2in1"
        ],
        "mainAbility": "ohos.acts.multimedia.audio.audioeventmanagement.MainAbility",
        "distro": {

--- a/multimedia/audio/audio_js_standard/AudioRendererChangeInfo/src/main/config.json
+++ b/multimedia/audio/audio_js_standard/AudioRendererChangeInfo/src/main/config.json
@@ -49,8 +49,7 @@
            "phone",
            "tablet",
            "tv",
-            "wearable",
+            "wearable"
-            "2in1"
        ],
        "mainAbility": "ohos.acts.multimedia.audio.audiorendererchangeInfo.MainAbility",
        "distro": {

--- a/multimedia/audio/audio_js_standard/audioInterrupt/src/main/config.json
+++ b/multimedia/audio/audio_js_standard/audioInterrupt/src/main/config.json
@@ -45,8 +45,7 @@
        ],
        "deviceType": [
            "tablet",
-            "default",
+            "default"
-            "2in1"
        ],
        "mainAbility": "ohos.acts.multimedia.audio.audiointerrupt.MainAbility",
        "distro": {

--- a/multimedia/audio/audio_js_standard/audioInterruptRender/entry/src/main/config.json
+++ b/multimedia/audio/audio_js_standard/audioInterruptRender/entry/src/main/config.json
@@ -18,8 +18,7 @@
        "mainAbility": ".MainAbility",
        "deviceType": [
            "tablet",
-            "default",
+            "default"
-            "2in1"
        ],
        "distro": {
            "deliveryWithInstall": true,

--- a/multimedia/audio/audio_js_standard/audioManager/src/main/config.json
+++ b/multimedia/audio/audio_js_standard/audioManager/src/main/config.json
@@ -19,8 +19,7 @@
        "deviceType": [
            "tablet",
            "default",
-            "phone",
+            "phone"
-            "2in1"
        ],
        "distro": {
            "deliveryWithInstall": true,

--- a/multimedia/audio/audio_js_standard/audioRenderer/src/main/config.json
+++ b/multimedia/audio/audio_js_standard/audioRenderer/src/main/config.json
@@ -49,8 +49,7 @@
            "phone",
            "tablet",
            "tv",
-            "wearable",
+            "wearable"
-            "2in1"
        ],
        "mainAbility": "ohos.acts.multimedia.audio.audiorenderer.MainAbility",
        "distro": {

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

--- a/multimedia/audio/audio_js_standard/audio_ndk_test/entry/src/main/config.json
+++ b/multimedia/audio/audio_js_standard/audio_ndk_test/entry/src/main/config.json
@@ -20,8 +20,7 @@
        "deviceType": [
            "tablet",
            "default",
-            "phone",
+            "phone"
-            "2in1"
        ],
        "distro": {
            "deliveryWithInstall": true,

--- a/multimedia/avsession/avsession_js_standard/avsessionManager/src/main/config.json
+++ b/multimedia/avsession/avsession_js_standard/avsessionManager/src/main/config.json
@@ -61,8 +61,7 @@
        ],
        "deviceType": [
            "tablet",
-            "default",
+            "default"
-            "2in1"
        ],
        "distro": {
            "moduleType": "entry",

--- a/multimedia/camera/camera_js_standard/entry/src/config.json
+++ b/multimedia/camera/camera_js_standard/entry/src/config.json
@@ -21,8 +21,7 @@
        "deviceType": [
            "tablet",
            "default",
-            "phone",
+            "phone"
-            "2in1"
        ],
        "distro": {
            "deliveryWithInstall": true,

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

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

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

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

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

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

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

--- a/multimedia/image/image_js_standard/imagePixelMapNDK/entry/src/main/config.json
+++ b/multimedia/image/image_js_standard/imagePixelMapNDK/entry/src/main/config.json
@@ -20,8 +20,7 @@
        "deviceType": [
            "tablet",
            "default",
-            "phone",
+            "phone"
-            "2in1"
        ],
        "distro": {
            "deliveryWithInstall": true,

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

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

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

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

--- a/multimedia/image/image_js_standard/imageReceiverNDK/entry/src/main/config.json
+++ b/multimedia/image/image_js_standard/imageReceiverNDK/entry/src/main/config.json
@@ -20,8 +20,7 @@
        "deviceType": [
            "tablet",
            "default",
-            "phone",
+            "phone"
-            "2in1"
        ],
        "distro": {
            "deliveryWithInstall": true,

--- a/multimedia/image/image_js_standard/imageSourceNDK/entry/src/main/config.json
+++ b/multimedia/image/image_js_standard/imageSourceNDK/entry/src/main/config.json
@@ -20,8 +20,7 @@
        "deviceType": [
            "tablet",
            "default",
-            "phone",
+            "phone"
-            "2in1"
        ],
        "distro": {
            "deliveryWithInstall": true,

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

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

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

--- a/multimedia/image/image_js_standard/image_ndk_test/entry/src/main/config.json
+++ b/multimedia/image/image_js_standard/image_ndk_test/entry/src/main/config.json
@@ -20,8 +20,7 @@
        "deviceType": [
            "tablet",
            "default",
-            "phone",
+            "phone"
-            "2in1"
        ],
        "distro": {
            "deliveryWithInstall": true,

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

--- a/multimedia/media/media_js_standard/audioRecorder/src/main/config.json
+++ b/multimedia/media/media_js_standard/audioRecorder/src/main/config.json
@@ -62,8 +62,7 @@
            "default",
            "tablet",
            "tv",
-            "wearable",
+            "wearable"
-            "2in1"
        ],
        "reqPermissions": [
            {

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

--- a/multimedia/media/media_js_standard/avRecorder/src/main/config.json
+++ b/multimedia/media/media_js_standard/avRecorder/src/main/config.json
@@ -62,8 +62,7 @@
            "default",
            "tablet",
            "tv",
-            "wearable",
+            "wearable"
-            "2in1"
        ],
        "reqPermissions": [
            {

--- a/multimedia/media/media_js_standard/hlsPlayer/src/main/config.json
+++ b/multimedia/media/media_js_standard/hlsPlayer/src/main/config.json
@@ -49,8 +49,7 @@
            "default",
            "tablet",
            "tv",
-            "wearable",
+            "wearable"
-            "2in1"
        ],
        "mainAbility": "ohos.acts.multimedia.media.hlsplayer.MainAbility",
        "distro": {

--- a/multimedia/media/media_js_standard/httpPlayer/src/main/config.json
+++ b/multimedia/media/media_js_standard/httpPlayer/src/main/config.json
@@ -49,8 +49,7 @@
            "phone",
            "tablet",
            "tv",
-            "wearable",
+            "wearable"
-            "2in1"
        ],
        "mainAbility": "ohos.acts.multimedia.http.httpplayer.MainAbility",
        "distro": {

--- a/multimedia/media/media_js_standard/recorderFormat/src/main/config.json
+++ b/multimedia/media/media_js_standard/recorderFormat/src/main/config.json
@@ -62,8 +62,7 @@
            "default",
            "tablet",
            "tv",
-            "wearable",
+            "wearable"
-            "2in1"
        ],
        "reqPermissions": [
            {

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

--- a/notification/ces_standard/subscribeandpublish/actssubscriberorderedtest/src/main/config.json
+++ b/notification/ces_standard/subscribeandpublish/actssubscriberorderedtest/src/main/config.json
@@ -19,8 +19,7 @@
        "deviceType": [
            "tablet",
            "default",
-            "phone",
+            "phone"
-            "2in1"
        ],
        "distro": {
            "deliveryWithInstall": true,

--- a/notification/ces_standard/subscribeandpublish/actssubscriberunordertest/src/main/config.json
+++ b/notification/ces_standard/subscribeandpublish/actssubscriberunordertest/src/main/config.json
@@ -19,8 +19,7 @@
        "deviceType": [
            "tablet",
            "default",
-            "phone",
+            "phone"
-            "2in1"
        ],
        "distro": {
            "deliveryWithInstall": true,

--- a/notification/ces_standard/subscribeandpublish/emittertest/src/main/config.json
+++ b/notification/ces_standard/subscribeandpublish/emittertest/src/main/config.json
@@ -19,8 +19,7 @@
        "deviceType": [
            "tablet",
            "default",
-            "phone",
+            "phone"
-            "2in1"
        ],
        "distro": {
            "deliveryWithInstall": true,

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

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

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

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

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

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

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

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

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

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

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

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

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

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