From 2fca13b243a4c590920755534ad4ac6d83815397 Mon Sep 17 00:00:00 2001 From: chengxingzhen Date: Mon, 17 Oct 2022 16:53:17 +0800 Subject: [PATCH] =?UTF-8?q?xts=E5=A4=B1=E8=B4=A5=E7=94=A8=E4=BE=8B?= =?UTF-8?q?=E9=80=82=E9=85=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: chengxingzhen --- .../AACommand08/entry/src/main/module.json | 3 +- .../entry/src/main/module.json | 1 - .../entry/src/main/module.json | 3 +- .../entry/src/main/module.json | 3 +- .../entry/src/main/module.json | 3 +- .../entry/src/main/module.json | 3 +- .../AACommandtest/entry/src/main/module.json | 3 +- .../src/main/config.json | 3 +- .../src/main/config.json | 3 +- .../src/main/config.json | 3 +- .../src/main/config.json | 3 +- .../src/main/config.json | 3 +- .../src/main/config.json | 3 +- .../src/main/config.json | 3 +- .../src/main/config.json | 3 +- .../src/main/config.json | 3 +- .../src/main/config.json | 3 +- .../simulateEAbility/src/main/config.json | 3 +- .../simulateFAbilityFir/src/main/config.json | 3 +- .../simulateFAbilitySed/src/main/config.json | 3 +- .../verifyAAbility/src/main/config.json | 3 +- .../verifyIAbility/src/main/config.json | 3 +- .../abilitymontior/entry/src/main/module.json | 3 +- .../entry/src/main/module.json | 3 +- .../entry/src/main/module.json | 3 +- .../entry/src/main/module.json | 3 +- .../entry/src/main/module.json | 3 +- .../src/main/config.json | 3 +- .../entry/src/main/module.json | 3 +- .../entry/src/main/module.json | 1 - .../entry/src/main/module.json | 1 - .../entry/src/main/module.json | 1 - .../entry/src/main/module.json | 1 - .../entry/src/main/module.json | 1 - .../entry/src/main/module.json | 1 - .../entry/src/main/module.json | 1 - .../entry/src/main/module.json | 1 - .../entry/src/main/config.json | 3 +- .../entry/src/main/config.json | 1 - .../entry/src/main/module.json | 3 +- .../entry/src/main/module.json | 2 +- .../entry/src/main/module.json | 2 +- .../entry/src/main/module.json | 2 +- .../entry/src/main/module.json | 2 +- .../entry/src/main/module.json | 2 +- .../entry/src/main/module.json | 2 +- .../entry/src/main/module.json | 2 +- .../entry/src/main/module.json | 2 +- .../entry/src/main/module.json | 2 +- .../entry/src/main/module.json | 2 +- .../entry/src/main/module.json | 2 +- .../entry/src/main/module.json | 2 +- .../entry/src/main/module.json | 2 +- .../entry/src/main/module.json | 2 +- .../entry/src/main/module.json | 2 +- .../entry/src/main/module.json | 2 +- .../entry/src/main/module.json | 2 +- .../entry/src/main/module.json | 2 +- .../entry/src/main/module.json | 2 +- .../entry/src/main/config.json | 2 +- .../entry/src/main/config.json | 2 +- .../entry/src/main/config.json | 2 +- .../entry/src/main/config.json | 2 +- .../entry/src/main/config.json | 2 +- .../entry/src/main/config.json | 2 +- .../entry/src/main/config.json | 2 +- .../entry/src/main/config.json | 2 +- .../entry/src/main/config.json | 2 +- .../entry/src/main/config.json | 2 +- .../entry/src/main/config.json | 2 +- .../entry/src/main/module.json | 3 +- .../entry/src/main/module.json | 3 +- .../entry/src/main/module.json | 3 +- .../entry/src/main/module.json | 3 +- .../entry/src/main/module.json | 3 +- .../entry/src/main/module.json | 3 +- .../thirdappa/entry/src/main/module.json | 3 +- .../thirdcalltest/entry/src/main/module.json | 3 +- .../src/main/config.json | 3 +- .../entry/src/main/config.json | 3 +- .../src/main/config.json | 5 +- .../entry/src/main/module.json | 3 +- .../entry/src/main/module.json | 3 +- .../entry/src/main/module.json | 3 +- .../entry/src/main/module.json | 3 +- .../entry/src/main/module.json | 3 +- .../entry/src/main/module.json | 3 +- .../src/main/config.json | 3 +- .../entry/src/main/config.json | 3 +- .../entry/src/main/config.json | 3 +- .../entry/src/main/module.json | 3 +- .../entry/src/main/module.json | 3 +- .../ability_runtime/actssingleton/BUILD.gn | 16 +- .../actssingleton/SystemSingleton/BUILD.gn | 4 +- .../actssingleton/SystemSingleton/Test.json | 4 +- .../entry/src/main/module.json | 2 +- .../SystemSingletonExtension/BUILD.gn | 4 +- .../SystemSingletonExtension/Test.json | 4 +- .../entry/src/main/module.json | 2 +- .../SystemSingletonExtensionFalse/BUILD.gn | 4 +- .../SystemSingletonExtensionFalse/Test.json | 4 +- .../entry/src/main/module.json | 2 +- .../SystemSingletonFalse/BUILD.gn | 4 +- .../SystemSingletonFalse/Test.json | 4 +- .../entry/src/main/module.json | 2 +- .../actssingleton/ThirdSingleton/BUILD.gn | 4 +- .../actssingleton/ThirdSingleton/Test.json | 4 +- .../ThirdSingleton/entry/src/main/module.json | 2 +- .../ThirdSingletonExtension/BUILD.gn | 4 +- .../ThirdSingletonExtension/Test.json | 4 +- .../entry/src/main/module.json | 2 +- .../ThirdSingletonExtensionFalse/BUILD.gn | 4 +- .../ThirdSingletonExtensionFalse/Test.json | 4 +- .../entry/src/main/module.json | 2 +- .../ThirdSingletonFalse/BUILD.gn | 4 +- .../ThirdSingletonFalse/Test.json | 4 +- .../entry/src/main/module.json | 2 +- .../entry/src/main/module.json | 3 +- .../entry/src/main/config.json | 3 +- .../actsonandoffscreentest/BUILD.gn | 1 + .../main/ets/test/OnAndOffScreenTest.test.ets | 14 +- .../entry/src/main/module.json | 3 +- .../actssupportfunctiontest/BUILD.gn | 1 + .../entry/src/main/module.json | 3 +- .../entry/src/main/config.json | 3 +- .../entry/src/main/config.json | 3 +- .../fasupportfunctiontwo/src/main/config.json | 3 +- .../entry/src/main/config.json | 3 +- .../stageonandoffscreen/BUILD.gn | 1 + .../entry/src/main/module.json | 3 +- .../stagesupportfunction/BUILD.gn | 1 + .../entry/src/main/module.json | 3 +- .../entry/src/main/config.json | 3 +- .../entry/src/main/module.json | 2 +- .../entry/src/main/module.json | 2 +- .../entry/src/main/module.json | 3 +- .../entry/src/main/module.json | 3 +- .../entry/src/main/module.json | 3 +- .../entry/src/main/ets/test/Ability.test.ets | 64 ++-- .../entry/src/main/module.json | 3 +- .../entry/src/main/module.json | 2 +- .../entry/src/main/module.json | 2 +- .../entry/src/main/module.json | 2 +- .../entry/src/main/module.json | 3 +- .../entry/src/main/ets/test/Ability.test.ets | 2 +- .../entry/src/main/module.json | 3 +- .../entry/src/main/module.json | 3 +- .../entry/src/main/ets/test/Ability.test.ets | 4 +- .../entry/src/main/module.json | 3 +- .../entry/src/main/module.json | 3 +- .../entry/src/main/module.json | 3 +- .../entry/src/main/ets/test/Ability.test.ets | 4 +- .../entry/src/main/module.json | 3 +- .../entry/src/main/module.json | 161 +++++----- .../entry/src/main/module.json | 3 +- .../entry/src/main/module.json | 3 +- .../amsdatauriutils/src/main/config.json | 5 +- .../entry/src/main/module.json | 3 +- .../entry/src/main/ets/test/Ability.test.ets | 82 ++--- .../entry/src/main/module.json | 206 ++++++------ .../entry/src/main/ets/test/Ability.test.ets | 72 ++--- .../entry/src/main/module.json | 3 +- .../src/main/config.json | 5 +- .../entry/src/main/module.json | 3 +- .../fasupplement/entry/src/main/config.json | 3 +- .../formmodule/entry/src/main/module.json | 3 +- .../entry/src/main/module.json | 3 +- .../apitest/entry/src/main/module.json | 3 +- .../actscontexttest/src/main/config.json | 3 +- .../entry/src/main/module.json | 1 - .../entry/src/main/module.json | 1 - .../entry/src/main/module.json | 1 - .../scene/defpermission/src/main/config.json | 3 +- .../fa/faapplicationinfo/src/main/config.json | 3 +- .../src/main/config.json | 3 +- .../fa/facoverapi/src/main/config.json | 3 +- .../src/main/config.json | 3 +- .../entry/src/main/config.json | 1 - .../faauxiliary/entry/src/main/config.json | 1 - .../entry/src/main/config.json | 1 - .../src/main/config.json | 3 +- .../src/main/config.json | 3 +- .../finishwithresulttest/src/main/config.json | 3 +- .../getcallingbundletest/src/main/config.json | 3 +- .../startability/src/main/config.json | 3 +- .../src/main/config.json | 3 +- .../terminateabilitytest/src/main/config.json | 3 +- .../formsystemhost/entry/src/main/config.json | 3 +- .../entry/src/main/config.json | 3 +- .../entry/src/main/config.json | 3 +- .../entry/src/main/config.json | 3 +- .../entry/src/main/config.json | 3 +- .../entry/src/main/config.json | 3 +- .../entry/src/main/config.json | 3 +- .../entry/src/main/config.json | 3 +- .../entry/src/main/config.json | 3 +- .../entry/src/main/config.json | 3 +- .../entry/src/main/config.json | 3 +- .../entry/src/main/config.json | 3 +- .../entry/src/main/config.json | 3 +- .../entry/src/main/config.json | 3 +- .../entry/src/main/config.json | 3 +- .../entry/src/main/config.json | 3 +- .../entry/src/main/config.json | 3 +- .../entry/src/main/js/widget/manifest.json | 2 +- .../entry/src/main/config.json | 3 +- .../entry/src/main/js/widget/manifest.json | 2 +- .../entry/src/main/config.json | 3 +- .../entry/src/main/js/widget/manifest.json | 2 +- .../entry/src/main/config.json | 3 +- .../entry/src/main/js/widget/manifest.json | 2 +- .../entry/src/main/config.json | 3 +- .../src/main/js/Form_Js001/manifest.json | 2 +- .../entry/src/main/config.json | 3 +- .../src/main/js/Form_Js001/manifest.json | 2 +- .../entry/src/main/config.json | 3 +- .../entry/src/main/js/widget/manifest.json | 2 +- .../entry/src/main/config.json | 3 +- .../entry/src/main/config.json | 3 +- .../entry/src/main/config.json | 3 +- .../entry/src/main/config.json | 3 +- .../entry/src/main/config.json | 3 +- .../entry/src/main/config.json | 3 +- .../entry/src/main/config.json | 3 +- .../formdeletetest/entry/src/main/config.json | 3 +- .../entry/src/main/config.json | 3 +- .../formfuzztest/entry/src/main/config.json | 3 +- .../entry/src/main/config.json | 3 +- .../entry/src/main/config.json | 3 +- .../entry/src/main/config.json | 3 +- .../entry/src/main/config.json | 3 +- .../formszerotest/entry/src/main/config.json | 3 +- .../entry/src/main/config.json | 3 +- .../entry/src/main/config.json | 3 +- .../entry/src/main/config.json | 3 +- .../entry/src/main/config.json | 3 +- .../entry/src/main/config.json | 3 +- .../entry/src/main/config.json | 3 +- .../entry/src/main/config.json | 3 +- .../entry/src/main/config.json | 3 +- .../formstresstest/entry/src/main/config.json | 3 +- .../entry/src/main/config.json | 3 +- .../entry/src/main/config.json | 1 - .../entry/src/main/module.json | 3 +- .../entry/src/main/config.json | 1 - .../entry/src/main/config.json | 1 - .../entry/src/main/config.json | 1 - .../entry/src/main/config.json | 1 - .../entry/src/main/config.json | 1 - .../entry/src/main/config.json | 1 - .../entry/src/main/config.json | 1 - .../entry/src/main/config.json | 1 - .../entry/src/main/config.json | 1 - .../entry/src/main/config.json | 1 - .../entry/src/main/module.json | 1 - .../entry/src/main/module.json | 1 - .../entry/src/main/module.json | 1 - .../entry/src/main/module.json | 1 - .../entry/src/main/module.json | 1 - .../entry/src/main/module.json | 1 - .../entry/src/main/module.json | 1 - .../entry/src/main/module.json | 1 - .../entry/src/main/module.json | 1 - .../entry/src/main/module.json | 1 - .../mockservice/entry/src/main/module.json | 3 +- .../entry/src/main/module.json | 3 +- .../entry/src/main/config.json | 1 - .../entry/src/main/config.json | 1 - .../entry/src/main/config.json | 3 +- .../entry/src/main/config.json | 3 +- .../entry/src/main/config.json | 3 +- .../entry/src/main/config.json | 3 +- .../entry/src/main/config.json | 1 - .../entry/src/main/config.json | 1 - .../entry/src/main/config.json | 3 +- .../entry/src/main/config.json | 3 +- .../entry/src/main/config.json | 3 +- .../entry/src/main/config.json | 3 +- .../entry/src/main/config.json | 1 - .../entry/src/main/module.json | 1 - .../entry/src/main/module.json | 1 - .../entry/src/main/module.json | 1 - .../entry/src/main/module.json | 1 - .../entry/src/main/module.json | 1 - .../entry/src/main/module.json | 1 - .../entry/src/main/module.json | 155 +++++---- .../entry/src/main/module.json | 1 - .../entry/src/main/module.json | 129 ++++---- .../entry/src/main/module.json | 99 +++--- .../entry/src/main/module.json | 1 - .../entry/src/main/module.json | 1 - .../entry/src/main/module.json | 3 +- .../entry/src/main/module.json | 167 +++++----- .../entry/src/main/config.json | 3 +- .../entry/src/main/module.json | 136 ++++---- .../entry/src/main/module.json | 136 ++++---- .../entry/src/main/module.json | 172 +++++----- .../entry/src/main/module.json | 162 +++++----- .../entry/src/main/module.json | 3 +- .../entry/src/main/module.json | 3 +- .../entry/src/main/module.json | 2 +- .../entry/src/main/module.json | 2 +- .../entry/src/main/module.json | 3 +- .../entry/src/main/module.json | 3 +- .../entry/src/main/module.json | 3 +- .../entry/src/main/module.json | 3 +- .../entry/src/main/module.json | 3 +- .../entry/src/main/module.json | 3 +- .../entry/src/main/module.json | 3 +- .../entry/src/main/module.json | 3 +- .../entry/src/main/module.json | 167 +++++----- .../entry/src/main/module.json | 241 +++++++------- .../entry/src/main/module.json | 85 ++--- .../entry/src/main/module.json | 223 ++++++------- .../hap4/src/main/module.json | 57 ++-- .../entry/src/main/module.json | 293 +++++++++--------- .../entry/src/main/module.json | 223 ++++++------- .../hap4/src/main/module.json | 57 ++-- .../entry/src/main/module.json | 293 +++++++++--------- .../actsgetwantalltest/src/main/config.json | 3 +- .../src/main/config.json | 3 +- .../entry/src/main/module.json | 77 +++-- .../entry/src/main/module.json | 195 ++++++------ .../entry/src/main/module.json | 3 +- .../src/main/config.json | 3 +- 325 files changed, 2114 insertions(+), 2326 deletions(-) diff --git a/ability/ability_runtime/aacommand/AACommand08/entry/src/main/module.json b/ability/ability_runtime/aacommand/AACommand08/entry/src/main/module.json index 4c8ac00a4..cc7238d29 100644 --- a/ability/ability_runtime/aacommand/AACommand08/entry/src/main/module.json +++ b/ability/ability_runtime/aacommand/AACommand08/entry/src/main/module.json @@ -6,8 +6,7 @@ "description": "$string:entry_test_desc", "mainElement": "MainAbility", "deviceTypes": [ - "default", - "phone", + "default", "tablet" ], "deliveryWithInstall": true, diff --git a/ability/ability_runtime/aacommand/AACommandPrintOneTest/entry/src/main/module.json b/ability/ability_runtime/aacommand/AACommandPrintOneTest/entry/src/main/module.json index 9b2e7217e..7ac0abadd 100644 --- a/ability/ability_runtime/aacommand/AACommandPrintOneTest/entry/src/main/module.json +++ b/ability/ability_runtime/aacommand/AACommandPrintOneTest/entry/src/main/module.json @@ -7,7 +7,6 @@ "mainElement": "MainAbility", "deviceTypes": [ "default", - "phone", "tablet" ], "deliveryWithInstall": true, diff --git a/ability/ability_runtime/aacommand/AACommandPrintSync/entry/src/main/module.json b/ability/ability_runtime/aacommand/AACommandPrintSync/entry/src/main/module.json index b7072fbca..67d8175e3 100644 --- a/ability/ability_runtime/aacommand/AACommandPrintSync/entry/src/main/module.json +++ b/ability/ability_runtime/aacommand/AACommandPrintSync/entry/src/main/module.json @@ -6,8 +6,7 @@ "description": "$string:entry_test_desc", "mainElement": "MainAbility", "deviceTypes": [ - "default", - "phone", + "default", "tablet" ], "deliveryWithInstall": true, diff --git a/ability/ability_runtime/aacommand/AACommandPrintSyncTest/entry/src/main/module.json b/ability/ability_runtime/aacommand/AACommandPrintSyncTest/entry/src/main/module.json index 19cd72eca..344416648 100644 --- a/ability/ability_runtime/aacommand/AACommandPrintSyncTest/entry/src/main/module.json +++ b/ability/ability_runtime/aacommand/AACommandPrintSyncTest/entry/src/main/module.json @@ -6,8 +6,7 @@ "description": "$string:entry_test_desc", "mainElement": "MainAbility", "deviceTypes": [ - "default", - "phone", + "default", "tablet" ], "deliveryWithInstall": true, diff --git a/ability/ability_runtime/aacommand/AACommandRelyHap/entry/src/main/module.json b/ability/ability_runtime/aacommand/AACommandRelyHap/entry/src/main/module.json index b7072fbca..67d8175e3 100644 --- a/ability/ability_runtime/aacommand/AACommandRelyHap/entry/src/main/module.json +++ b/ability/ability_runtime/aacommand/AACommandRelyHap/entry/src/main/module.json @@ -6,8 +6,7 @@ "description": "$string:entry_test_desc", "mainElement": "MainAbility", "deviceTypes": [ - "default", - "phone", + "default", "tablet" ], "deliveryWithInstall": true, diff --git a/ability/ability_runtime/aacommand/AACommandpackage/entry/src/main/module.json b/ability/ability_runtime/aacommand/AACommandpackage/entry/src/main/module.json index b7072fbca..67d8175e3 100644 --- a/ability/ability_runtime/aacommand/AACommandpackage/entry/src/main/module.json +++ b/ability/ability_runtime/aacommand/AACommandpackage/entry/src/main/module.json @@ -6,8 +6,7 @@ "description": "$string:entry_test_desc", "mainElement": "MainAbility", "deviceTypes": [ - "default", - "phone", + "default", "tablet" ], "deliveryWithInstall": true, diff --git a/ability/ability_runtime/aacommand/AACommandtest/entry/src/main/module.json b/ability/ability_runtime/aacommand/AACommandtest/entry/src/main/module.json index 19cd72eca..344416648 100644 --- a/ability/ability_runtime/aacommand/AACommandtest/entry/src/main/module.json +++ b/ability/ability_runtime/aacommand/AACommandtest/entry/src/main/module.json @@ -6,8 +6,7 @@ "description": "$string:entry_test_desc", "mainElement": "MainAbility", "deviceTypes": [ - "default", - "phone", + "default", "tablet" ], "deliveryWithInstall": true, diff --git a/ability/ability_runtime/abilitymanager/actsamscallbackfifthscene/src/main/config.json b/ability/ability_runtime/abilitymanager/actsamscallbackfifthscene/src/main/config.json index e68dd4067..573d4e353 100644 --- a/ability/ability_runtime/abilitymanager/actsamscallbackfifthscene/src/main/config.json +++ b/ability/ability_runtime/abilitymanager/actsamscallbackfifthscene/src/main/config.json @@ -19,8 +19,7 @@ "mainAbility": ".MainAbility", "srcPath":"", "deviceType": [ - "default", - "phone" + "default" ], "distro": { "deliveryWithInstall": true, diff --git a/ability/ability_runtime/abilitymanager/actsamscallbackfirstscene/src/main/config.json b/ability/ability_runtime/abilitymanager/actsamscallbackfirstscene/src/main/config.json index 98b5a3ac6..a2957676b 100644 --- a/ability/ability_runtime/abilitymanager/actsamscallbackfirstscene/src/main/config.json +++ b/ability/ability_runtime/abilitymanager/actsamscallbackfirstscene/src/main/config.json @@ -19,8 +19,7 @@ "mainAbility": ".MainAbility", "srcPath":"", "deviceType": [ - "default", - "phone" + "default" ], "distro": { "deliveryWithInstall": true, diff --git a/ability/ability_runtime/abilitymanager/actsamscallbackfourthscene/src/main/config.json b/ability/ability_runtime/abilitymanager/actsamscallbackfourthscene/src/main/config.json index c13a28be2..d57533142 100644 --- a/ability/ability_runtime/abilitymanager/actsamscallbackfourthscene/src/main/config.json +++ b/ability/ability_runtime/abilitymanager/actsamscallbackfourthscene/src/main/config.json @@ -19,8 +19,7 @@ "mainAbility": ".MainAbility", "srcPath":"", "deviceType": [ - "default", - "phone" + "default" ], "distro": { "deliveryWithInstall": true, diff --git a/ability/ability_runtime/abilitymanager/actsamscallbacksecondscene/src/main/config.json b/ability/ability_runtime/abilitymanager/actsamscallbacksecondscene/src/main/config.json index e6b6b6497..be067eaf1 100644 --- a/ability/ability_runtime/abilitymanager/actsamscallbacksecondscene/src/main/config.json +++ b/ability/ability_runtime/abilitymanager/actsamscallbacksecondscene/src/main/config.json @@ -19,8 +19,7 @@ "mainAbility": ".MainAbility", "srcPath":"", "deviceType": [ - "default", - "phone" + "default" ], "distro": { "deliveryWithInstall": true, diff --git a/ability/ability_runtime/abilitymanager/actsamscallbackthirdscene/src/main/config.json b/ability/ability_runtime/abilitymanager/actsamscallbackthirdscene/src/main/config.json index 75d5900a2..926b54d3f 100644 --- a/ability/ability_runtime/abilitymanager/actsamscallbackthirdscene/src/main/config.json +++ b/ability/ability_runtime/abilitymanager/actsamscallbackthirdscene/src/main/config.json @@ -19,8 +19,7 @@ "mainAbility": ".MainAbility", "srcPath":"", "deviceType": [ - "default", - "phone" + "default" ], "distro": { "deliveryWithInstall": true, diff --git a/ability/ability_runtime/abilitymanager/actsamstestfifthscene/src/main/config.json b/ability/ability_runtime/abilitymanager/actsamstestfifthscene/src/main/config.json index c2b7d9418..b9c609759 100644 --- a/ability/ability_runtime/abilitymanager/actsamstestfifthscene/src/main/config.json +++ b/ability/ability_runtime/abilitymanager/actsamstestfifthscene/src/main/config.json @@ -19,8 +19,7 @@ "mainAbility": ".MainAbility", "srcPath":"", "deviceType": [ - "default", - "phone" + "default" ], "distro": { "deliveryWithInstall": true, diff --git a/ability/ability_runtime/abilitymanager/actsamstestfirstscene/src/main/config.json b/ability/ability_runtime/abilitymanager/actsamstestfirstscene/src/main/config.json index 0ee07351d..14099860f 100644 --- a/ability/ability_runtime/abilitymanager/actsamstestfirstscene/src/main/config.json +++ b/ability/ability_runtime/abilitymanager/actsamstestfirstscene/src/main/config.json @@ -19,8 +19,7 @@ "mainAbility": ".MainAbility", "srcPath":"", "deviceType": [ - "default", - "phone" + "default" ], "distro": { "deliveryWithInstall": true, diff --git a/ability/ability_runtime/abilitymanager/actsamstestfourthscene/src/main/config.json b/ability/ability_runtime/abilitymanager/actsamstestfourthscene/src/main/config.json index 78cb23d92..5a25909c3 100644 --- a/ability/ability_runtime/abilitymanager/actsamstestfourthscene/src/main/config.json +++ b/ability/ability_runtime/abilitymanager/actsamstestfourthscene/src/main/config.json @@ -19,8 +19,7 @@ "mainAbility": ".MainAbility", "srcPath":"", "deviceType": [ - "default", - "phone" + "default" ], "distro": { "deliveryWithInstall": true, diff --git a/ability/ability_runtime/abilitymanager/actsamstestsecondscene/src/main/config.json b/ability/ability_runtime/abilitymanager/actsamstestsecondscene/src/main/config.json index 56d9adbc0..d62094397 100644 --- a/ability/ability_runtime/abilitymanager/actsamstestsecondscene/src/main/config.json +++ b/ability/ability_runtime/abilitymanager/actsamstestsecondscene/src/main/config.json @@ -19,8 +19,7 @@ "mainAbility": ".MainAbility", "srcPath":"", "deviceType": [ - "default", - "phone" + "default" ], "distro": { "deliveryWithInstall": true, diff --git a/ability/ability_runtime/abilitymanager/actsamstestthirdscene/src/main/config.json b/ability/ability_runtime/abilitymanager/actsamstestthirdscene/src/main/config.json index 89e35043d..c42d0b329 100644 --- a/ability/ability_runtime/abilitymanager/actsamstestthirdscene/src/main/config.json +++ b/ability/ability_runtime/abilitymanager/actsamstestthirdscene/src/main/config.json @@ -19,8 +19,7 @@ "mainAbility": ".MainAbility", "srcPath":"", "deviceType": [ - "default", - "phone" + "default" ], "distro": { "deliveryWithInstall": true, diff --git a/ability/ability_runtime/abilitymanager/sceneProject/simulateEAbility/src/main/config.json b/ability/ability_runtime/abilitymanager/sceneProject/simulateEAbility/src/main/config.json index c78ab63a3..2b858f2d1 100644 --- a/ability/ability_runtime/abilitymanager/sceneProject/simulateEAbility/src/main/config.json +++ b/ability/ability_runtime/abilitymanager/sceneProject/simulateEAbility/src/main/config.json @@ -17,8 +17,7 @@ "package": "com.example.simulateeability", "name": ".MyApplication", "deviceType": [ - "default", - "phone" + "default" ], "distro": { "deliveryWithInstall": true, diff --git a/ability/ability_runtime/abilitymanager/sceneProject/simulateFAbilityFir/src/main/config.json b/ability/ability_runtime/abilitymanager/sceneProject/simulateFAbilityFir/src/main/config.json index e7ad9a86f..7aa0318a9 100644 --- a/ability/ability_runtime/abilitymanager/sceneProject/simulateFAbilityFir/src/main/config.json +++ b/ability/ability_runtime/abilitymanager/sceneProject/simulateFAbilityFir/src/main/config.json @@ -17,8 +17,7 @@ "package": "com.example.simulatefabilityfir", "name": ".MyApplication", "deviceType": [ - "default", - "phone" + "default" ], "distro": { "deliveryWithInstall": true, diff --git a/ability/ability_runtime/abilitymanager/sceneProject/simulateFAbilitySed/src/main/config.json b/ability/ability_runtime/abilitymanager/sceneProject/simulateFAbilitySed/src/main/config.json index c2f3e47b6..a4d9b2bed 100644 --- a/ability/ability_runtime/abilitymanager/sceneProject/simulateFAbilitySed/src/main/config.json +++ b/ability/ability_runtime/abilitymanager/sceneProject/simulateFAbilitySed/src/main/config.json @@ -17,8 +17,7 @@ "package": "com.example.simulatefabilitysed", "name": ".MyApplication", "deviceType": [ - "default", - "phone" + "default" ], "distro": { "deliveryWithInstall": true, diff --git a/ability/ability_runtime/abilitymanager/sceneProject/verifyAAbility/src/main/config.json b/ability/ability_runtime/abilitymanager/sceneProject/verifyAAbility/src/main/config.json index 8c82d1fce..d97761942 100644 --- a/ability/ability_runtime/abilitymanager/sceneProject/verifyAAbility/src/main/config.json +++ b/ability/ability_runtime/abilitymanager/sceneProject/verifyAAbility/src/main/config.json @@ -17,8 +17,7 @@ "package": "com.example.verifyaability", "name": ".MyApplication", "deviceType": [ - "default", - "phone" + "default" ], "distro": { "deliveryWithInstall": true, diff --git a/ability/ability_runtime/abilitymanager/sceneProject/verifyIAbility/src/main/config.json b/ability/ability_runtime/abilitymanager/sceneProject/verifyIAbility/src/main/config.json index 42fc6c622..8b95b1a5c 100644 --- a/ability/ability_runtime/abilitymanager/sceneProject/verifyIAbility/src/main/config.json +++ b/ability/ability_runtime/abilitymanager/sceneProject/verifyIAbility/src/main/config.json @@ -17,8 +17,7 @@ "package": "com.example.verifyiability", "name": ".MyApplication", "deviceType": [ - "default", - "phone" + "default" ], "distro": { "deliveryWithInstall": true, diff --git a/ability/ability_runtime/abilitymontior/entry/src/main/module.json b/ability/ability_runtime/abilitymontior/entry/src/main/module.json index 3d6e72c4c..3c7890f03 100644 --- a/ability/ability_runtime/abilitymontior/entry/src/main/module.json +++ b/ability/ability_runtime/abilitymontior/entry/src/main/module.json @@ -6,8 +6,7 @@ "description": "$string:entry_desc", "mainElement": "MainAbility", "deviceTypes": [ - "default", - "phone" + "default" ], "deliveryWithInstall": true, "installationFree": false, diff --git a/ability/ability_runtime/abilitymultiinstance/amsabilitymultiinstanceappa/entry/src/main/module.json b/ability/ability_runtime/abilitymultiinstance/amsabilitymultiinstanceappa/entry/src/main/module.json index f23724b5b..de781134a 100644 --- a/ability/ability_runtime/abilitymultiinstance/amsabilitymultiinstanceappa/entry/src/main/module.json +++ b/ability/ability_runtime/abilitymultiinstance/amsabilitymultiinstanceappa/entry/src/main/module.json @@ -6,8 +6,7 @@ "description": "$string:phone_entry_dsc", "mainElement": "MainAbility", "deviceTypes": [ - "default", - "phone" + "default" ], "deliveryWithInstall": true, "installationFree": false, diff --git a/ability/ability_runtime/abilitymultiinstance/amsabilitymultiinstanceappb/entry/src/main/module.json b/ability/ability_runtime/abilitymultiinstance/amsabilitymultiinstanceappb/entry/src/main/module.json index eb64059ad..a010eb12b 100644 --- a/ability/ability_runtime/abilitymultiinstance/amsabilitymultiinstanceappb/entry/src/main/module.json +++ b/ability/ability_runtime/abilitymultiinstance/amsabilitymultiinstanceappb/entry/src/main/module.json @@ -6,8 +6,7 @@ "description": "$string:phone_entry_dsc", "mainElement": "MainAbility", "deviceTypes": [ - "default", - "phone" + "default" ], "deliveryWithInstall": true, "installationFree": false, diff --git a/ability/ability_runtime/abilitymultiinstance/amsabilitymultiinstanceappc/entry/src/main/module.json b/ability/ability_runtime/abilitymultiinstance/amsabilitymultiinstanceappc/entry/src/main/module.json index 1ac01030c..61fb321aa 100644 --- a/ability/ability_runtime/abilitymultiinstance/amsabilitymultiinstanceappc/entry/src/main/module.json +++ b/ability/ability_runtime/abilitymultiinstance/amsabilitymultiinstanceappc/entry/src/main/module.json @@ -6,8 +6,7 @@ "description": "$string:phone_entry_dsc", "mainElement": "MainAbility", "deviceTypes": [ - "default", - "phone" + "default" ], "deliveryWithInstall": true, "installationFree": false, diff --git a/ability/ability_runtime/abilitymultiinstance/amsabilitymultiinstanceappd/entry/src/main/module.json b/ability/ability_runtime/abilitymultiinstance/amsabilitymultiinstanceappd/entry/src/main/module.json index 980d4d28b..d92eac135 100644 --- a/ability/ability_runtime/abilitymultiinstance/amsabilitymultiinstanceappd/entry/src/main/module.json +++ b/ability/ability_runtime/abilitymultiinstance/amsabilitymultiinstanceappd/entry/src/main/module.json @@ -6,8 +6,7 @@ "description": "$string:phone_entry_dsc", "mainElement": "MainAbility", "deviceTypes": [ - "default", - "phone" + "default" ], "deliveryWithInstall": true, "installationFree": false, diff --git a/ability/ability_runtime/abilitymultiinstance/amsabilitymultiinstanceappe/src/main/config.json b/ability/ability_runtime/abilitymultiinstance/amsabilitymultiinstanceappe/src/main/config.json index 9c0f79b26..35c161f14 100644 --- a/ability/ability_runtime/abilitymultiinstance/amsabilitymultiinstanceappe/src/main/config.json +++ b/ability/ability_runtime/abilitymultiinstance/amsabilitymultiinstanceappe/src/main/config.json @@ -21,8 +21,7 @@ "package": "com.example.amsabilitymultiinstanceappe", "name": ".MyApplication", "deviceType": [ - "default", - "phone" + "default" ], "distro": { "deliveryWithInstall": true, diff --git a/ability/ability_runtime/abilitymultiinstance/amsabilitymultiinstancetest/entry/src/main/module.json b/ability/ability_runtime/abilitymultiinstance/amsabilitymultiinstancetest/entry/src/main/module.json index 0156baf35..4200717ed 100644 --- a/ability/ability_runtime/abilitymultiinstance/amsabilitymultiinstancetest/entry/src/main/module.json +++ b/ability/ability_runtime/abilitymultiinstance/amsabilitymultiinstancetest/entry/src/main/module.json @@ -6,8 +6,7 @@ "description": "$string:phone_entry_dsc", "mainElement": "MainAbility", "deviceTypes": [ - "default", - "phone" + "default" ], "deliveryWithInstall": true, "installationFree": false, diff --git a/ability/ability_runtime/abilitystagemonitor/abilitystagemonitorassista/entry/src/main/module.json b/ability/ability_runtime/abilitystagemonitor/abilitystagemonitorassista/entry/src/main/module.json index e9c2e4054..b3b145d06 100644 --- a/ability/ability_runtime/abilitystagemonitor/abilitystagemonitorassista/entry/src/main/module.json +++ b/ability/ability_runtime/abilitystagemonitor/abilitystagemonitorassista/entry/src/main/module.json @@ -7,7 +7,6 @@ "mainElement": "MainAbility", "deviceTypes": [ "default", - "phone", "tablet" ], "deliveryWithInstall": true, diff --git a/ability/ability_runtime/abilitystagemonitor/abilitystagemonitorassistc/entry/src/main/module.json b/ability/ability_runtime/abilitystagemonitor/abilitystagemonitorassistc/entry/src/main/module.json index 2dc69255f..327e861b6 100644 --- a/ability/ability_runtime/abilitystagemonitor/abilitystagemonitorassistc/entry/src/main/module.json +++ b/ability/ability_runtime/abilitystagemonitor/abilitystagemonitorassistc/entry/src/main/module.json @@ -7,7 +7,6 @@ "mainElement": "MainAbility2", "deviceTypes": [ "default", - "phone", "tablet" ], "deliveryWithInstall": true, diff --git a/ability/ability_runtime/abilitystagemonitor/abilitystagemonitorassistd/entry/src/main/module.json b/ability/ability_runtime/abilitystagemonitor/abilitystagemonitorassistd/entry/src/main/module.json index 1ab7e7623..6acc12f62 100644 --- a/ability/ability_runtime/abilitystagemonitor/abilitystagemonitorassistd/entry/src/main/module.json +++ b/ability/ability_runtime/abilitystagemonitor/abilitystagemonitorassistd/entry/src/main/module.json @@ -7,7 +7,6 @@ "mainElement": "MainAbility3", "deviceTypes": [ "default", - "phone", "tablet" ], "deliveryWithInstall": true, diff --git a/ability/ability_runtime/abilitystagemonitor/abilitystagemonitorassiste/entry/src/main/module.json b/ability/ability_runtime/abilitystagemonitor/abilitystagemonitorassiste/entry/src/main/module.json index ba8c50bb2..01fd1934e 100644 --- a/ability/ability_runtime/abilitystagemonitor/abilitystagemonitorassiste/entry/src/main/module.json +++ b/ability/ability_runtime/abilitystagemonitor/abilitystagemonitorassiste/entry/src/main/module.json @@ -7,7 +7,6 @@ "mainElement": "MainAbility4", "deviceTypes": [ "default", - "phone", "tablet" ], "deliveryWithInstall": true, diff --git a/ability/ability_runtime/abilitystagemonitor/abilitystagemonitorassistf/entry/src/main/module.json b/ability/ability_runtime/abilitystagemonitor/abilitystagemonitorassistf/entry/src/main/module.json index 14299d215..cd1b2ecab 100644 --- a/ability/ability_runtime/abilitystagemonitor/abilitystagemonitorassistf/entry/src/main/module.json +++ b/ability/ability_runtime/abilitystagemonitor/abilitystagemonitorassistf/entry/src/main/module.json @@ -7,7 +7,6 @@ "mainElement": "MainAbilityf5", "deviceTypes": [ "default", - "phone", "tablet" ], "deliveryWithInstall": true, diff --git a/ability/ability_runtime/abilitystagemonitor/abilitystagemonitorassistg/entry/src/main/module.json b/ability/ability_runtime/abilitystagemonitor/abilitystagemonitorassistg/entry/src/main/module.json index d17f8659d..67edae7e7 100644 --- a/ability/ability_runtime/abilitystagemonitor/abilitystagemonitorassistg/entry/src/main/module.json +++ b/ability/ability_runtime/abilitystagemonitor/abilitystagemonitorassistg/entry/src/main/module.json @@ -7,7 +7,6 @@ "mainElement": "MainAbility6", "deviceTypes": [ "default", - "phone", "tablet" ], "deliveryWithInstall": true, diff --git a/ability/ability_runtime/abilitystagemonitor/abilitystagemonitorassisth/entry/src/main/module.json b/ability/ability_runtime/abilitystagemonitor/abilitystagemonitorassisth/entry/src/main/module.json index af9885f31..ce69e7894 100644 --- a/ability/ability_runtime/abilitystagemonitor/abilitystagemonitorassisth/entry/src/main/module.json +++ b/ability/ability_runtime/abilitystagemonitor/abilitystagemonitorassisth/entry/src/main/module.json @@ -7,7 +7,6 @@ "mainElement": "MainAbility7", "deviceTypes": [ "default", - "phone", "tablet" ], "deliveryWithInstall": true, diff --git a/ability/ability_runtime/abilitystagemonitor/abilitystagemonitortest/entry/src/main/module.json b/ability/ability_runtime/abilitystagemonitor/abilitystagemonitortest/entry/src/main/module.json index 1868c9706..04d2ae8ed 100644 --- a/ability/ability_runtime/abilitystagemonitor/abilitystagemonitortest/entry/src/main/module.json +++ b/ability/ability_runtime/abilitystagemonitor/abilitystagemonitortest/entry/src/main/module.json @@ -7,7 +7,6 @@ "mainElement": "TestAbility", "deviceTypes": [ "default", - "phone", "tablet" ], "deliveryWithInstall": true, diff --git a/ability/ability_runtime/actsabilitydelegatorcase/entry/src/main/config.json b/ability/ability_runtime/actsabilitydelegatorcase/entry/src/main/config.json index cce709b00..752370949 100644 --- a/ability/ability_runtime/actsabilitydelegatorcase/entry/src/main/config.json +++ b/ability/ability_runtime/actsabilitydelegatorcase/entry/src/main/config.json @@ -17,8 +17,7 @@ "package": "com.amsst.actsabilitydelegatorcasetest", "name": ".MyApplication", "deviceType": [ - "default", - "phone" + "default" ], "distro": { "deliveryWithInstall": true, diff --git a/ability/ability_runtime/actsabilitymanageretstest/entry/src/main/config.json b/ability/ability_runtime/actsabilitymanageretstest/entry/src/main/config.json index c2fa25973..85363cca9 100644 --- a/ability/ability_runtime/actsabilitymanageretstest/entry/src/main/config.json +++ b/ability/ability_runtime/actsabilitymanageretstest/entry/src/main/config.json @@ -19,7 +19,6 @@ "srcPath": "", "mainAbility": "com.ohos.acecollaboration.MainAbility", "deviceType": [ - "default", "default" ], "reqPermissions": [ diff --git a/ability/ability_runtime/actsabilityusertest/entry/src/main/module.json b/ability/ability_runtime/actsabilityusertest/entry/src/main/module.json index ddc5a77fe..65be6e3dc 100644 --- a/ability/ability_runtime/actsabilityusertest/entry/src/main/module.json +++ b/ability/ability_runtime/actsabilityusertest/entry/src/main/module.json @@ -6,8 +6,7 @@ "description": "$string:entry_desc", "mainElement": "MainAbility", "deviceTypes": [ - "default", - "phone", + "default", "tablet" ], "deliveryWithInstall": true, diff --git a/ability/ability_runtime/actsappselector/actsappselectorpctest/entry/src/main/module.json b/ability/ability_runtime/actsappselector/actsappselectorpctest/entry/src/main/module.json index d4759b77f..3b55239d0 100644 --- a/ability/ability_runtime/actsappselector/actsappselectorpctest/entry/src/main/module.json +++ b/ability/ability_runtime/actsappselector/actsappselectorpctest/entry/src/main/module.json @@ -6,7 +6,7 @@ "description": "$string:entry_desc", "mainElement": "MainAbility", "deviceTypes": [ - "phone", + "default", "tablet" ], "deliveryWithInstall": true, diff --git a/ability/ability_runtime/actsappselector/actsappselectorrelyhap/entry/src/main/module.json b/ability/ability_runtime/actsappselector/actsappselectorrelyhap/entry/src/main/module.json index d4759b77f..3b55239d0 100644 --- a/ability/ability_runtime/actsappselector/actsappselectorrelyhap/entry/src/main/module.json +++ b/ability/ability_runtime/actsappselector/actsappselectorrelyhap/entry/src/main/module.json @@ -6,7 +6,7 @@ "description": "$string:entry_desc", "mainElement": "MainAbility", "deviceTypes": [ - "phone", + "default", "tablet" ], "deliveryWithInstall": true, diff --git a/ability/ability_runtime/actsappselector/actsappselectortest/entry/src/main/module.json b/ability/ability_runtime/actsappselector/actsappselectortest/entry/src/main/module.json index 63433eb8d..7c3003b37 100644 --- a/ability/ability_runtime/actsappselector/actsappselectortest/entry/src/main/module.json +++ b/ability/ability_runtime/actsappselector/actsappselectortest/entry/src/main/module.json @@ -6,7 +6,7 @@ "description": "$string:entry_desc", "mainElement": "MainAbility", "deviceTypes": [ - "phone" + "default" ], "deliveryWithInstall": true, "installationFree": false, diff --git a/ability/ability_runtime/actsappselector/actsimageaentryrelyhap/entry/src/main/module.json b/ability/ability_runtime/actsappselector/actsimageaentryrelyhap/entry/src/main/module.json index 9f0588e2b..b493f7e0d 100644 --- a/ability/ability_runtime/actsappselector/actsimageaentryrelyhap/entry/src/main/module.json +++ b/ability/ability_runtime/actsappselector/actsimageaentryrelyhap/entry/src/main/module.json @@ -6,7 +6,7 @@ "description": "$string:entry_desc", "mainElement": "MainAbility", "deviceTypes": [ - "phone", + "default", "tablet" ], "deliveryWithInstall": true, diff --git a/ability/ability_runtime/actsappselector/actsimageafeaturerelyhap/entry/src/main/module.json b/ability/ability_runtime/actsappselector/actsimageafeaturerelyhap/entry/src/main/module.json index cdf0c7dd4..a75f20ffb 100644 --- a/ability/ability_runtime/actsappselector/actsimageafeaturerelyhap/entry/src/main/module.json +++ b/ability/ability_runtime/actsappselector/actsimageafeaturerelyhap/entry/src/main/module.json @@ -6,7 +6,7 @@ "description": "$string:feature_desc", "mainElement": "MainAbility", "deviceTypes": [ - "phone", + "default", "tablet" ], "deliveryWithInstall": true, diff --git a/ability/ability_runtime/actsappselector/actsimagebentryrelyhap/entry/src/main/module.json b/ability/ability_runtime/actsappselector/actsimagebentryrelyhap/entry/src/main/module.json index d4759b77f..3b55239d0 100644 --- a/ability/ability_runtime/actsappselector/actsimagebentryrelyhap/entry/src/main/module.json +++ b/ability/ability_runtime/actsappselector/actsimagebentryrelyhap/entry/src/main/module.json @@ -6,7 +6,7 @@ "description": "$string:entry_desc", "mainElement": "MainAbility", "deviceTypes": [ - "phone", + "default", "tablet" ], "deliveryWithInstall": true, diff --git a/ability/ability_runtime/actsappselector/actsimagebfeaturerelyhap/entry/src/main/module.json b/ability/ability_runtime/actsappselector/actsimagebfeaturerelyhap/entry/src/main/module.json index 9c5991c31..dd9393a8c 100644 --- a/ability/ability_runtime/actsappselector/actsimagebfeaturerelyhap/entry/src/main/module.json +++ b/ability/ability_runtime/actsappselector/actsimagebfeaturerelyhap/entry/src/main/module.json @@ -6,7 +6,7 @@ "description": "$string:feature_desc", "mainElement": "MainAbility1", "deviceTypes": [ - "phone", + "default", "tablet" ], "deliveryWithInstall": true, diff --git a/ability/ability_runtime/actsappselector/actsimagecentryrelyhap/entry/src/main/module.json b/ability/ability_runtime/actsappselector/actsimagecentryrelyhap/entry/src/main/module.json index 9f0588e2b..b493f7e0d 100644 --- a/ability/ability_runtime/actsappselector/actsimagecentryrelyhap/entry/src/main/module.json +++ b/ability/ability_runtime/actsappselector/actsimagecentryrelyhap/entry/src/main/module.json @@ -6,7 +6,7 @@ "description": "$string:entry_desc", "mainElement": "MainAbility", "deviceTypes": [ - "phone", + "default", "tablet" ], "deliveryWithInstall": true, diff --git a/ability/ability_runtime/actsappselector/actsimagecfeaturerelyhap/entry/src/main/module.json b/ability/ability_runtime/actsappselector/actsimagecfeaturerelyhap/entry/src/main/module.json index 9c5991c31..dd9393a8c 100644 --- a/ability/ability_runtime/actsappselector/actsimagecfeaturerelyhap/entry/src/main/module.json +++ b/ability/ability_runtime/actsappselector/actsimagecfeaturerelyhap/entry/src/main/module.json @@ -6,7 +6,7 @@ "description": "$string:feature_desc", "mainElement": "MainAbility1", "deviceTypes": [ - "phone", + "default", "tablet" ], "deliveryWithInstall": true, diff --git a/ability/ability_runtime/actsappselector/actsimagedrelyhap/entry/src/main/module.json b/ability/ability_runtime/actsappselector/actsimagedrelyhap/entry/src/main/module.json index 813610967..cc03b3fb1 100644 --- a/ability/ability_runtime/actsappselector/actsimagedrelyhap/entry/src/main/module.json +++ b/ability/ability_runtime/actsappselector/actsimagedrelyhap/entry/src/main/module.json @@ -6,7 +6,7 @@ "description": "$string:entry_desc", "mainElement": "MainAbility", "deviceTypes": [ - "phone", + "default", "tablet" ], "deliveryWithInstall": true, diff --git a/ability/ability_runtime/actsappselector/actsimageerelyhap/entry/src/main/module.json b/ability/ability_runtime/actsappselector/actsimageerelyhap/entry/src/main/module.json index 08f74bf62..994ab39b0 100644 --- a/ability/ability_runtime/actsappselector/actsimageerelyhap/entry/src/main/module.json +++ b/ability/ability_runtime/actsappselector/actsimageerelyhap/entry/src/main/module.json @@ -6,7 +6,7 @@ "description": "$string:entry_desc", "mainElement": "MainAbility", "deviceTypes": [ - "phone", + "default", "tablet" ], "deliveryWithInstall": true, diff --git a/ability/ability_runtime/actsappselector/actsimagefrelyhap/entry/src/main/module.json b/ability/ability_runtime/actsappselector/actsimagefrelyhap/entry/src/main/module.json index 8c94ac7bf..190998d64 100644 --- a/ability/ability_runtime/actsappselector/actsimagefrelyhap/entry/src/main/module.json +++ b/ability/ability_runtime/actsappselector/actsimagefrelyhap/entry/src/main/module.json @@ -6,7 +6,7 @@ "description": "$string:entry_desc", "mainElement": "MainAbility", "deviceTypes": [ - "phone", + "default", "tablet" ], "deliveryWithInstall": true, diff --git a/ability/ability_runtime/actsappselector/actsimagegrelyhap/entry/src/main/module.json b/ability/ability_runtime/actsappselector/actsimagegrelyhap/entry/src/main/module.json index 9f0588e2b..b493f7e0d 100644 --- a/ability/ability_runtime/actsappselector/actsimagegrelyhap/entry/src/main/module.json +++ b/ability/ability_runtime/actsappselector/actsimagegrelyhap/entry/src/main/module.json @@ -6,7 +6,7 @@ "description": "$string:entry_desc", "mainElement": "MainAbility", "deviceTypes": [ - "phone", + "default", "tablet" ], "deliveryWithInstall": true, diff --git a/ability/ability_runtime/actsappselector/actsimagehrelyhap/entry/src/main/module.json b/ability/ability_runtime/actsappselector/actsimagehrelyhap/entry/src/main/module.json index 9f0588e2b..b493f7e0d 100644 --- a/ability/ability_runtime/actsappselector/actsimagehrelyhap/entry/src/main/module.json +++ b/ability/ability_runtime/actsappselector/actsimagehrelyhap/entry/src/main/module.json @@ -6,7 +6,7 @@ "description": "$string:entry_desc", "mainElement": "MainAbility", "deviceTypes": [ - "phone", + "default", "tablet" ], "deliveryWithInstall": true, diff --git a/ability/ability_runtime/actsappselector/actsimageirelyhap/entry/src/main/module.json b/ability/ability_runtime/actsappselector/actsimageirelyhap/entry/src/main/module.json index 9f0588e2b..b493f7e0d 100644 --- a/ability/ability_runtime/actsappselector/actsimageirelyhap/entry/src/main/module.json +++ b/ability/ability_runtime/actsappselector/actsimageirelyhap/entry/src/main/module.json @@ -6,7 +6,7 @@ "description": "$string:entry_desc", "mainElement": "MainAbility", "deviceTypes": [ - "phone", + "default", "tablet" ], "deliveryWithInstall": true, diff --git a/ability/ability_runtime/actsappselector/actsimagejrelyhap/entry/src/main/module.json b/ability/ability_runtime/actsappselector/actsimagejrelyhap/entry/src/main/module.json index d6d2ca5d5..e178e2886 100644 --- a/ability/ability_runtime/actsappselector/actsimagejrelyhap/entry/src/main/module.json +++ b/ability/ability_runtime/actsappselector/actsimagejrelyhap/entry/src/main/module.json @@ -6,7 +6,7 @@ "description": "$string:entry_desc", "mainElement": "MainAbility", "deviceTypes": [ - "phone", + "default", "tablet" ], "deliveryWithInstall": true, diff --git a/ability/ability_runtime/actsappselector/actsimagekrelyhap/entry/src/main/module.json b/ability/ability_runtime/actsappselector/actsimagekrelyhap/entry/src/main/module.json index d4759b77f..3b55239d0 100644 --- a/ability/ability_runtime/actsappselector/actsimagekrelyhap/entry/src/main/module.json +++ b/ability/ability_runtime/actsappselector/actsimagekrelyhap/entry/src/main/module.json @@ -6,7 +6,7 @@ "description": "$string:entry_desc", "mainElement": "MainAbility", "deviceTypes": [ - "phone", + "default", "tablet" ], "deliveryWithInstall": true, diff --git a/ability/ability_runtime/actsappselector/actsserviceabilityarelyhap/entry/src/main/module.json b/ability/ability_runtime/actsappselector/actsserviceabilityarelyhap/entry/src/main/module.json index d5ff07145..de09c071c 100644 --- a/ability/ability_runtime/actsappselector/actsserviceabilityarelyhap/entry/src/main/module.json +++ b/ability/ability_runtime/actsappselector/actsserviceabilityarelyhap/entry/src/main/module.json @@ -6,7 +6,7 @@ "description": "$string:entry_desc", "mainElement": "MainAbility", "deviceTypes": [ - "phone" + "default" ], "deliveryWithInstall": true, "installationFree": false, diff --git a/ability/ability_runtime/actsappselector/actsserviceabilitybrelyhap/entry/src/main/module.json b/ability/ability_runtime/actsappselector/actsserviceabilitybrelyhap/entry/src/main/module.json index 96165322c..464a9ee62 100644 --- a/ability/ability_runtime/actsappselector/actsserviceabilitybrelyhap/entry/src/main/module.json +++ b/ability/ability_runtime/actsappselector/actsserviceabilitybrelyhap/entry/src/main/module.json @@ -6,7 +6,7 @@ "description": "$string:entry_desc", "mainElement": "MainAbility", "deviceTypes": [ - "phone" + "default" ], "deliveryWithInstall": true, "installationFree": false, diff --git a/ability/ability_runtime/actsappselector/actstextarelyhap/entry/src/main/config.json b/ability/ability_runtime/actsappselector/actstextarelyhap/entry/src/main/config.json index 66926bfc4..927023c0d 100644 --- a/ability/ability_runtime/actsappselector/actstextarelyhap/entry/src/main/config.json +++ b/ability/ability_runtime/actsappselector/actstextarelyhap/entry/src/main/config.json @@ -16,7 +16,7 @@ "module": { "mainAbility": ".MainAbility", "deviceType": [ - "phone", + "default", "tablet" ], "abilities": [ diff --git a/ability/ability_runtime/actsappselector/actstextbrelyhap/entry/src/main/config.json b/ability/ability_runtime/actsappselector/actstextbrelyhap/entry/src/main/config.json index 3ebcb6f57..9eeb3cc40 100644 --- a/ability/ability_runtime/actsappselector/actstextbrelyhap/entry/src/main/config.json +++ b/ability/ability_runtime/actsappselector/actstextbrelyhap/entry/src/main/config.json @@ -16,7 +16,7 @@ "module": { "mainAbility": ".MainAbility", "deviceType": [ - "phone", + "default", "tablet" ], "abilities": [ diff --git a/ability/ability_runtime/actsappselector/actstextcrelyhap/entry/src/main/config.json b/ability/ability_runtime/actsappselector/actstextcrelyhap/entry/src/main/config.json index 36ef410d4..f4bae31f4 100644 --- a/ability/ability_runtime/actsappselector/actstextcrelyhap/entry/src/main/config.json +++ b/ability/ability_runtime/actsappselector/actstextcrelyhap/entry/src/main/config.json @@ -16,7 +16,7 @@ "module": { "mainAbility": ".MainAbility", "deviceType": [ - "phone", + "default", "tablet" ], "abilities": [ diff --git a/ability/ability_runtime/actsappselector/actstextdrelyhap/entry/src/main/config.json b/ability/ability_runtime/actsappselector/actstextdrelyhap/entry/src/main/config.json index a498525b7..202712768 100644 --- a/ability/ability_runtime/actsappselector/actstextdrelyhap/entry/src/main/config.json +++ b/ability/ability_runtime/actsappselector/actstextdrelyhap/entry/src/main/config.json @@ -16,7 +16,7 @@ "module": { "mainAbility": ".MainAbility", "deviceType": [ - "phone", + "default", "tablet" ], "abilities": [ diff --git a/ability/ability_runtime/actsappselector/actstexterelyhap/entry/src/main/config.json b/ability/ability_runtime/actsappselector/actstexterelyhap/entry/src/main/config.json index 0972283a3..0b339f394 100644 --- a/ability/ability_runtime/actsappselector/actstexterelyhap/entry/src/main/config.json +++ b/ability/ability_runtime/actsappselector/actstexterelyhap/entry/src/main/config.json @@ -16,7 +16,7 @@ "module": { "mainAbility": ".MainAbility", "deviceType": [ - "phone", + "default", "tablet" ], "abilities": [ diff --git a/ability/ability_runtime/actsappselector/actstextfrelyhap/entry/src/main/config.json b/ability/ability_runtime/actsappselector/actstextfrelyhap/entry/src/main/config.json index 189a52207..daf8c9b0f 100644 --- a/ability/ability_runtime/actsappselector/actstextfrelyhap/entry/src/main/config.json +++ b/ability/ability_runtime/actsappselector/actstextfrelyhap/entry/src/main/config.json @@ -16,7 +16,7 @@ "module": { "mainAbility": ".MainAbility", "deviceType": [ - "phone", + "default", "tablet" ], "abilities": [ diff --git a/ability/ability_runtime/actsappselector/actstextgrelyhap/entry/src/main/config.json b/ability/ability_runtime/actsappselector/actstextgrelyhap/entry/src/main/config.json index d0dafedf8..9ae752a42 100644 --- a/ability/ability_runtime/actsappselector/actstextgrelyhap/entry/src/main/config.json +++ b/ability/ability_runtime/actsappselector/actstextgrelyhap/entry/src/main/config.json @@ -16,7 +16,7 @@ "module": { "mainAbility": ".MainAbility", "deviceType": [ - "phone", + "default", "tablet" ], "abilities": [ diff --git a/ability/ability_runtime/actsappselector/actstexthrelyhap/entry/src/main/config.json b/ability/ability_runtime/actsappselector/actstexthrelyhap/entry/src/main/config.json index aa060703b..45204e311 100644 --- a/ability/ability_runtime/actsappselector/actstexthrelyhap/entry/src/main/config.json +++ b/ability/ability_runtime/actsappselector/actstexthrelyhap/entry/src/main/config.json @@ -16,7 +16,7 @@ "module": { "mainAbility": ".MainAbility", "deviceType": [ - "phone", + "default", "tablet" ], "abilities": [ diff --git a/ability/ability_runtime/actsappselector/actstextirelyhap/entry/src/main/config.json b/ability/ability_runtime/actsappselector/actstextirelyhap/entry/src/main/config.json index 7dfa59339..5590c5e06 100644 --- a/ability/ability_runtime/actsappselector/actstextirelyhap/entry/src/main/config.json +++ b/ability/ability_runtime/actsappselector/actstextirelyhap/entry/src/main/config.json @@ -16,7 +16,7 @@ "module": { "mainAbility": ".MainAbility", "deviceType": [ - "phone", + "default", "tablet" ], "abilities": [ diff --git a/ability/ability_runtime/actsappselector/actstextjrelyhap/entry/src/main/config.json b/ability/ability_runtime/actsappselector/actstextjrelyhap/entry/src/main/config.json index b68cd0930..f0e4f3b23 100644 --- a/ability/ability_runtime/actsappselector/actstextjrelyhap/entry/src/main/config.json +++ b/ability/ability_runtime/actsappselector/actstextjrelyhap/entry/src/main/config.json @@ -16,7 +16,7 @@ "module": { "mainAbility": ".MainAbility", "deviceType": [ - "phone", + "default", "tablet" ], "abilities": [ diff --git a/ability/ability_runtime/actsappselector/actstextkrelyhap/entry/src/main/config.json b/ability/ability_runtime/actsappselector/actstextkrelyhap/entry/src/main/config.json index 57885f72d..3486fced4 100644 --- a/ability/ability_runtime/actsappselector/actstextkrelyhap/entry/src/main/config.json +++ b/ability/ability_runtime/actsappselector/actstextkrelyhap/entry/src/main/config.json @@ -16,7 +16,7 @@ "module": { "mainAbility": ".MainAbility", "deviceType": [ - "phone", + "default", "tablet" ], "abilities": [ diff --git a/ability/ability_runtime/actscalltest/systemappcalleea/entry/src/main/module.json b/ability/ability_runtime/actscalltest/systemappcalleea/entry/src/main/module.json index 08d39cbe2..eae7242c7 100644 --- a/ability/ability_runtime/actscalltest/systemappcalleea/entry/src/main/module.json +++ b/ability/ability_runtime/actscalltest/systemappcalleea/entry/src/main/module.json @@ -6,8 +6,7 @@ "description": "$string:phone_entry_dsc", "mainElement": "MainAbility", "deviceTypes": [ - "default", - "phone" + "default" ], "deliveryWithInstall": true, "installationFree": false, diff --git a/ability/ability_runtime/actscalltest/systemappcallera/entry/src/main/module.json b/ability/ability_runtime/actscalltest/systemappcallera/entry/src/main/module.json index 7c2ee6b7d..9cd2e9a04 100644 --- a/ability/ability_runtime/actscalltest/systemappcallera/entry/src/main/module.json +++ b/ability/ability_runtime/actscalltest/systemappcallera/entry/src/main/module.json @@ -6,8 +6,7 @@ "description": "$string:phone_entry_dsc", "mainElement": "MainAbility", "deviceTypes": [ - "default", - "phone" + "default" ], "deliveryWithInstall": true, "installationFree": false, diff --git a/ability/ability_runtime/actscalltest/systemappcallerb/entry/src/main/module.json b/ability/ability_runtime/actscalltest/systemappcallerb/entry/src/main/module.json index fcdb1221b..76b362d7d 100644 --- a/ability/ability_runtime/actscalltest/systemappcallerb/entry/src/main/module.json +++ b/ability/ability_runtime/actscalltest/systemappcallerb/entry/src/main/module.json @@ -6,8 +6,7 @@ "description": "$string:phone_entry_dsc", "mainElement": "MainAbility", "deviceTypes": [ - "default", - "phone" + "default" ], "deliveryWithInstall": true, "installationFree": false, diff --git a/ability/ability_runtime/actscalltest/systemappcallerc/entry/src/main/module.json b/ability/ability_runtime/actscalltest/systemappcallerc/entry/src/main/module.json index b27d0f0d8..0f2d00e49 100644 --- a/ability/ability_runtime/actscalltest/systemappcallerc/entry/src/main/module.json +++ b/ability/ability_runtime/actscalltest/systemappcallerc/entry/src/main/module.json @@ -6,8 +6,7 @@ "description": "$string:phone_entry_dsc", "mainElement": "MainAbility", "deviceTypes": [ - "default", - "phone" + "default" ], "deliveryWithInstall": true, "installationFree": false, diff --git a/ability/ability_runtime/actscalltest/systemcallentrytest/entry/src/main/module.json b/ability/ability_runtime/actscalltest/systemcallentrytest/entry/src/main/module.json index 5bb1810f3..f504a14de 100644 --- a/ability/ability_runtime/actscalltest/systemcallentrytest/entry/src/main/module.json +++ b/ability/ability_runtime/actscalltest/systemcallentrytest/entry/src/main/module.json @@ -6,8 +6,7 @@ "description": "$string:phone_entry_dsc", "mainElement": "MainAbility", "deviceTypes": [ - "default", - "phone" + "default" ], "deliveryWithInstall": true, "installationFree": false, diff --git a/ability/ability_runtime/actscalltest/systemcallfeature/entry/src/main/module.json b/ability/ability_runtime/actscalltest/systemcallfeature/entry/src/main/module.json index c93183b1b..9e4df76ed 100644 --- a/ability/ability_runtime/actscalltest/systemcallfeature/entry/src/main/module.json +++ b/ability/ability_runtime/actscalltest/systemcallfeature/entry/src/main/module.json @@ -7,8 +7,7 @@ "description": "$string:phone_entry_dsc", "mainElement": "MainAbility", "deviceTypes": [ - "default", - "phone" + "default" ], "deliveryWithInstall": true, "installationFree": false, diff --git a/ability/ability_runtime/actscalltest/thirdappa/entry/src/main/module.json b/ability/ability_runtime/actscalltest/thirdappa/entry/src/main/module.json index afbf5b687..7f740702e 100644 --- a/ability/ability_runtime/actscalltest/thirdappa/entry/src/main/module.json +++ b/ability/ability_runtime/actscalltest/thirdappa/entry/src/main/module.json @@ -6,8 +6,7 @@ "description": "$string:phone_entry_dsc", "mainElement": "MainAbility", "deviceTypes": [ - "default", - "phone" + "default" ], "deliveryWithInstall": true, "installationFree": false, diff --git a/ability/ability_runtime/actscalltest/thirdcalltest/entry/src/main/module.json b/ability/ability_runtime/actscalltest/thirdcalltest/entry/src/main/module.json index 9d72e996b..efe2bfd26 100644 --- a/ability/ability_runtime/actscalltest/thirdcalltest/entry/src/main/module.json +++ b/ability/ability_runtime/actscalltest/thirdcalltest/entry/src/main/module.json @@ -6,8 +6,7 @@ "description": "$string:phone_entry_dsc", "mainElement": "MainAbility", "deviceTypes": [ - "default", - "phone" + "default" ], "deliveryWithInstall": true, "installationFree": false, diff --git a/ability/ability_runtime/actsdataabilityaccessdatasharetest/actsdataabilityaccessdatasharetest/src/main/config.json b/ability/ability_runtime/actsdataabilityaccessdatasharetest/actsdataabilityaccessdatasharetest/src/main/config.json index 1a8073b9a..4288f361c 100644 --- a/ability/ability_runtime/actsdataabilityaccessdatasharetest/actsdataabilityaccessdatasharetest/src/main/config.json +++ b/ability/ability_runtime/actsdataabilityaccessdatasharetest/actsdataabilityaccessdatasharetest/src/main/config.json @@ -17,8 +17,7 @@ "package": "com.amsst.dataabilityaccessdatashare", "name": ".entry", "deviceType": [ - "default", - "phone" + "default" ], "distro": { "deliveryWithInstall": true, diff --git a/ability/ability_runtime/actsfwkdataaccessortest/actsdataabilityrelyhap/entry/src/main/config.json b/ability/ability_runtime/actsfwkdataaccessortest/actsdataabilityrelyhap/entry/src/main/config.json index 51f1b4e73..5eb38123a 100644 --- a/ability/ability_runtime/actsfwkdataaccessortest/actsdataabilityrelyhap/entry/src/main/config.json +++ b/ability/ability_runtime/actsfwkdataaccessortest/actsdataabilityrelyhap/entry/src/main/config.json @@ -18,8 +18,7 @@ "mainAbility": ".MainAbility", "srcPath": "", "deviceType": [ - "default", - "phone" + "default" ], "distro": { "deliveryWithInstall": true, diff --git a/ability/ability_runtime/actsfwkdataaccessortest/actsfwkdataaccessortest/src/main/config.json b/ability/ability_runtime/actsfwkdataaccessortest/actsfwkdataaccessortest/src/main/config.json index 2021dc473..64bcb1c5e 100644 --- a/ability/ability_runtime/actsfwkdataaccessortest/actsfwkdataaccessortest/src/main/config.json +++ b/ability/ability_runtime/actsfwkdataaccessortest/actsfwkdataaccessortest/src/main/config.json @@ -17,8 +17,7 @@ "package": "com.amsst.fwkdataaccessor", "name": ".entry", "deviceType": [ - "default", - "phone" + "default" ], "distro": { "deliveryWithInstall": true, @@ -92,4 +91,4 @@ "mainAbility": ".MainAbility", "srcPath": "" } -} +} diff --git a/ability/ability_runtime/actsqueryfunctiontest/actsgetabilitystatestagetest/entry/src/main/module.json b/ability/ability_runtime/actsqueryfunctiontest/actsgetabilitystatestagetest/entry/src/main/module.json index ef30793d1..729da1714 100644 --- a/ability/ability_runtime/actsqueryfunctiontest/actsgetabilitystatestagetest/entry/src/main/module.json +++ b/ability/ability_runtime/actsqueryfunctiontest/actsgetabilitystatestagetest/entry/src/main/module.json @@ -6,8 +6,7 @@ "description": "$string:entry_desc", "mainElement": "MainAbility", "deviceTypes": [ - "default", - "phone", + "default", "tablet" ], "deliveryWithInstall": true, diff --git a/ability/ability_runtime/actsqueryfunctiontest/actsgetappcontextstageatest/entry/src/main/module.json b/ability/ability_runtime/actsqueryfunctiontest/actsgetappcontextstageatest/entry/src/main/module.json index 0dbcd3cba..6a920661b 100644 --- a/ability/ability_runtime/actsqueryfunctiontest/actsgetappcontextstageatest/entry/src/main/module.json +++ b/ability/ability_runtime/actsqueryfunctiontest/actsgetappcontextstageatest/entry/src/main/module.json @@ -6,8 +6,7 @@ "description": "$string:entry_desc", "mainElement": "MainAbility", "deviceTypes": [ - "default", - "phone", + "default", "tablet" ], "deliveryWithInstall": true, diff --git a/ability/ability_runtime/actsqueryfunctiontest/actsgetappcontextstagebtest/entry/src/main/module.json b/ability/ability_runtime/actsqueryfunctiontest/actsgetappcontextstagebtest/entry/src/main/module.json index 0dbcd3cba..6a920661b 100644 --- a/ability/ability_runtime/actsqueryfunctiontest/actsgetappcontextstagebtest/entry/src/main/module.json +++ b/ability/ability_runtime/actsqueryfunctiontest/actsgetappcontextstagebtest/entry/src/main/module.json @@ -6,8 +6,7 @@ "description": "$string:entry_desc", "mainElement": "MainAbility", "deviceTypes": [ - "default", - "phone", + "default", "tablet" ], "deliveryWithInstall": true, diff --git a/ability/ability_runtime/actsqueryfunctiontest/actsgetappcontexttest/entry/src/main/module.json b/ability/ability_runtime/actsqueryfunctiontest/actsgetappcontexttest/entry/src/main/module.json index 0dbcd3cba..6a920661b 100644 --- a/ability/ability_runtime/actsqueryfunctiontest/actsgetappcontexttest/entry/src/main/module.json +++ b/ability/ability_runtime/actsqueryfunctiontest/actsgetappcontexttest/entry/src/main/module.json @@ -6,8 +6,7 @@ "description": "$string:entry_desc", "mainElement": "MainAbility", "deviceTypes": [ - "default", - "phone", + "default", "tablet" ], "deliveryWithInstall": true, diff --git a/ability/ability_runtime/actsqueryfunctiontest/actsgetcurrenttopabilitystageatest/entry/src/main/module.json b/ability/ability_runtime/actsqueryfunctiontest/actsgetcurrenttopabilitystageatest/entry/src/main/module.json index 1a6fa9151..98903f29d 100644 --- a/ability/ability_runtime/actsqueryfunctiontest/actsgetcurrenttopabilitystageatest/entry/src/main/module.json +++ b/ability/ability_runtime/actsqueryfunctiontest/actsgetcurrenttopabilitystageatest/entry/src/main/module.json @@ -6,8 +6,7 @@ "description": "$string:entry_desc", "mainElement": "MainAbility", "deviceTypes": [ - "default", - "phone", + "default", "tablet" ], "deliveryWithInstall": true, diff --git a/ability/ability_runtime/actsqueryfunctiontest/actsgetcurrenttopabilitystagebtest/entry/src/main/module.json b/ability/ability_runtime/actsqueryfunctiontest/actsgetcurrenttopabilitystagebtest/entry/src/main/module.json index 1a6fa9151..98903f29d 100644 --- a/ability/ability_runtime/actsqueryfunctiontest/actsgetcurrenttopabilitystagebtest/entry/src/main/module.json +++ b/ability/ability_runtime/actsqueryfunctiontest/actsgetcurrenttopabilitystagebtest/entry/src/main/module.json @@ -6,8 +6,7 @@ "description": "$string:entry_desc", "mainElement": "MainAbility", "deviceTypes": [ - "default", - "phone", + "default", "tablet" ], "deliveryWithInstall": true, diff --git a/ability/ability_runtime/actsserviceabilityclienttest/actsserviceabilityclienttest/src/main/config.json b/ability/ability_runtime/actsserviceabilityclienttest/actsserviceabilityclienttest/src/main/config.json index 15d5a27d0..2adb8db12 100644 --- a/ability/ability_runtime/actsserviceabilityclienttest/actsserviceabilityclienttest/src/main/config.json +++ b/ability/ability_runtime/actsserviceabilityclienttest/actsserviceabilityclienttest/src/main/config.json @@ -19,8 +19,7 @@ "mainAbility": ".MainAbility", "srcPath":"", "deviceType": [ - "default", - "phone" + "default" ], "distro": { "deliveryWithInstall": true, diff --git a/ability/ability_runtime/actsserviceabilityclienttest/actsserviceabilityserverrelyhap/entry/src/main/config.json b/ability/ability_runtime/actsserviceabilityclienttest/actsserviceabilityserverrelyhap/entry/src/main/config.json index ce58f0c8c..d99b9aa81 100644 --- a/ability/ability_runtime/actsserviceabilityclienttest/actsserviceabilityserverrelyhap/entry/src/main/config.json +++ b/ability/ability_runtime/actsserviceabilityclienttest/actsserviceabilityserverrelyhap/entry/src/main/config.json @@ -18,8 +18,7 @@ "mainAbility": ".MainAbility", "srcPath": "", "deviceType": [ - "default", - "phone" + "default" ], "distro": { "deliveryWithInstall": true, diff --git a/ability/ability_runtime/actsserviceabilityclienttest/actsserviceabilityserversecondrelyhap/entry/src/main/config.json b/ability/ability_runtime/actsserviceabilityclienttest/actsserviceabilityserversecondrelyhap/entry/src/main/config.json index 103ef286a..88465c8e7 100644 --- a/ability/ability_runtime/actsserviceabilityclienttest/actsserviceabilityserversecondrelyhap/entry/src/main/config.json +++ b/ability/ability_runtime/actsserviceabilityclienttest/actsserviceabilityserversecondrelyhap/entry/src/main/config.json @@ -18,8 +18,7 @@ "mainAbility": ".MainAbility", "srcPath": "", "deviceType": [ - "default", - "phone" + "default" ], "distro": { "deliveryWithInstall": true, diff --git a/ability/ability_runtime/actsshellcommandfunctionalitytest/ActskillProcessWithAccountCloseTest/entry/src/main/module.json b/ability/ability_runtime/actsshellcommandfunctionalitytest/ActskillProcessWithAccountCloseTest/entry/src/main/module.json index 62daa989b..7c3003b37 100644 --- a/ability/ability_runtime/actsshellcommandfunctionalitytest/ActskillProcessWithAccountCloseTest/entry/src/main/module.json +++ b/ability/ability_runtime/actsshellcommandfunctionalitytest/ActskillProcessWithAccountCloseTest/entry/src/main/module.json @@ -6,8 +6,7 @@ "description": "$string:entry_desc", "mainElement": "MainAbility", "deviceTypes": [ - "default", - "phone" + "default" ], "deliveryWithInstall": true, "installationFree": false, diff --git a/ability/ability_runtime/actsshellcommandfunctionalitytest/ExecuteShellCommand/entry/src/main/module.json b/ability/ability_runtime/actsshellcommandfunctionalitytest/ExecuteShellCommand/entry/src/main/module.json index 62daa989b..7c3003b37 100644 --- a/ability/ability_runtime/actsshellcommandfunctionalitytest/ExecuteShellCommand/entry/src/main/module.json +++ b/ability/ability_runtime/actsshellcommandfunctionalitytest/ExecuteShellCommand/entry/src/main/module.json @@ -6,8 +6,7 @@ "description": "$string:entry_desc", "mainElement": "MainAbility", "deviceTypes": [ - "default", - "phone" + "default" ], "deliveryWithInstall": true, "installationFree": false, diff --git a/ability/ability_runtime/actssingleton/BUILD.gn b/ability/ability_runtime/actssingleton/BUILD.gn index 3070d410d..f372f33ae 100644 --- a/ability/ability_runtime/actssingleton/BUILD.gn +++ b/ability/ability_runtime/actssingleton/BUILD.gn @@ -17,14 +17,14 @@ group("actssingleton") { testonly = true if (is_standard_system) { deps = [ - "SystemSingleton:ActsSystemSingleton", - "SystemSingletonExtension:ActsSystemSingletonExtension", - "SystemSingletonExtensionFalse:ActsSystemSingletonExtensionFalse", - "SystemSingletonFalse:ActsSystemSingletonFalse", - "ThirdSingleton:ActsThirdSingleton", - "ThirdSingletonExtension:ActsThirdSingletonExtension", - "ThirdSingletonExtensionFalse:ActsThirdSingletonExtensionFalse", - "ThirdSingletonFalse:ActsThirdSingletonFalse", + "SystemSingleton:ActsSystemSingletonTest", + "SystemSingletonExtension:ActsSystemSingletonExtensionTest", + "SystemSingletonExtensionFalse:ActsSystemSingletonExtensionFalseTest", + "SystemSingletonFalse:ActsSystemSingletonFalseTest", + "ThirdSingleton:ActsThirdSingletonTest", + "ThirdSingletonExtension:ActsThirdSingletonExtensionTest", + "ThirdSingletonExtensionFalse:ActsThirdSingletonExtensionFalseTest", + "ThirdSingletonFalse:ActsThirdSingletonFalseTest", ] } } diff --git a/ability/ability_runtime/actssingleton/SystemSingleton/BUILD.gn b/ability/ability_runtime/actssingleton/SystemSingleton/BUILD.gn index 7ecb659cc..9b14d2bc8 100644 --- a/ability/ability_runtime/actssingleton/SystemSingleton/BUILD.gn +++ b/ability/ability_runtime/actssingleton/SystemSingleton/BUILD.gn @@ -13,7 +13,7 @@ import("//test/xts/tools/build/suite.gni") -ohos_js_hap_suite("ActsSystemSingleton") { +ohos_js_hap_suite("ActsSystemSingletonTest") { hap_profile = "entry/src/main/module.json" js_build_mode = "debug" deps = [ @@ -22,7 +22,7 @@ ohos_js_hap_suite("ActsSystemSingleton") { ] ets2abc = true certificate_profile = "signature/openharmony_sx.p7b" - hap_name = "ActsSystemSingleton" + hap_name = "ActsSystemSingletonTest" subsystem_name = "ability" part_name = "ability_runtime" } diff --git a/ability/ability_runtime/actssingleton/SystemSingleton/Test.json b/ability/ability_runtime/actssingleton/SystemSingleton/Test.json index f58264028..b9f82977a 100644 --- a/ability/ability_runtime/actssingleton/SystemSingleton/Test.json +++ b/ability/ability_runtime/actssingleton/SystemSingleton/Test.json @@ -21,12 +21,12 @@ { "type": "PushKit", "push": [ - "ActsSystemSingleton.hap->/system/ActsSystemSingleton.hap" + "ActsSystemSingletonTest.hap->/system/ActsSystemSingletonTest.hap" ] }, { "test-file-name": [ - "ActsSystemSingleton.hap" + "ActsSystemSingletonTest.hap" ], "type": "AppInstallKit", "cleanup-apps": true diff --git a/ability/ability_runtime/actssingleton/SystemSingleton/entry/src/main/module.json b/ability/ability_runtime/actssingleton/SystemSingleton/entry/src/main/module.json index a25d67412..c63e1beab 100644 --- a/ability/ability_runtime/actssingleton/SystemSingleton/entry/src/main/module.json +++ b/ability/ability_runtime/actssingleton/SystemSingleton/entry/src/main/module.json @@ -6,7 +6,7 @@ "description": "$string:entry_desc", "mainElement": "MainAbility", "deviceTypes": [ - "phone", + "default", "tablet" ], "deliveryWithInstall": true, diff --git a/ability/ability_runtime/actssingleton/SystemSingletonExtension/BUILD.gn b/ability/ability_runtime/actssingleton/SystemSingletonExtension/BUILD.gn index 2667a2663..e3569275a 100644 --- a/ability/ability_runtime/actssingleton/SystemSingletonExtension/BUILD.gn +++ b/ability/ability_runtime/actssingleton/SystemSingletonExtension/BUILD.gn @@ -13,7 +13,7 @@ import("//test/xts/tools/build/suite.gni") -ohos_js_hap_suite("ActsSystemSingletonExtension") { +ohos_js_hap_suite("ActsSystemSingletonExtensionTest") { hap_profile = "entry/src/main/module.json" js_build_mode = "debug" deps = [ @@ -22,7 +22,7 @@ ohos_js_hap_suite("ActsSystemSingletonExtension") { ] ets2abc = true certificate_profile = "signature/openharmony_sx.p7b" - hap_name = "ActsSystemSingletonExtension" + hap_name = "ActsSystemSingletonExtensionTest" subsystem_name = "ability" part_name = "ability_runtime" } diff --git a/ability/ability_runtime/actssingleton/SystemSingletonExtension/Test.json b/ability/ability_runtime/actssingleton/SystemSingletonExtension/Test.json index 20441856b..16b6b4b95 100644 --- a/ability/ability_runtime/actssingleton/SystemSingletonExtension/Test.json +++ b/ability/ability_runtime/actssingleton/SystemSingletonExtension/Test.json @@ -21,12 +21,12 @@ { "type": "PushKit", "push": [ - "ActsSystemSingletonExtension.hap->/system/ActsSystemSingletonExtension.hap" + "ActsSystemSingletonExtensionTest.hap->/system/ActsSystemSingletonExtensionTest.hap" ] }, { "test-file-name": [ - "ActsSystemSingletonExtension.hap" + "ActsSystemSingletonExtensionTest.hap" ], "type": "AppInstallKit", "cleanup-apps": true diff --git a/ability/ability_runtime/actssingleton/SystemSingletonExtension/entry/src/main/module.json b/ability/ability_runtime/actssingleton/SystemSingletonExtension/entry/src/main/module.json index f1b8fbc4b..c87da7251 100644 --- a/ability/ability_runtime/actssingleton/SystemSingletonExtension/entry/src/main/module.json +++ b/ability/ability_runtime/actssingleton/SystemSingletonExtension/entry/src/main/module.json @@ -6,7 +6,7 @@ "description": "$string:entry_desc", "mainElement": "MainAbility", "deviceTypes": [ - "phone", + "default", "tablet" ], "deliveryWithInstall": true, diff --git a/ability/ability_runtime/actssingleton/SystemSingletonExtensionFalse/BUILD.gn b/ability/ability_runtime/actssingleton/SystemSingletonExtensionFalse/BUILD.gn index b2dd441e0..72c41ec83 100644 --- a/ability/ability_runtime/actssingleton/SystemSingletonExtensionFalse/BUILD.gn +++ b/ability/ability_runtime/actssingleton/SystemSingletonExtensionFalse/BUILD.gn @@ -13,7 +13,7 @@ import("//test/xts/tools/build/suite.gni") -ohos_js_hap_suite("ActsSystemSingletonExtensionFalse") { +ohos_js_hap_suite("ActsSystemSingletonExtensionFalseTest") { hap_profile = "entry/src/main/module.json" js_build_mode = "debug" deps = [ @@ -22,7 +22,7 @@ ohos_js_hap_suite("ActsSystemSingletonExtensionFalse") { ] ets2abc = true certificate_profile = "signature/openharmony_sx.p7b" - hap_name = "ActsSystemSingletonExtensionFalse" + hap_name = "ActsSystemSingletonExtensionFalseTest" subsystem_name = "ability" part_name = "ability_runtime" } diff --git a/ability/ability_runtime/actssingleton/SystemSingletonExtensionFalse/Test.json b/ability/ability_runtime/actssingleton/SystemSingletonExtensionFalse/Test.json index d175d82d8..3af1504ba 100644 --- a/ability/ability_runtime/actssingleton/SystemSingletonExtensionFalse/Test.json +++ b/ability/ability_runtime/actssingleton/SystemSingletonExtensionFalse/Test.json @@ -21,12 +21,12 @@ { "type": "PushKit", "push": [ - "ActsSystemSingletonExtensionFalse.hap->/system/ActsSystemSingletonExtensionFalse.hap" + "ActsSystemSingletonExtensionFalseTest.hap->/system/ActsSystemSingletonExtensionFalseTest.hap" ] }, { "test-file-name": [ - "ActsSystemSingletonExtensionFalse.hap" + "ActsSystemSingletonExtensionFalseTest.hap" ], "type": "AppInstallKit", "cleanup-apps": true diff --git a/ability/ability_runtime/actssingleton/SystemSingletonExtensionFalse/entry/src/main/module.json b/ability/ability_runtime/actssingleton/SystemSingletonExtensionFalse/entry/src/main/module.json index f1b8fbc4b..c87da7251 100644 --- a/ability/ability_runtime/actssingleton/SystemSingletonExtensionFalse/entry/src/main/module.json +++ b/ability/ability_runtime/actssingleton/SystemSingletonExtensionFalse/entry/src/main/module.json @@ -6,7 +6,7 @@ "description": "$string:entry_desc", "mainElement": "MainAbility", "deviceTypes": [ - "phone", + "default", "tablet" ], "deliveryWithInstall": true, diff --git a/ability/ability_runtime/actssingleton/SystemSingletonFalse/BUILD.gn b/ability/ability_runtime/actssingleton/SystemSingletonFalse/BUILD.gn index 3444d0750..fcb7c967d 100644 --- a/ability/ability_runtime/actssingleton/SystemSingletonFalse/BUILD.gn +++ b/ability/ability_runtime/actssingleton/SystemSingletonFalse/BUILD.gn @@ -13,7 +13,7 @@ import("//test/xts/tools/build/suite.gni") -ohos_js_hap_suite("ActsSystemSingletonFalse") { +ohos_js_hap_suite("ActsSystemSingletonFalseTest") { hap_profile = "entry/src/main/module.json" js_build_mode = "debug" deps = [ @@ -22,7 +22,7 @@ ohos_js_hap_suite("ActsSystemSingletonFalse") { ] ets2abc = true certificate_profile = "signature/openharmony_sx.p7b" - hap_name = "ActsSystemSingletonFalse" + hap_name = "ActsSystemSingletonFalseTest" subsystem_name = "ability" part_name = "ability_runtime" } diff --git a/ability/ability_runtime/actssingleton/SystemSingletonFalse/Test.json b/ability/ability_runtime/actssingleton/SystemSingletonFalse/Test.json index bc07e6864..7f45b04c7 100644 --- a/ability/ability_runtime/actssingleton/SystemSingletonFalse/Test.json +++ b/ability/ability_runtime/actssingleton/SystemSingletonFalse/Test.json @@ -21,12 +21,12 @@ { "type": "PushKit", "push": [ - "ActsSystemSingletonFalse.hap->/system/ActsSystemSingletonFalse.hap" + "ActsSystemSingletonFalseTest.hap->/system/ActsSystemSingletonFalseTest.hap" ] }, { "test-file-name": [ - "ActsSystemSingletonFalse.hap" + "ActsSystemSingletonFalseTest.hap" ], "type": "AppInstallKit", "cleanup-apps": true diff --git a/ability/ability_runtime/actssingleton/SystemSingletonFalse/entry/src/main/module.json b/ability/ability_runtime/actssingleton/SystemSingletonFalse/entry/src/main/module.json index ed63ca5f9..c42db2b73 100644 --- a/ability/ability_runtime/actssingleton/SystemSingletonFalse/entry/src/main/module.json +++ b/ability/ability_runtime/actssingleton/SystemSingletonFalse/entry/src/main/module.json @@ -6,7 +6,7 @@ "description": "$string:entry_desc", "mainElement": "MainAbility", "deviceTypes": [ - "phone", + "default", "tablet" ], "deliveryWithInstall": true, diff --git a/ability/ability_runtime/actssingleton/ThirdSingleton/BUILD.gn b/ability/ability_runtime/actssingleton/ThirdSingleton/BUILD.gn index c86441a37..9088a7916 100644 --- a/ability/ability_runtime/actssingleton/ThirdSingleton/BUILD.gn +++ b/ability/ability_runtime/actssingleton/ThirdSingleton/BUILD.gn @@ -13,7 +13,7 @@ import("//test/xts/tools/build/suite.gni") -ohos_js_hap_suite("ActsThirdSingleton") { +ohos_js_hap_suite("ActsThirdSingletonTest") { hap_profile = "entry/src/main/module.json" js_build_mode = "debug" deps = [ @@ -22,7 +22,7 @@ ohos_js_hap_suite("ActsThirdSingleton") { ] ets2abc = true certificate_profile = "signature/openharmony_sx.p7b" - hap_name = "ActsThirdSingleton" + hap_name = "ActsThirdSingletonTest" subsystem_name = "ability" part_name = "ability_runtime" } diff --git a/ability/ability_runtime/actssingleton/ThirdSingleton/Test.json b/ability/ability_runtime/actssingleton/ThirdSingleton/Test.json index d696da01d..5499a25b7 100644 --- a/ability/ability_runtime/actssingleton/ThirdSingleton/Test.json +++ b/ability/ability_runtime/actssingleton/ThirdSingleton/Test.json @@ -21,12 +21,12 @@ { "type": "PushKit", "push": [ - "ActsThirdSingleton.hap->/data/ActsThirdSingleton.hap" + "ActsThirdSingletonTest.hap->/data/ActsThirdSingletonTest.hap" ] }, { "test-file-name": [ - "ActsThirdSingleton.hap" + "ActsThirdSingletonTest.hap" ], "type": "AppInstallKit", "cleanup-apps": true diff --git a/ability/ability_runtime/actssingleton/ThirdSingleton/entry/src/main/module.json b/ability/ability_runtime/actssingleton/ThirdSingleton/entry/src/main/module.json index e46f18f55..135a85465 100644 --- a/ability/ability_runtime/actssingleton/ThirdSingleton/entry/src/main/module.json +++ b/ability/ability_runtime/actssingleton/ThirdSingleton/entry/src/main/module.json @@ -6,7 +6,7 @@ "description": "$string:entry_desc", "mainElement": "MainAbility", "deviceTypes": [ - "phone", + "default", "tablet" ], "deliveryWithInstall": true, diff --git a/ability/ability_runtime/actssingleton/ThirdSingletonExtension/BUILD.gn b/ability/ability_runtime/actssingleton/ThirdSingletonExtension/BUILD.gn index 602b2fa7a..fdc50c71f 100644 --- a/ability/ability_runtime/actssingleton/ThirdSingletonExtension/BUILD.gn +++ b/ability/ability_runtime/actssingleton/ThirdSingletonExtension/BUILD.gn @@ -13,7 +13,7 @@ import("//test/xts/tools/build/suite.gni") -ohos_js_hap_suite("ActsThirdSingletonExtension") { +ohos_js_hap_suite("ActsThirdSingletonExtensionTest") { hap_profile = "entry/src/main/module.json" js_build_mode = "debug" deps = [ @@ -22,7 +22,7 @@ ohos_js_hap_suite("ActsThirdSingletonExtension") { ] ets2abc = true certificate_profile = "signature/openharmony_sx.p7b" - hap_name = "ActsThirdSingletonExtension" + hap_name = "ActsThirdSingletonExtensionTest" subsystem_name = "ability" part_name = "ability_runtime" } diff --git a/ability/ability_runtime/actssingleton/ThirdSingletonExtension/Test.json b/ability/ability_runtime/actssingleton/ThirdSingletonExtension/Test.json index 41c02d981..7cbf262b7 100644 --- a/ability/ability_runtime/actssingleton/ThirdSingletonExtension/Test.json +++ b/ability/ability_runtime/actssingleton/ThirdSingletonExtension/Test.json @@ -21,12 +21,12 @@ { "type": "PushKit", "push": [ - "ActsThirdSingletonExtension.hap->/data/ActsThirdSingletonExtension.hap" + "ActsThirdSingletonExtensionTest.hap->/data/ActsThirdSingletonExtensionTest.hap" ] }, { "test-file-name": [ - "ActsThirdSingletonExtension.hap" + "ActsThirdSingletonExtensionTest.hap" ], "type": "AppInstallKit", "cleanup-apps": true diff --git a/ability/ability_runtime/actssingleton/ThirdSingletonExtension/entry/src/main/module.json b/ability/ability_runtime/actssingleton/ThirdSingletonExtension/entry/src/main/module.json index 6129f1e48..c0886534b 100644 --- a/ability/ability_runtime/actssingleton/ThirdSingletonExtension/entry/src/main/module.json +++ b/ability/ability_runtime/actssingleton/ThirdSingletonExtension/entry/src/main/module.json @@ -6,7 +6,7 @@ "description": "$string:entry_desc", "mainElement": "MainAbility", "deviceTypes": [ - "phone", + "default", "tablet" ], "deliveryWithInstall": true, diff --git a/ability/ability_runtime/actssingleton/ThirdSingletonExtensionFalse/BUILD.gn b/ability/ability_runtime/actssingleton/ThirdSingletonExtensionFalse/BUILD.gn index 71c0841a4..1c4879667 100644 --- a/ability/ability_runtime/actssingleton/ThirdSingletonExtensionFalse/BUILD.gn +++ b/ability/ability_runtime/actssingleton/ThirdSingletonExtensionFalse/BUILD.gn @@ -13,7 +13,7 @@ import("//test/xts/tools/build/suite.gni") -ohos_js_hap_suite("ActsThirdSingletonExtensionFalse") { +ohos_js_hap_suite("ActsThirdSingletonExtensionFalseTest") { hap_profile = "entry/src/main/module.json" js_build_mode = "debug" deps = [ @@ -22,7 +22,7 @@ ohos_js_hap_suite("ActsThirdSingletonExtensionFalse") { ] ets2abc = true certificate_profile = "signature/openharmony_sx.p7b" - hap_name = "ActsThirdSingletonExtensionFalse" + hap_name = "ActsThirdSingletonExtensionFalseTest" subsystem_name = "ability" part_name = "ability_runtime" } diff --git a/ability/ability_runtime/actssingleton/ThirdSingletonExtensionFalse/Test.json b/ability/ability_runtime/actssingleton/ThirdSingletonExtensionFalse/Test.json index 16241c857..dccf91435 100644 --- a/ability/ability_runtime/actssingleton/ThirdSingletonExtensionFalse/Test.json +++ b/ability/ability_runtime/actssingleton/ThirdSingletonExtensionFalse/Test.json @@ -21,12 +21,12 @@ { "type": "PushKit", "push": [ - "ActsThirdSingletonExtensionFalse.hap->/data/ActsThirdSingletonExtensionFalse.hap" + "ActsThirdSingletonExtensionFalseTest.hap->/data/ActsThirdSingletonExtensionFalseTest.hap" ] }, { "test-file-name": [ - "ActsThirdSingletonExtensionFalse.hap" + "ActsThirdSingletonExtensionFalseTest.hap" ], "type": "AppInstallKit", "cleanup-apps": true diff --git a/ability/ability_runtime/actssingleton/ThirdSingletonExtensionFalse/entry/src/main/module.json b/ability/ability_runtime/actssingleton/ThirdSingletonExtensionFalse/entry/src/main/module.json index c10f2ae7a..3f565f358 100644 --- a/ability/ability_runtime/actssingleton/ThirdSingletonExtensionFalse/entry/src/main/module.json +++ b/ability/ability_runtime/actssingleton/ThirdSingletonExtensionFalse/entry/src/main/module.json @@ -6,7 +6,7 @@ "description": "$string:entry_desc", "mainElement": "MainAbility", "deviceTypes": [ - "phone", + "default", "tablet" ], "deliveryWithInstall": true, diff --git a/ability/ability_runtime/actssingleton/ThirdSingletonFalse/BUILD.gn b/ability/ability_runtime/actssingleton/ThirdSingletonFalse/BUILD.gn index f13b93ae7..ee8c0312a 100644 --- a/ability/ability_runtime/actssingleton/ThirdSingletonFalse/BUILD.gn +++ b/ability/ability_runtime/actssingleton/ThirdSingletonFalse/BUILD.gn @@ -13,7 +13,7 @@ import("//test/xts/tools/build/suite.gni") -ohos_js_hap_suite("ActsThirdSingletonFalse") { +ohos_js_hap_suite("ActsThirdSingletonFalseTest") { hap_profile = "entry/src/main/module.json" js_build_mode = "debug" deps = [ @@ -22,7 +22,7 @@ ohos_js_hap_suite("ActsThirdSingletonFalse") { ] ets2abc = true certificate_profile = "signature/openharmony_sx.p7b" - hap_name = "ActsThirdSingletonFalse" + hap_name = "ActsThirdSingletonFalseTest" subsystem_name = "ability" part_name = "ability_runtime" } diff --git a/ability/ability_runtime/actssingleton/ThirdSingletonFalse/Test.json b/ability/ability_runtime/actssingleton/ThirdSingletonFalse/Test.json index 5df3640ec..000a47683 100644 --- a/ability/ability_runtime/actssingleton/ThirdSingletonFalse/Test.json +++ b/ability/ability_runtime/actssingleton/ThirdSingletonFalse/Test.json @@ -21,12 +21,12 @@ { "type": "PushKit", "push": [ - "ActsThirdSingletonFalse.hap->/data/ActsThirdSingletonFalse.hap" + "ActsThirdSingletonFalseTest.hap->/data/ActsThirdSingletonFalseTest.hap" ] }, { "test-file-name": [ - "ActsThirdSingletonFalse.hap" + "ActsThirdSingletonFalseTest.hap" ], "type": "AppInstallKit", "cleanup-apps": true diff --git a/ability/ability_runtime/actssingleton/ThirdSingletonFalse/entry/src/main/module.json b/ability/ability_runtime/actssingleton/ThirdSingletonFalse/entry/src/main/module.json index 59162e0bc..70940ac50 100644 --- a/ability/ability_runtime/actssingleton/ThirdSingletonFalse/entry/src/main/module.json +++ b/ability/ability_runtime/actssingleton/ThirdSingletonFalse/entry/src/main/module.json @@ -6,7 +6,7 @@ "description": "$string:entry_desc", "mainElement": "MainAbility", "deviceTypes": [ - "phone", + "default", "tablet" ], "deliveryWithInstall": true, diff --git a/ability/ability_runtime/actsstartrunnertest/entry/src/main/module.json b/ability/ability_runtime/actsstartrunnertest/entry/src/main/module.json index 628fdcbca..a6e6fea2a 100644 --- a/ability/ability_runtime/actsstartrunnertest/entry/src/main/module.json +++ b/ability/ability_runtime/actsstartrunnertest/entry/src/main/module.json @@ -6,8 +6,7 @@ "description": "$string:entry_desc", "mainElement": "MainAbility", "deviceTypes": [ - "default", - "phone", + "default", "tablet" ], "deliveryWithInstall": true, diff --git a/ability/ability_runtime/actsstserviceabilityclientcase/entry/src/main/config.json b/ability/ability_runtime/actsstserviceabilityclientcase/entry/src/main/config.json index 7839de72a..1c00cd88a 100644 --- a/ability/ability_runtime/actsstserviceabilityclientcase/entry/src/main/config.json +++ b/ability/ability_runtime/actsstserviceabilityclientcase/entry/src/main/config.json @@ -18,8 +18,7 @@ "name": ".entry", "mainAbility": "com.amsst.actsstserviceabilityclientcasetest.MainAbility", "deviceType": [ - "default", - "phone" + "default" ], "distro": { "deliveryWithInstall": true, diff --git a/ability/ability_runtime/actssupportfunction/actsonandoffscreentest/BUILD.gn b/ability/ability_runtime/actssupportfunction/actsonandoffscreentest/BUILD.gn index 3fe950e9b..4e7565a37 100644 --- a/ability/ability_runtime/actssupportfunction/actsonandoffscreentest/BUILD.gn +++ b/ability/ability_runtime/actssupportfunction/actsonandoffscreentest/BUILD.gn @@ -15,6 +15,7 @@ import("//test/xts/tools/build/suite.gni") ohos_js_hap_suite("ActsOnAndOffScreenTest") { hap_profile = "entry/src/main/module.json" + js_build_mode = "debug" deps = [ ":actsonandoffscreentest_js_assets", ":actsonandoffscreentest_resources", diff --git a/ability/ability_runtime/actssupportfunction/actsonandoffscreentest/entry/src/main/ets/test/OnAndOffScreenTest.test.ets b/ability/ability_runtime/actssupportfunction/actsonandoffscreentest/entry/src/main/ets/test/OnAndOffScreenTest.test.ets index a3f14cd5b..812613020 100644 --- a/ability/ability_runtime/actssupportfunction/actsonandoffscreentest/entry/src/main/ets/test/OnAndOffScreenTest.test.ets +++ b/ability/ability_runtime/actssupportfunction/actsonandoffscreentest/entry/src/main/ets/test/OnAndOffScreenTest.test.ets @@ -13,12 +13,15 @@ * limitations under the License. */ import { describe, beforeAll, beforeEach, afterEach, afterAll, it, expect } from '@ohos/hypium'; -import { BY,UiDriver,UiComponent } from '@ohos.uitest'; import commonEvent from '@ohos.commonEvent'; import AbilityDelegatorRegistry from '@ohos.application.abilityDelegatorRegistry'; import power from '@ohos.power'; import backgroundTaskManager from '@ohos.backgroundTaskManager'; +function sleep(ms) { + return new Promise(resolve => setTimeout(resolve, ms)); +} + export default function OnAndOffScreenTest() { describe('OnAndOffScreenTest', function () { @@ -53,12 +56,9 @@ export default function OnAndOffScreenTest() { async function slideScreen(TAG) { console.log(TAG + "slideScreen start"); - var driver = UiDriver.create(); - await driver.swipe(1000, 3000, 1000, 500).then((data) => { - console.log(TAG + "swipe : " + JSON.stringify(data)); - }).catch((error) => { - console.log(TAG + "swipe error = " + JSON.stringify(error)); - }) + let cmd = 'uinput -T -d 300 600 -m 300 600 300 100 -u 300 100'; + await executeShellCommand(cmd, TAG); + await sleep(500) console.log(TAG + "slideScreen end"); } diff --git a/ability/ability_runtime/actssupportfunction/actsonandoffscreentest/entry/src/main/module.json b/ability/ability_runtime/actssupportfunction/actsonandoffscreentest/entry/src/main/module.json index 0199106a5..35835b1ca 100644 --- a/ability/ability_runtime/actssupportfunction/actsonandoffscreentest/entry/src/main/module.json +++ b/ability/ability_runtime/actssupportfunction/actsonandoffscreentest/entry/src/main/module.json @@ -6,8 +6,7 @@ "description": "$string:entry_desc", "mainElement": "MainAbility", "deviceTypes": [ - "default", - "phone" + "default" ], "deliveryWithInstall": true, "installationFree": false, diff --git a/ability/ability_runtime/actssupportfunction/actssupportfunctiontest/BUILD.gn b/ability/ability_runtime/actssupportfunction/actssupportfunctiontest/BUILD.gn index 03a9f1596..940b0615f 100644 --- a/ability/ability_runtime/actssupportfunction/actssupportfunctiontest/BUILD.gn +++ b/ability/ability_runtime/actssupportfunction/actssupportfunctiontest/BUILD.gn @@ -15,6 +15,7 @@ import("//test/xts/tools/build/suite.gni") ohos_js_hap_suite("ActsSupportFunctionTest") { hap_profile = "entry/src/main/module.json" + js_build_mode = "debug" deps = [ ":actssupportfunctiontest_js_assets", ":actssupportfunctiontest_resources", diff --git a/ability/ability_runtime/actssupportfunction/actssupportfunctiontest/entry/src/main/module.json b/ability/ability_runtime/actssupportfunction/actssupportfunctiontest/entry/src/main/module.json index 0199106a5..35835b1ca 100644 --- a/ability/ability_runtime/actssupportfunction/actssupportfunctiontest/entry/src/main/module.json +++ b/ability/ability_runtime/actssupportfunction/actssupportfunctiontest/entry/src/main/module.json @@ -6,8 +6,7 @@ "description": "$string:entry_desc", "mainElement": "MainAbility", "deviceTypes": [ - "default", - "phone" + "default" ], "deliveryWithInstall": true, "installationFree": false, diff --git a/ability/ability_runtime/actssupportfunction/faonandoffscreen/entry/src/main/config.json b/ability/ability_runtime/actssupportfunction/faonandoffscreen/entry/src/main/config.json index f4ceb1a25..dc40de361 100644 --- a/ability/ability_runtime/actssupportfunction/faonandoffscreen/entry/src/main/config.json +++ b/ability/ability_runtime/actssupportfunction/faonandoffscreen/entry/src/main/config.json @@ -17,8 +17,7 @@ "name": ".entry", "mainAbility": ".MainAbility", "deviceType": [ - "default", - "phone" + "default" ], "distro": { "deliveryWithInstall": true, diff --git a/ability/ability_runtime/actssupportfunction/fasupportfunction/entry/src/main/config.json b/ability/ability_runtime/actssupportfunction/fasupportfunction/entry/src/main/config.json index 5fc9c1139..605ef98c2 100644 --- a/ability/ability_runtime/actssupportfunction/fasupportfunction/entry/src/main/config.json +++ b/ability/ability_runtime/actssupportfunction/fasupportfunction/entry/src/main/config.json @@ -17,8 +17,7 @@ "name": ".entry", "mainAbility": ".MainAbility", "deviceType": [ - "default", - "phone" + "default" ], "distro": { "deliveryWithInstall": true, diff --git a/ability/ability_runtime/actssupportfunction/fasupportfunction/fasupportfunctiontwo/src/main/config.json b/ability/ability_runtime/actssupportfunction/fasupportfunction/fasupportfunctiontwo/src/main/config.json index c7a107d40..ccacab64b 100644 --- a/ability/ability_runtime/actssupportfunction/fasupportfunction/fasupportfunctiontwo/src/main/config.json +++ b/ability/ability_runtime/actssupportfunction/fasupportfunction/fasupportfunctiontwo/src/main/config.json @@ -17,8 +17,7 @@ "name": ".fasupportfunctiontwo", "mainAbility": ".MainAbility", "deviceType": [ - "default", - "phone" + "default" ], "distro": { "deliveryWithInstall": true, diff --git a/ability/ability_runtime/actssupportfunction/fasupportfunctionthree/entry/src/main/config.json b/ability/ability_runtime/actssupportfunction/fasupportfunctionthree/entry/src/main/config.json index 9b7734d2e..a627a5ada 100644 --- a/ability/ability_runtime/actssupportfunction/fasupportfunctionthree/entry/src/main/config.json +++ b/ability/ability_runtime/actssupportfunction/fasupportfunctionthree/entry/src/main/config.json @@ -17,8 +17,7 @@ "name": ".entry", "mainAbility": ".MainAbility", "deviceType": [ - "default", - "phone" + "default" ], "distro": { "deliveryWithInstall": true, diff --git a/ability/ability_runtime/actssupportfunction/stageonandoffscreen/BUILD.gn b/ability/ability_runtime/actssupportfunction/stageonandoffscreen/BUILD.gn index da661082b..89325b3b4 100644 --- a/ability/ability_runtime/actssupportfunction/stageonandoffscreen/BUILD.gn +++ b/ability/ability_runtime/actssupportfunction/stageonandoffscreen/BUILD.gn @@ -16,6 +16,7 @@ import("//test/xts/tools/build/suite.gni") ohos_hap_assist_suite("StageOnAndOffScreen") { hap_name = "StageOnAndOffScreen" hap_profile = "entry/src/main/module.json" + js_build_mode = "debug" testonly = true deps = [ ":stageonandoffscreen_js_assets", diff --git a/ability/ability_runtime/actssupportfunction/stageonandoffscreen/entry/src/main/module.json b/ability/ability_runtime/actssupportfunction/stageonandoffscreen/entry/src/main/module.json index f99e12634..a3c35c30e 100644 --- a/ability/ability_runtime/actssupportfunction/stageonandoffscreen/entry/src/main/module.json +++ b/ability/ability_runtime/actssupportfunction/stageonandoffscreen/entry/src/main/module.json @@ -6,8 +6,7 @@ "description": "$string:entry_desc", "mainElement": "MainAbility", "deviceTypes": [ - "default", - "phone" + "default" ], "deliveryWithInstall": true, "installationFree": false, diff --git a/ability/ability_runtime/actssupportfunction/stagesupportfunction/BUILD.gn b/ability/ability_runtime/actssupportfunction/stagesupportfunction/BUILD.gn index 429266544..bb9b484b7 100644 --- a/ability/ability_runtime/actssupportfunction/stagesupportfunction/BUILD.gn +++ b/ability/ability_runtime/actssupportfunction/stagesupportfunction/BUILD.gn @@ -16,6 +16,7 @@ import("//test/xts/tools/build/suite.gni") ohos_hap_assist_suite("StageSupportFunction") { hap_name = "StageSupportFunction" hap_profile = "entry/src/main/module.json" + js_build_mode = "debug" testonly = true deps = [ ":stagesupportfunction_js_assets", diff --git a/ability/ability_runtime/actssupportfunction/stagesupportfunction/entry/src/main/module.json b/ability/ability_runtime/actssupportfunction/stagesupportfunction/entry/src/main/module.json index be8af7585..55b322b05 100644 --- a/ability/ability_runtime/actssupportfunction/stagesupportfunction/entry/src/main/module.json +++ b/ability/ability_runtime/actssupportfunction/stagesupportfunction/entry/src/main/module.json @@ -6,8 +6,7 @@ "description": "$string:entry_desc", "mainElement": "MainAbility", "deviceTypes": [ - "default", - "phone" + "default" ], "deliveryWithInstall": true, "installationFree": false, diff --git a/ability/ability_runtime/actsusers/ActsAmsUsersApi7AppA/entry/src/main/config.json b/ability/ability_runtime/actsusers/ActsAmsUsersApi7AppA/entry/src/main/config.json index e428f5e93..8edc575cd 100644 --- a/ability/ability_runtime/actsusers/ActsAmsUsersApi7AppA/entry/src/main/config.json +++ b/ability/ability_runtime/actsusers/ActsAmsUsersApi7AppA/entry/src/main/config.json @@ -18,8 +18,7 @@ "mainAbility": ".MainAbility", "srcPath": "", "deviceType": [ - "default", - "phone" + "default" ], "distro": { "deliveryWithInstall": true, diff --git a/ability/ability_runtime/actsusers/ActsAmsUsersExtensionSystemTest/entry/src/main/module.json b/ability/ability_runtime/actsusers/ActsAmsUsersExtensionSystemTest/entry/src/main/module.json index 44fb329d1..10f133efe 100644 --- a/ability/ability_runtime/actsusers/ActsAmsUsersExtensionSystemTest/entry/src/main/module.json +++ b/ability/ability_runtime/actsusers/ActsAmsUsersExtensionSystemTest/entry/src/main/module.json @@ -6,7 +6,7 @@ "description": "$string:phone_entry_dsc", "mainElement": "MainAbility", "deviceTypes": [ - "phone" + "default" ], "deliveryWithInstall": true, "installationFree": false, diff --git a/ability/ability_runtime/actsusers/ActsAmsUsersExtensionThirdTest/entry/src/main/module.json b/ability/ability_runtime/actsusers/ActsAmsUsersExtensionThirdTest/entry/src/main/module.json index 188aba960..3863039da 100644 --- a/ability/ability_runtime/actsusers/ActsAmsUsersExtensionThirdTest/entry/src/main/module.json +++ b/ability/ability_runtime/actsusers/ActsAmsUsersExtensionThirdTest/entry/src/main/module.json @@ -6,7 +6,7 @@ "description": "$string:phone_entry_dsc", "mainElement": "MainAbility", "deviceTypes": [ - "phone" + "default" ], "deliveryWithInstall": true, "installationFree": false, diff --git a/ability/ability_runtime/actsusers/ActsAmsUsersKillProcessAppA/entry/src/main/module.json b/ability/ability_runtime/actsusers/ActsAmsUsersKillProcessAppA/entry/src/main/module.json index 0708ef683..d7c161002 100644 --- a/ability/ability_runtime/actsusers/ActsAmsUsersKillProcessAppA/entry/src/main/module.json +++ b/ability/ability_runtime/actsusers/ActsAmsUsersKillProcessAppA/entry/src/main/module.json @@ -6,8 +6,7 @@ "description": "$string:phone_entry_dsc", "mainElement": "MainAbility", "deviceTypes": [ - "default", - "phone" + "default" ], "deliveryWithInstall": true, "installationFree": false, diff --git a/ability/ability_runtime/actsusers/ActsAmsUsersKillProcessAppB/entry/src/main/module.json b/ability/ability_runtime/actsusers/ActsAmsUsersKillProcessAppB/entry/src/main/module.json index 57dd4170d..d9dbc04c0 100644 --- a/ability/ability_runtime/actsusers/ActsAmsUsersKillProcessAppB/entry/src/main/module.json +++ b/ability/ability_runtime/actsusers/ActsAmsUsersKillProcessAppB/entry/src/main/module.json @@ -6,8 +6,7 @@ "description": "$string:phone_entry_dsc", "mainElement": "MainAbility", "deviceTypes": [ - "default", - "phone" + "default" ], "deliveryWithInstall": true, "installationFree": false, diff --git a/ability/ability_runtime/actsusers/ActsAmsUsersKillProcessAppC/entry/src/main/module.json b/ability/ability_runtime/actsusers/ActsAmsUsersKillProcessAppC/entry/src/main/module.json index 67a161605..5b69f5ad5 100644 --- a/ability/ability_runtime/actsusers/ActsAmsUsersKillProcessAppC/entry/src/main/module.json +++ b/ability/ability_runtime/actsusers/ActsAmsUsersKillProcessAppC/entry/src/main/module.json @@ -6,8 +6,7 @@ "description": "$string:phone_entry_dsc", "mainElement": "MainAbility", "deviceTypes": [ - "default", - "phone" + "default" ], "deliveryWithInstall": true, "installationFree": false, diff --git a/ability/ability_runtime/actsusers/ActsAmsUsersSystemTest/entry/src/main/ets/test/Ability.test.ets b/ability/ability_runtime/actsusers/ActsAmsUsersSystemTest/entry/src/main/ets/test/Ability.test.ets index c532c04c7..f259dc2ac 100644 --- a/ability/ability_runtime/actsusers/ActsAmsUsersSystemTest/entry/src/main/ets/test/Ability.test.ets +++ b/ability/ability_runtime/actsusers/ActsAmsUsersSystemTest/entry/src/main/ets/test/Ability.test.ets @@ -74,12 +74,12 @@ export default function abilityTest() { console.debug("====>in ACTS_InterfaceMultiUsers====>"); /* - * @tc.number : ACTS_startAbility_0100 + * @tc.number : ACTS_startAbility_2000 * @tc.name : start new ability * @tc.desc : Start an ability with the parameter startability with options succeeded.(promise) */ - it('ACTS_StartAbility_0100', 0, async function (done) { - let TAG = 'ACTS_StartAbility_0100' + it('ACTS_startAbility_2000', 0, async function (done) { + let TAG = 'ACTS_startAbility_2000' let Subscriber var flag = true var startresult = false @@ -121,7 +121,7 @@ export default function abilityTest() { function timeout() { if(flag == true) { expect().assertFail(); - console.debug(TAG + 'ACTS_startAbility_0100 - timeout'); + console.debug(TAG + 'ACTS_startAbility_2000 - timeout'); commonEvent.unsubscribe(Subscriber, UnSubscribeCallback) } } @@ -130,12 +130,12 @@ export default function abilityTest() { }) /* - * @tc.number : ACTS_startAbility_0200 + * @tc.number : ACTS_startAbility_2200 * @tc.name : start new ability * @tc.desc : Start an ability with the parameter startability with options failed.(promise) */ - it('ACTS_StartAbility_0200', 0, async function (done) { - let TAG = 'ACTS_StartAbility_0200' + it('ACTS_startAbility_2200', 0, async function (done) { + let TAG = 'ACTS_startAbility_2200' let Subscriber function SubscribeCallBack (err, data) { expect().assertFail(); @@ -168,7 +168,7 @@ export default function abilityTest() { } function timeout() { - console.debug(TAG + 'ACTS_startAbility_0200 - timeout'); + console.debug(TAG + 'ACTS_startAbility_2200 - timeout'); commonEvent.unsubscribe(Subscriber, UnSubscribeCallback) } @@ -176,12 +176,12 @@ export default function abilityTest() { }) /* - * @tc.number : ACTS_startAbility_0300 + * @tc.number : ACTS_startAbility_2400 * @tc.name : start new ability * @tc.desc : Start an ability with the parameter startability with options succeeded.(callback) */ - it('ACTS_StartAbility_0300', 0, async function (done) { - let TAG = 'ACTS_StartAbility_0300' + it('ACTS_startAbility_2400', 0, async function (done) { + let TAG = 'ACTS_startAbility_2400' let Subscriber var flag = true var startresult = false @@ -223,7 +223,7 @@ export default function abilityTest() { function timeout() { if(flag == true) { expect().assertFail(); - console.debug(TAG + 'ACTS_startAbility_0300 - timeout'); + console.debug(TAG + 'ACTS_startAbility_2400 - timeout'); commonEvent.unsubscribe(Subscriber, UnSubscribeCallback) } } @@ -233,12 +233,12 @@ export default function abilityTest() { }) /* - * @tc.number : ACTS_startAbility_0400 + * @tc.number : ACTS_startAbility_2600 * @tc.name : start new ability * @tc.desc : Start an ability with the parameter startability with options failed.(callback) */ - it('ACTS_StartAbility_0400', 0, async function (done) { - let TAG = 'ACTS_StartAbility_0400' + it('ACTS_startAbility_2600', 0, async function (done) { + let TAG = 'ACTS_startAbility_2600' let Subscriber function SubscribeCallBack (err, data) { expect().assertFail(); @@ -271,7 +271,7 @@ export default function abilityTest() { } function timeout() { - console.debug(TAG + 'ACTS_startAbility_0400 - timeout'); + console.debug(TAG + 'ACTS_startAbility_2600 - timeout'); commonEvent.unsubscribe(Subscriber, UnSubscribeCallback) } @@ -280,12 +280,12 @@ export default function abilityTest() { }) /* - * @tc.number : ACTS_startAbility_0500 + * @tc.number : ACTS_startAbility_2800 * @tc.name : start new ability * @tc.desc : Starting mainability2 with startability succeeded.(promise) */ - it('ACTS_StartAbility_0500', 0, async function (done) { - let TAG = 'ACTS_StartAbility_0500' + it('ACTS_startAbility_2800', 0, async function (done) { + let TAG = 'ACTS_startAbility_2800' let Subscriber var flag = true var startresult = false @@ -325,7 +325,7 @@ export default function abilityTest() { function timeout() { if(flag == true) { expect().assertFail(); - console.debug(TAG + 'ACTS_startAbility_0100 - timeout'); + console.debug(TAG + 'ACTS_startAbility_2800 - timeout'); commonEvent.unsubscribe(Subscriber, UnSubscribeCallback) } } @@ -334,12 +334,12 @@ export default function abilityTest() { }) /* - * @tc.number : ACTS_startAbility_0700 + * @tc.number : ACTS_startAbility_2900 * @tc.name : start new ability * @tc.desc : Starting mainability2 with startability succeeded.(callback) */ - it('ACTS_StartAbility_0700', 0, async function (done) { - let TAG = 'ACTS_StartAbility_0700' + it('ACTS_startAbility_2900', 0, async function (done) { + let TAG = 'ACTS_startAbility_2900' let Subscriber var flag = true var startresult = false @@ -379,7 +379,7 @@ export default function abilityTest() { function timeout() { if(flag == true) { expect().assertFail(); - console.debug(TAG + 'ACTS_startAbility_0300 - timeout'); + console.debug(TAG + 'ACTS_startAbility_2900 - timeout'); commonEvent.unsubscribe(Subscriber, UnSubscribeCallback) } } @@ -389,12 +389,12 @@ export default function abilityTest() { }) /* - * @tc.number : ACTS_startAbility_0900 + * @tc.number : ACTS_startAbility_3000 * @tc.name : start new ability * @tc.desc : Start an ability with the parameter startability with options succeeded.(promise) */ - it('ACTS_StartAbility_0900', 0, async function (done) { - let TAG = 'ACTS_StartAbility_0900' + it('ACTS_startAbility_3000', 0, async function (done) { + let TAG = 'ACTS_startAbility_3000' let Subscriber var flag = true var startresult = false @@ -433,7 +433,7 @@ export default function abilityTest() { function timeout() { if(flag == true) { expect().assertFail(); - console.debug(TAG + 'ACTS_startAbility_0900 - timeout'); + console.debug(TAG + 'ACTS_startAbility_3000 - timeout'); commonEvent.unsubscribe(Subscriber, UnSubscribeCallback) } } @@ -441,12 +441,12 @@ export default function abilityTest() { setTimeout(timeout, START_ABILITY_TIMEOUT); }) /* - * @tc.number : ACTS_startAbility_1000 + * @tc.number : ACTS_startAbility_3100 * @tc.name : start new ability * @tc.desc : Start an ability with the parameter startability with options succeeded.(promise) */ - it('ACTS_startAbility_1000', 0, async function (done) { - let TAG = 'ACTS_startAbility_1000' + it('ACTS_startAbility_3100', 0, async function (done) { + let TAG = 'ACTS_startAbility_3100' let Subscriber var flag = true var startresult = false @@ -485,7 +485,7 @@ export default function abilityTest() { function timeout() { if(flag == true) { expect().assertFail(); - console.debug(TAG + 'ACTS_startAbility_1000 - timeout'); + console.debug(TAG + 'ACTS_startAbility_3100 - timeout'); commonEvent.unsubscribe(Subscriber, UnSubscribeCallback) } } diff --git a/ability/ability_runtime/actsusers/ActsAmsUsersSystemTest/entry/src/main/module.json b/ability/ability_runtime/actsusers/ActsAmsUsersSystemTest/entry/src/main/module.json index 91307c774..f6501c953 100644 --- a/ability/ability_runtime/actsusers/ActsAmsUsersSystemTest/entry/src/main/module.json +++ b/ability/ability_runtime/actsusers/ActsAmsUsersSystemTest/entry/src/main/module.json @@ -6,8 +6,7 @@ "description": "$string:phone_entry_dsc", "mainElement": "MainAbility", "deviceTypes": [ - "default", - "phone" + "default" ], "deliveryWithInstall": true, "installationFree": false, diff --git a/ability/ability_runtime/actsusers/ActsAmsUsersThirdTest/entry/src/main/module.json b/ability/ability_runtime/actsusers/ActsAmsUsersThirdTest/entry/src/main/module.json index c4fab1c1e..6247a74d3 100644 --- a/ability/ability_runtime/actsusers/ActsAmsUsersThirdTest/entry/src/main/module.json +++ b/ability/ability_runtime/actsusers/ActsAmsUsersThirdTest/entry/src/main/module.json @@ -6,7 +6,7 @@ "description": "$string:phone_entry_dsc", "mainElement": "MainAbility", "deviceTypes": [ - "phone" + "default" ], "deliveryWithInstall": true, "installationFree": false, diff --git a/ability/ability_runtime/actsusers/actsconnectabilitysystemabilitytest/entry/src/main/module.json b/ability/ability_runtime/actsusers/actsconnectabilitysystemabilitytest/entry/src/main/module.json index 486c0cf0f..8e5fb7848 100644 --- a/ability/ability_runtime/actsusers/actsconnectabilitysystemabilitytest/entry/src/main/module.json +++ b/ability/ability_runtime/actsusers/actsconnectabilitysystemabilitytest/entry/src/main/module.json @@ -6,7 +6,7 @@ "description": "$string:phone_entry_dsc", "mainElement": "MainAbility", "deviceTypes": [ - "phone" + "default" ], "deliveryWithInstall": true, "installationFree": false, diff --git a/ability/ability_runtime/actsusers/actsmanyuserthirdabilitytest/entry/src/main/module.json b/ability/ability_runtime/actsusers/actsmanyuserthirdabilitytest/entry/src/main/module.json index 081771c25..8ec9736d5 100644 --- a/ability/ability_runtime/actsusers/actsmanyuserthirdabilitytest/entry/src/main/module.json +++ b/ability/ability_runtime/actsusers/actsmanyuserthirdabilitytest/entry/src/main/module.json @@ -6,7 +6,7 @@ "description": "$string:phone_entry_dsc", "mainElement": "MainAbility", "deviceTypes": [ - "phone" + "default" ], "deliveryWithInstall": true, "installationFree": false, diff --git a/ability/ability_runtime/amscontextualinforquery/actsamsextensionmodulehap/entry/src/main/module.json b/ability/ability_runtime/amscontextualinforquery/actsamsextensionmodulehap/entry/src/main/module.json index c0ea26177..5d31ed446 100644 --- a/ability/ability_runtime/amscontextualinforquery/actsamsextensionmodulehap/entry/src/main/module.json +++ b/ability/ability_runtime/amscontextualinforquery/actsamsextensionmodulehap/entry/src/main/module.json @@ -6,8 +6,7 @@ "description": "$string:phone_entry_dsc", "mainElement": "MainAbility", "deviceTypes": [ - "default", - "phone" + "default" ], "deliveryWithInstall": true, "installationFree": false, diff --git a/ability/ability_runtime/amscontextualinforquery/actsamsstaticabilitystagecontexttest/entry/src/main/ets/test/Ability.test.ets b/ability/ability_runtime/amscontextualinforquery/actsamsstaticabilitystagecontexttest/entry/src/main/ets/test/Ability.test.ets index aef55dcd6..7443b13e7 100644 --- a/ability/ability_runtime/amscontextualinforquery/actsamsstaticabilitystagecontexttest/entry/src/main/ets/test/Ability.test.ets +++ b/ability/ability_runtime/amscontextualinforquery/actsamsstaticabilitystagecontexttest/entry/src/main/ets/test/Ability.test.ets @@ -165,7 +165,7 @@ export default function abilityTest() { expect(data.supportedModes).assertEqual(0); expect(data.reqCapabilities.length).assertEqual(0); expect(data.deviceTypes.length).assertEqual(1); - expect(data.deviceTypes[0]).assertEqual("phone"); + expect(data.deviceTypes[0]).assertEqual("default"); expect(data.moduleName).assertEqual("com.example.staticabilitystagecontext") expect(data.mainAbilityName).assertEqual("com.example.staticabilitystagecontext.MainAbility"); expect(data.installationFree).assertEqual(false); diff --git a/ability/ability_runtime/amscontextualinforquery/actsamsstaticabilitystagecontexttest/entry/src/main/module.json b/ability/ability_runtime/amscontextualinforquery/actsamsstaticabilitystagecontexttest/entry/src/main/module.json index 4a7e8aec7..e95307192 100644 --- a/ability/ability_runtime/amscontextualinforquery/actsamsstaticabilitystagecontexttest/entry/src/main/module.json +++ b/ability/ability_runtime/amscontextualinforquery/actsamsstaticabilitystagecontexttest/entry/src/main/module.json @@ -6,8 +6,7 @@ "description": "$string:phone_entry_dsc", "mainElement": "com.example.staticabilitystagecontext.MainAbility", "deviceTypes": [ - "default", - "phone" + "default" ], "deliveryWithInstall": true, "installationFree": false, diff --git a/ability/ability_runtime/amscontextualinforquery/actsamsstaticextensioninfohap/entry/src/main/module.json b/ability/ability_runtime/amscontextualinforquery/actsamsstaticextensioninfohap/entry/src/main/module.json index ba61d981c..9ab4ab38a 100644 --- a/ability/ability_runtime/amscontextualinforquery/actsamsstaticextensioninfohap/entry/src/main/module.json +++ b/ability/ability_runtime/amscontextualinforquery/actsamsstaticextensioninfohap/entry/src/main/module.json @@ -6,8 +6,7 @@ "description": "$string:phone_entry_dsc", "mainElement": "com.example.staticextensioninfotest.MainAbility", "deviceTypes": [ - "default", - "phone" + "default" ], "deliveryWithInstall": true, "installationFree": false, diff --git a/ability/ability_runtime/amscontextualinforquery/actsamsstaticextensioninfotest/entry/src/main/ets/test/Ability.test.ets b/ability/ability_runtime/amscontextualinforquery/actsamsstaticextensioninfotest/entry/src/main/ets/test/Ability.test.ets index fddd62c18..b4bfab158 100644 --- a/ability/ability_runtime/amscontextualinforquery/actsamsstaticextensioninfotest/entry/src/main/ets/test/Ability.test.ets +++ b/ability/ability_runtime/amscontextualinforquery/actsamsstaticextensioninfotest/entry/src/main/ets/test/Ability.test.ets @@ -127,7 +127,7 @@ export default function abilityTest() { expect(data.supportedModes).assertEqual(0); expect(data.reqCapabilities.length).assertEqual(0); expect(data.deviceTypes.length).assertEqual(1); - expect(data.deviceTypes[0]).assertEqual("phone"); + expect(data.deviceTypes[0]).assertEqual("default"); expect(data.moduleName).assertEqual("phone") expect(data.mainAbilityName).assertEqual("com.example.staticextensioninfo.MainAbility"); expect(data.installationFree).assertEqual(false); @@ -309,7 +309,7 @@ export default function abilityTest() { expect(data.supportedModes).assertEqual(0); expect(data.reqCapabilities.length).assertEqual(0); expect(data.deviceTypes.length).assertEqual(1); - expect(data.deviceTypes[0]).assertEqual("phone"); + expect(data.deviceTypes[0]).assertEqual("default"); expect(data.moduleName).assertEqual("phone") expect(data.mainAbilityName).assertEqual("com.example.staticextensioninfotest.MainAbility"); expect(data.installationFree).assertEqual(false); diff --git a/ability/ability_runtime/amscontextualinforquery/actsamsstaticextensioninfotest/entry/src/main/module.json b/ability/ability_runtime/amscontextualinforquery/actsamsstaticextensioninfotest/entry/src/main/module.json index 36fa006e1..f8f0d2036 100644 --- a/ability/ability_runtime/amscontextualinforquery/actsamsstaticextensioninfotest/entry/src/main/module.json +++ b/ability/ability_runtime/amscontextualinforquery/actsamsstaticextensioninfotest/entry/src/main/module.json @@ -6,8 +6,7 @@ "description": "$string:phone_entry_dsc", "mainElement": "com.example.staticextensioninfo.MainAbility", "deviceTypes": [ - "default", - "phone" + "default" ], "deliveryWithInstall": true, "installationFree": false, diff --git a/ability/ability_runtime/amscontextualinforquery/actsamsstatichapa/entry/src/main/module.json b/ability/ability_runtime/amscontextualinforquery/actsamsstatichapa/entry/src/main/module.json index dc941e9c3..366fc38a6 100644 --- a/ability/ability_runtime/amscontextualinforquery/actsamsstatichapa/entry/src/main/module.json +++ b/ability/ability_runtime/amscontextualinforquery/actsamsstatichapa/entry/src/main/module.json @@ -6,8 +6,7 @@ "description": "$string:phone_entry_dsc", "mainElement": "MainAbility", "deviceTypes": [ - "default", - "phone" + "default" ], "deliveryWithInstall": true, "installationFree": false, diff --git a/ability/ability_runtime/amscontextualinforquery/actsamsstatichapb/entry/src/main/module.json b/ability/ability_runtime/amscontextualinforquery/actsamsstatichapb/entry/src/main/module.json index f149ec893..f2fb9a780 100644 --- a/ability/ability_runtime/amscontextualinforquery/actsamsstatichapb/entry/src/main/module.json +++ b/ability/ability_runtime/amscontextualinforquery/actsamsstatichapb/entry/src/main/module.json @@ -6,8 +6,7 @@ "description": "$string:phone_entry_dsc", "mainElement": "MainAbility", "deviceTypes": [ - "default", - "phone" + "default" ], "deliveryWithInstall": true, "installationFree": false, diff --git a/ability/ability_runtime/amscontextualinforquery/actsamsstaticinfomationquerytest/entry/src/main/ets/test/Ability.test.ets b/ability/ability_runtime/amscontextualinforquery/actsamsstaticinfomationquerytest/entry/src/main/ets/test/Ability.test.ets index 8d9e23434..3635eb47a 100644 --- a/ability/ability_runtime/amscontextualinforquery/actsamsstaticinfomationquerytest/entry/src/main/ets/test/Ability.test.ets +++ b/ability/ability_runtime/amscontextualinforquery/actsamsstaticinfomationquerytest/entry/src/main/ets/test/Ability.test.ets @@ -212,7 +212,7 @@ export default function abilityTest() { expect(data.orientation).assertEqual(2); expect(data.launchMode).assertEqual(0); expect(data.permissions.length).assertEqual(0); - expect(data.deviceTypes[0]).assertEqual("phone"); + expect(data.deviceTypes[0]).assertEqual("default"); expect(data.deviceTypes.length).assertEqual(1); expect(data.deviceCapabilities.length).assertEqual(0); expect(data.readPermission).assertEqual(""); @@ -349,7 +349,7 @@ export default function abilityTest() { expect(data.supportedModes).assertEqual(0); expect(data.reqCapabilities.length).assertEqual(0); expect(data.deviceTypes.length).assertEqual(1); - expect(data.deviceTypes[0]).assertEqual("phone"); + expect(data.deviceTypes[0]).assertEqual("default"); expect(data.moduleName).assertEqual("com.example.staticinfomationquery") expect(data.mainAbilityName).assertEqual("com.example.staticinfomationquery.MainAbility"); expect(data.installationFree).assertEqual(false); diff --git a/ability/ability_runtime/amscontextualinforquery/actsamsstaticinfomationquerytest/entry/src/main/module.json b/ability/ability_runtime/amscontextualinforquery/actsamsstaticinfomationquerytest/entry/src/main/module.json index b9efba833..063b75b2c 100644 --- a/ability/ability_runtime/amscontextualinforquery/actsamsstaticinfomationquerytest/entry/src/main/module.json +++ b/ability/ability_runtime/amscontextualinforquery/actsamsstaticinfomationquerytest/entry/src/main/module.json @@ -6,8 +6,7 @@ "description": "$string:phone_entry_dsc", "mainElement": "com.example.staticinfomationquery.MainAbility", "deviceTypes": [ - "default", - "phone" + "default" ], "deliveryWithInstall": true, "installationFree": false, diff --git a/ability/ability_runtime/amscontextualinforquery/actsamsstaticinformationmultipletest/entry/src/main/module.json b/ability/ability_runtime/amscontextualinforquery/actsamsstaticinformationmultipletest/entry/src/main/module.json index 3049f74f4..93d5f8a63 100644 --- a/ability/ability_runtime/amscontextualinforquery/actsamsstaticinformationmultipletest/entry/src/main/module.json +++ b/ability/ability_runtime/amscontextualinforquery/actsamsstaticinformationmultipletest/entry/src/main/module.json @@ -1,84 +1,83 @@ { - "module": { - "name": "phone", - "type": "entry", - "srcEntrance": "./ets/Application/AbilityStage.ts", - "description": "$string:phone_entry_dsc", - "mainElement": "MainAbility", - "deviceTypes": [ - "default", - "phone" - ], - "deliveryWithInstall": true, - "installationFree": false, - "uiSyntax": "ets", - "pages": "$profile:main_pages", - "abilities": [ - { - "name": "com.example.staticinformationmultiple.MainAbility", - "srcEntrance": "./ets/MainAbility/MainAbility.ts", - "description": "$string:phone_entry_main", - "icon": "$media:icon", - "label": "$string:entry_label", - "visible": true, - "orientation": "portrait", - "skills": [ - { - "actions": [ - "action.system.home" - ], - "entities":[ - "entity.system.home" - ] - } - ] - } - ], - "requestPermissions": [ + "module": { + "name": "phone", + "type": "entry", + "srcEntrance": "./ets/Application/AbilityStage.ts", + "description": "$string:phone_entry_dsc", + "mainElement": "MainAbility", + "deviceTypes": [ + "default" + ], + "deliveryWithInstall": true, + "installationFree": false, + "uiSyntax": "ets", + "pages": "$profile:main_pages", + "abilities": [ + { + "name": "com.example.staticinformationmultiple.MainAbility", + "srcEntrance": "./ets/MainAbility/MainAbility.ts", + "description": "$string:phone_entry_main", + "icon": "$media:icon", + "label": "$string:entry_label", + "visible": true, + "orientation": "portrait", + "skills": [ { - "name":"ohos.permission.GET_BUNDLE_INFO_PRIVILEGED", - "reason":"need use ohos.permission.GET_BUNDLE_INFO_PRIVILEGED" - }, - { - "name":"ohos.permission.GET_BUNDLE_INFO", - "reason":"need use ohos.permission.GET_BUNDLE_INFO" - }, - { - "name":"ohos.permission.CHANGE_ABILITY_ENABLED_STATE", - "reason":"need use ohos.permission.CHANGE_ABILITY_ENABLED_STATE" - }, - { - "name":"ohos.permission.REMOVE_CACHE_FILES", - "reason":"need use ohos.permission.REMOVE_CACHE_FILES" - }, - { - "name":"ohos.permission.LISTEN_BUNDLE_CHANGE", - "reason":"need use ohos.permission.LISTEN_BUNDLE_CHANGE" - }, - { - "name":"ohos.permission.INSTALL_BUNDLE", - "reason":"need use ohos.permission.INSTALL_BUNDLE" - }, - { - "name":"ohos.permission.MANAGE_MISSIONS", - "reason":"need use ohos.permission.MANAGE_MISSIONS" - }, - { - "name":"ohos.permission.INTERACT_ACROSS_LOCAL_ACCOUNTS", - "reason":"need use ohos.permission.INTERACT_ACROSS_LOCAL_ACCOUNTS" - }, - { - "name":"ohos.permission.CLEAN_BACKGROUND_PROCESSES", - "reason":"need use ohos.permission.CLEAN_BACKGROUND_PROCESSES" - }, - { - "name":"ohos.permission.GET_RUNNING_INFO", - "reason":"need use ohos.permission.GET_RUNNING_INFO" - }, - { - "name":"ohos.permission.USE_BLUETOOTH", - "reason":"need use ohos.permission.USE_BLUETOOTH" + "actions": [ + "action.system.home" + ], + "entities": [ + "entity.system.home" + ] } - ] - } -} + ] + } + ], + "requestPermissions": [ + { + "name": "ohos.permission.GET_BUNDLE_INFO_PRIVILEGED", + "reason": "need use ohos.permission.GET_BUNDLE_INFO_PRIVILEGED" + }, + { + "name": "ohos.permission.GET_BUNDLE_INFO", + "reason": "need use ohos.permission.GET_BUNDLE_INFO" + }, + { + "name": "ohos.permission.CHANGE_ABILITY_ENABLED_STATE", + "reason": "need use ohos.permission.CHANGE_ABILITY_ENABLED_STATE" + }, + { + "name": "ohos.permission.REMOVE_CACHE_FILES", + "reason": "need use ohos.permission.REMOVE_CACHE_FILES" + }, + { + "name": "ohos.permission.LISTEN_BUNDLE_CHANGE", + "reason": "need use ohos.permission.LISTEN_BUNDLE_CHANGE" + }, + { + "name": "ohos.permission.INSTALL_BUNDLE", + "reason": "need use ohos.permission.INSTALL_BUNDLE" + }, + { + "name": "ohos.permission.MANAGE_MISSIONS", + "reason": "need use ohos.permission.MANAGE_MISSIONS" + }, + { + "name": "ohos.permission.INTERACT_ACROSS_LOCAL_ACCOUNTS", + "reason": "need use ohos.permission.INTERACT_ACROSS_LOCAL_ACCOUNTS" + }, + { + "name": "ohos.permission.CLEAN_BACKGROUND_PROCESSES", + "reason": "need use ohos.permission.CLEAN_BACKGROUND_PROCESSES" + }, + { + "name": "ohos.permission.GET_RUNNING_INFO", + "reason": "need use ohos.permission.GET_RUNNING_INFO" + }, + { + "name": "ohos.permission.USE_BLUETOOTH", + "reason": "need use ohos.permission.USE_BLUETOOTH" + } + ] + } +} \ No newline at end of file diff --git a/ability/ability_runtime/amscontextualinforquery/actsamsstaticinformationmultitest/entry/src/main/module.json b/ability/ability_runtime/amscontextualinforquery/actsamsstaticinformationmultitest/entry/src/main/module.json index 879ce1084..e1f9897dc 100644 --- a/ability/ability_runtime/amscontextualinforquery/actsamsstaticinformationmultitest/entry/src/main/module.json +++ b/ability/ability_runtime/amscontextualinforquery/actsamsstaticinformationmultitest/entry/src/main/module.json @@ -6,8 +6,7 @@ "description": "$string:phone_entry_dsc", "mainElement": "MainAbility", "deviceTypes": [ - "default", - "phone" + "default" ], "deliveryWithInstall": true, "installationFree": false, diff --git a/ability/ability_runtime/amscontextualinforquery/actsamsstaticquerytesttwohap/entry/src/main/module.json b/ability/ability_runtime/amscontextualinforquery/actsamsstaticquerytesttwohap/entry/src/main/module.json index e2379153a..4448888d8 100644 --- a/ability/ability_runtime/amscontextualinforquery/actsamsstaticquerytesttwohap/entry/src/main/module.json +++ b/ability/ability_runtime/amscontextualinforquery/actsamsstaticquerytesttwohap/entry/src/main/module.json @@ -6,8 +6,7 @@ "description": "$string:phone_entry_dsc", "mainElement": "MainAbility", "deviceTypes": [ - "default", - "phone" + "default" ], "deliveryWithInstall": true, "installationFree": false, diff --git a/ability/ability_runtime/amsdatauriutils/src/main/config.json b/ability/ability_runtime/amsdatauriutils/src/main/config.json index 04102ca09..7e80a0da1 100644 --- a/ability/ability_runtime/amsdatauriutils/src/main/config.json +++ b/ability/ability_runtime/amsdatauriutils/src/main/config.json @@ -17,8 +17,7 @@ "package": "com.amsst.amsdatauriutils", "name": ".entry", "deviceType": [ - "default", - "phone" + "default" ], "distro": { "deliveryWithInstall": true, @@ -114,4 +113,4 @@ "mainAbility": ".MainAbility", "srcPath": "" } -} +} diff --git a/ability/ability_runtime/amsdisplayIdtest/actsamsspecifytesthap/entry/src/main/module.json b/ability/ability_runtime/amsdisplayIdtest/actsamsspecifytesthap/entry/src/main/module.json index bbc0605a6..f6a734196 100644 --- a/ability/ability_runtime/amsdisplayIdtest/actsamsspecifytesthap/entry/src/main/module.json +++ b/ability/ability_runtime/amsdisplayIdtest/actsamsspecifytesthap/entry/src/main/module.json @@ -6,8 +6,7 @@ "description": "$string:phone_entry_dsc", "mainElement": "MainAbility", "deviceTypes": [ - "default", - "phone" + "default" ], "deliveryWithInstall": true, "installationFree": false, diff --git a/ability/ability_runtime/amsdisplayIdtest/actsamsstartabilityforresulttest/entry/src/main/ets/test/Ability.test.ets b/ability/ability_runtime/amsdisplayIdtest/actsamsstartabilityforresulttest/entry/src/main/ets/test/Ability.test.ets index dcdfe4b66..845c0ddc1 100644 --- a/ability/ability_runtime/amsdisplayIdtest/actsamsstartabilityforresulttest/entry/src/main/ets/test/Ability.test.ets +++ b/ability/ability_runtime/amsdisplayIdtest/actsamsstartabilityforresulttest/entry/src/main/ets/test/Ability.test.ets @@ -26,27 +26,27 @@ export default function abilityTest() { console.debug("====>in ActsGetDisplayIdStartAbilityForResultTest====>"); /* - * @tc.number: ACTS_startAbilityForResult_0100 + * @tc.number: ACTS_startAbilityForResult_0800 * @tc.name: Get the specified displayId to start Ability * @tc.desc: Verify Get displayId to startAbilityForResult Ability */ - it('ACTS_startAbilityForResult_0100', 0, async function (done) { + it('ACTS_startAbilityForResult_0800', 0, async function (done) { console.log('ACTS_startAbilityForResult_0100====ACTS_startAbilityForResult_0100 Subscribe CallBack data:====>" + JSON.stringify(data)); + console.debug("====>ACTS_startAbilityForResult_0800 Subscribe CallBack data:====>" + JSON.stringify(data)); async function processInfoCheck(data) { - console.info('====> ACTS_startAbilityForResult_0100=====>'); + console.info('====> ACTS_startAbilityForResult_0800=====>'); expect(data.parameters['displayId']).assertEqual(15); expect(data.parameters['windowMode']).assertEqual(0); done(); } if (data.event == "ACTS_TerminateSelf_CommonEvent") { - console.info('====> ACTS_startAbilityForResult_0100 start success=====>'); + console.info('====> ACTS_startAbilityForResult_0800 start success=====>'); clearTimeout(id); processInfoCheck(data); commonEvent.unsubscribe(subscriber, unSubscribeCallback) @@ -54,7 +54,7 @@ export default function abilityTest() { } commonEvent.createSubscriber(subscriberInfo_MainAbility).then(async (data) => { - console.debug("====>ACTS_startAbilityForResult_0100 Create Subscriber====>"); + console.debug("====>ACTS_startAbilityForResult_0800 Create Subscriber====>"); subscriber = data; commonEvent.subscribe(subscriber, subscribeCallBack); await globalThis.abilityContext.startAbilityForResult( @@ -65,7 +65,7 @@ export default function abilityTest() { windowMode: 0, displayId: 15 }).then(() => { - console.debug("====>ACTS_startAbilityForResult_0100 end====>"); + console.debug("====>ACTS_startAbilityForResult_0800 end====>"); }) }) @@ -75,29 +75,29 @@ export default function abilityTest() { function timeout() { expect().assertFail(); - console.log('ACTS_startAbilityForResult_0100 timeout'); + console.log('ACTS_startAbilityForResult_0800 timeout'); } id = setTimeout(timeout, START_ABILITY_TIMEOUT); - console.log('Start ACTS_startAbilityForResult_0100 timer id : ' + id); + console.log('Start ACTS_startAbilityForResult_0800 timer id : ' + id); }) /* - * @tc.number: ACTS_startAbilityForResult_0200 + * @tc.number: ACTS_startAbilityForResult_0900 * @tc.name: Get the specified displayId to start Ability * @tc.desc: Verify that the ability to startAbilityForResult when displayId is a string */ - it('ACTS_startAbilityForResult_0200', 0, async function (done) { - console.log('ACTS_startAbilityForResult_0200====ACTS_startAbilityForResult_0200 Subscribe CallBack data:====>" + JSON.stringify(data)); + console.debug("====>ACTS_startAbilityForResult_0900 Subscribe CallBack data:====>" + JSON.stringify(data)); async function processInfoCheck() { - console.info('====> ACTS_startAbilityForResult_0200=====>'); + console.info('====> ACTS_startAbilityForResult_0900=====>'); expect(data.parameters['displayId']).assertEqual(0); expect(data.parameters['windowMode']).assertEqual(0); commonEvent.unsubscribe(subscriber, unSubscribeCallback); @@ -105,14 +105,14 @@ export default function abilityTest() { } if (data.event == "ACTS_TerminateSelf_CommonEvent") { - console.info('====> ACTS_startAbilityForResult_0200 start success=====>'); + console.info('====> ACTS_startAbilityForResult_0900 start success=====>'); clearTimeout(id); processInfoCheck(); } } commonEvent.createSubscriber(subscriberInfo_MainAbility).then(async (data) => { - console.debug("====>ACTS_startAbilityForResult_0200 Create Subscriber====>"); + console.debug("====>ACTS_startAbilityForResult_0900 Create Subscriber====>"); subscriber = data; commonEvent.subscribe(subscriber, subscribeCallBack); await globalThis.abilityContext.startAbilityForResult( @@ -123,39 +123,39 @@ export default function abilityTest() { windowMode: 0, displayId: undefined }).then(() => { - console.debug("====>ACTS_startAbilityForResult_0200 end====>"); + console.debug("====>ACTS_startAbilityForResult_0900 end====>"); }).catch((err) => { expect().assertFail(); - console.debug("====>ACTS_startAbilityForResult_0200 err====>" + err); + console.debug("====>ACTS_startAbilityForResult_0900 err====>" + err); }) }) function unSubscribeCallback() { - console.debug("====>ACTS_startAbilityForResult_0200 UnSubscribe CallBack====>"); + console.debug("====>ACTS_startAbilityForResult_0900 UnSubscribe CallBack====>"); } function timeout() { expect().assertFail(); - console.log('ACTS_startAbilityForResult_0200 timeout'); + console.log('ACTS_startAbilityForResult_0900 timeout'); } id = setTimeout(timeout, START_ABILITY_TIMEOUT); - console.log('Start ACTS_startAbilityForResult_0200 timer id : ' + id); + console.log('Start ACTS_startAbilityForResult_0900 timer id : ' + id); }) /* - * @tc.number: ACTS_startAbilityForResult_0300 + * @tc.number: ACTS_startAbilityForResult_1000 * @tc.name: Get the specified displayId to start Ability * @tc.desc: Validation parameters want to filter the DISPLAY_ID of parameters */ - it('ACTS_startAbilityForResult_0300', 0, async function (done) { - console.log('ACTS_startAbilityForResult_0300====ACTS_startAbilityForResult_0300 Subscribe CallBack data:====>" + JSON.stringify(data)); + console.debug("====>ACTS_startAbilityForResult_1000 Subscribe CallBack data:====>" + JSON.stringify(data)); async function processInfoCheck(data) { console.info('====> ACTS_getDisplayIdTest_0600=====>'); @@ -165,7 +165,7 @@ export default function abilityTest() { } if (data.event == "ACTS_TerminateSelf_CommonEvent") { - console.info('====> ACTS_startAbilityForResult_0300 start success=====>'); + console.info('====> ACTS_startAbilityForResult_1000 start success=====>'); clearTimeout(id); processInfoCheck(data); commonEvent.unsubscribe(subscriber, unSubscribeCallback) @@ -173,7 +173,7 @@ export default function abilityTest() { } commonEvent.createSubscriber(subscriberInfo_MainAbility).then(async (data) => { - console.debug("====>ACTS_startAbilityForResult_0300 Create Subscriber====>"); + console.debug("====>ACTS_startAbilityForResult_1000 Create Subscriber====>"); subscriber = data; commonEvent.subscribe(subscriber, subscribeCallBack); await globalThis.abilityContext.startAbilityForResult( @@ -186,42 +186,42 @@ export default function abilityTest() { } }, { }).then(() => { - console.debug("====>ACTS_startAbilityForResult_0300 end====>"); + console.debug("====>ACTS_startAbilityForResult_1000 end====>"); }).catch((err) => { expect().assertFail(); - console.debug("====>ACTS_startAbilityForResult_0300 err====>" + err); + console.debug("====>ACTS_startAbilityForResult_1000 err====>" + err); }) }) function unSubscribeCallback() { - console.debug("====>ACTS_startAbilityForResult_0300 UnSubscribe CallBack====>"); + console.debug("====>ACTS_startAbilityForResult_1000 UnSubscribe CallBack====>"); } function timeout() { expect().assertFail(); - console.log('ACTS_startAbilityForResult_0300 timeout'); + console.log('ACTS_startAbilityForResult_1000 timeout'); } id = setTimeout(timeout, START_ABILITY_TIMEOUT); - console.log('Start ACTS_startAbilityForResult_0300 timer id : ' + id); + console.log('Start ACTS_startAbilityForResult_1000 timer id : ' + id); }) /* - * @tc.number: ACTS_startAbilityForResult_0400 + * @tc.number: ACTS_startAbilityForResult_1100 * @tc.name: Get the specified displayId to start Ability * @tc.desc: Verify the connection to the service application startup page to obtain the specified displayId */ - it('ACTS_startAbilityForResult_0400', 0, async function (done) { - console.log('ACTS_startAbilityForResult_0400====ACTS_startAbilityForResult_0400_Subscribe CallBack data:====>" + JSON.stringify(data)); + console.debug("====>ACTS_startAbilityForResult_1100_Subscribe CallBack data:====>" + JSON.stringify(data)); if (data.event == "ACTS_TerminateSelf_CommonEvent") { clearTimeout(id); expect(data.parameters['displayId']).assertEqual(10); @@ -232,7 +232,7 @@ export default function abilityTest() { } } commonEvent.createSubscriber(subscriberInfo_MainAbility).then(async (data) => { - console.debug("====>ACTS_startAbilityForResult_0400_Create Subscriber====>"); + console.debug("====>ACTS_startAbilityForResult_1100_Create Subscriber====>"); subscriber = data; await commonEvent.subscribe(subscriber, subscribeCallBack); connId = await globalThis.abilityContext.connectAbility( @@ -242,7 +242,7 @@ export default function abilityTest() { action: "getExtensionInfotwo" } ); - console.log('ACTS_startAbilityForResult_0400 ConnectAbility connId : ' + connId); + console.log('ACTS_startAbilityForResult_1100 ConnectAbility connId : ' + connId); }) function unSubscribeCallback() { @@ -253,7 +253,7 @@ export default function abilityTest() { done(); }, ); - console.debug("====>ACTS_startAbilityForResult_0400_UnSubscribe CallBack====>"); + console.debug("====>ACTS_startAbilityForResult_1100_UnSubscribe CallBack====>"); } function timeout() { @@ -265,7 +265,7 @@ export default function abilityTest() { done(); }, ); - console.debug('ACTS_startAbilityForResult_0400 timeout'); + console.debug('ACTS_startAbilityForResult_1100 timeout'); done(); } diff --git a/ability/ability_runtime/amsdisplayIdtest/actsamsstartabilityforresulttest/entry/src/main/module.json b/ability/ability_runtime/amsdisplayIdtest/actsamsstartabilityforresulttest/entry/src/main/module.json index 3d001509c..178f83b85 100644 --- a/ability/ability_runtime/amsdisplayIdtest/actsamsstartabilityforresulttest/entry/src/main/module.json +++ b/ability/ability_runtime/amsdisplayIdtest/actsamsstartabilityforresulttest/entry/src/main/module.json @@ -1,107 +1,107 @@ { - "module": { - "name": "phone", - "type": "entry", - "srcEntrance": "./ets/Application/AbilityStage.ts", - "description": "$string:phone_entry_dsc", - "mainElement": "MainAbility", - "deviceTypes": [ - "default", - "phone" - ], - "deliveryWithInstall": true, - "installationFree": false, - "uiSyntax": "ets", - "pages": "$profile:main_pages", - "abilities": [ - { - "name": "com.example.startabilityforresult.MainAbility", - "srcEntrance": "./ets/MainAbility/MainAbility.ts", - "description": "$string:phone_entry_main", - "icon": "$media:icon", - "label": "$string:entry_label", - "visible": true, - "orientation": "portrait", - "skills": [ - { - "actions": [ - "action.system.home" - ], - "entities":[ - "entity.system.home" - ] - } - ] - },{ - "name": "com.example.startabilityforresult.MainAbility2", - "srcEntrance": "./ets/MainAbility2/MainAbility2.ts", - "description": "$string:phone_entry_main", - "icon": "$media:icon", - "label": "$string:entry_label", - "visible": true, - "orientation": "portrait" - } - ], - "extensionAbilities": [ - { - "srcEntrance": "./ets/ServiceAbility/ServiceAbility.ts", - "name": "com.example.startabilityforresult.ServiceAbility", - "icon": "$media:icon", - "srcLanguage": "ets", - "description": "$string:phone_entry_main", - "type": "service", - "visible": true - } - ], - "requestPermissions": [ - { - "name": "ohos.permission.GET_BUNDLE_INFO_PRIVILEGED", - "reason": "need use ohos.permission.GET_BUNDLE_INFO_PRIVILEGED" - }, - { - "name": "ohos.permission.GET_BUNDLE_INFO", - "reason": "need use ohos.permission.GET_BUNDLE_INFO" - }, - { - "name": "ohos.permission.CHANGE_ABILITY_ENABLED_STATE", - "reason": "need use ohos.permission.CHANGE_ABILITY_ENABLED_STATE" - }, - { - "name": "ohos.permission.REMOVE_CACHE_FILES", - "reason": "need use ohos.permission.REMOVE_CACHE_FILES" - }, - { - "name": "ohos.permission.LISTEN_BUNDLE_CHANGE", - "reason": "need use ohos.permission.LISTEN_BUNDLE_CHANGE" - }, - { - "name": "ohos.permission.INSTALL_BUNDLE", - "reason": "need use ohos.permission.INSTALL_BUNDLE" - }, - { - "name": "ohos.permission.MANAGE_MISSIONS", - "reason": "need use ohos.permission.MANAGE_MISSIONS" - }, - { - "name": "ohos.permission.INTERACT_ACROSS_LOCAL_ACCOUNTS", - "reason": "need use ohos.permission.INTERACT_ACROSS_LOCAL_ACCOUNTS" - }, - { - "name": "ohos.permission.CLEAN_BACKGROUND_PROCESSES", - "reason": "need use ohos.permission.CLEAN_BACKGROUND_PROCESSES" - }, - { - "name": "ohos.permission.GET_RUNNING_INFO", - "reason": "need use ohos.permission.GET_RUNNING_INFO" - }, - { - "name":"ohos.permission.START_ABILITIES_FROM_BACKGROUND", - "reason":"need use ohos.permission.START_ABILITIES_FROM_BACKGROUND" - }, + "module": { + "name": "phone", + "type": "entry", + "srcEntrance": "./ets/Application/AbilityStage.ts", + "description": "$string:phone_entry_dsc", + "mainElement": "MainAbility", + "deviceTypes": [ + "default" + ], + "deliveryWithInstall": true, + "installationFree": false, + "uiSyntax": "ets", + "pages": "$profile:main_pages", + "abilities": [ + { + "name": "com.example.startabilityforresult.MainAbility", + "srcEntrance": "./ets/MainAbility/MainAbility.ts", + "description": "$string:phone_entry_main", + "icon": "$media:icon", + "label": "$string:entry_label", + "visible": true, + "orientation": "portrait", + "skills": [ { - "name":"ohos.permission.START_INVISIBLE_ABILITY", - "reason":"need use ohos.permission.START_INVISIBLE_ABILITY" + "actions": [ + "action.system.home" + ], + "entities": [ + "entity.system.home" + ] } ] - } -} + }, + { + "name": "com.example.startabilityforresult.MainAbility2", + "srcEntrance": "./ets/MainAbility2/MainAbility2.ts", + "description": "$string:phone_entry_main", + "icon": "$media:icon", + "label": "$string:entry_label", + "visible": true, + "orientation": "portrait" + } + ], + "extensionAbilities": [ + { + "srcEntrance": "./ets/ServiceAbility/ServiceAbility.ts", + "name": "com.example.startabilityforresult.ServiceAbility", + "icon": "$media:icon", + "srcLanguage": "ets", + "description": "$string:phone_entry_main", + "type": "service", + "visible": true + } + ], + "requestPermissions": [ + { + "name": "ohos.permission.GET_BUNDLE_INFO_PRIVILEGED", + "reason": "need use ohos.permission.GET_BUNDLE_INFO_PRIVILEGED" + }, + { + "name": "ohos.permission.GET_BUNDLE_INFO", + "reason": "need use ohos.permission.GET_BUNDLE_INFO" + }, + { + "name": "ohos.permission.CHANGE_ABILITY_ENABLED_STATE", + "reason": "need use ohos.permission.CHANGE_ABILITY_ENABLED_STATE" + }, + { + "name": "ohos.permission.REMOVE_CACHE_FILES", + "reason": "need use ohos.permission.REMOVE_CACHE_FILES" + }, + { + "name": "ohos.permission.LISTEN_BUNDLE_CHANGE", + "reason": "need use ohos.permission.LISTEN_BUNDLE_CHANGE" + }, + { + "name": "ohos.permission.INSTALL_BUNDLE", + "reason": "need use ohos.permission.INSTALL_BUNDLE" + }, + { + "name": "ohos.permission.MANAGE_MISSIONS", + "reason": "need use ohos.permission.MANAGE_MISSIONS" + }, + { + "name": "ohos.permission.INTERACT_ACROSS_LOCAL_ACCOUNTS", + "reason": "need use ohos.permission.INTERACT_ACROSS_LOCAL_ACCOUNTS" + }, + { + "name": "ohos.permission.CLEAN_BACKGROUND_PROCESSES", + "reason": "need use ohos.permission.CLEAN_BACKGROUND_PROCESSES" + }, + { + "name": "ohos.permission.GET_RUNNING_INFO", + "reason": "need use ohos.permission.GET_RUNNING_INFO" + }, + { + "name": "ohos.permission.START_ABILITIES_FROM_BACKGROUND", + "reason": "need use ohos.permission.START_ABILITIES_FROM_BACKGROUND" + }, + { + "name": "ohos.permission.START_INVISIBLE_ABILITY", + "reason": "need use ohos.permission.START_INVISIBLE_ABILITY" + } + ] + } +} \ No newline at end of file diff --git a/ability/ability_runtime/amsdisplayIdtest/actsamsstartabilitytest/entry/src/main/ets/test/Ability.test.ets b/ability/ability_runtime/amsdisplayIdtest/actsamsstartabilitytest/entry/src/main/ets/test/Ability.test.ets index 7540e051a..f350b7c8c 100644 --- a/ability/ability_runtime/amsdisplayIdtest/actsamsstartabilitytest/entry/src/main/ets/test/Ability.test.ets +++ b/ability/ability_runtime/amsdisplayIdtest/actsamsstartabilitytest/entry/src/main/ets/test/Ability.test.ets @@ -93,32 +93,32 @@ export default function abilityTest(abilityContext) { /* - * @tc.number: ACTS_StartAbility_0100 + * @tc.number: ACTS_StartAbility_2100 * @tc.name: Get the specified displayId to start Ability * @tc.desc: Verify Get displayId to start Ability */ - it('ACTS_StartAbility_0100', 0, async function (done) { - console.log('ACTS_StartAbility_0100====ACTS_StartAbility_0100 Subscribe CallBack data:====>" + JSON.stringify(data)); + console.debug("====>ACTS_StartAbility_2100 Subscribe CallBack data:====>" + JSON.stringify(data)); async function processInfoCheck(data) { - console.info('====> ACTS_StartAbility_0100=====>'); + console.info('====> ACTS_StartAbility_2100=====>'); expect(data.parameters['displayId']).assertEqual(15); expect(data.parameters['windowMode']).assertEqual(0); done(); } if (data.event == "MultiInstanceStartFinish") { - console.info('====> ACTS_StartAbility_0100 start success=====>'); + console.info('====> ACTS_StartAbility_2100 start success=====>'); clearTimeout(id); processInfoCheck(data); commonEvent.unsubscribe(subscriber, unSubscribeCallback) } else if (data.event == "MultiInstanceStartNext") { - console.log('ACTS_StartAbility_0100 callBackSeq = ' + data.data); + console.log('ACTS_StartAbility_2100 callBackSeq = ' + data.data); } } @@ -134,11 +134,11 @@ export default function abilityTest(abilityContext) { function timeout() { expect().assertFail(); - console.log('ACTS_StartAbility_0100 timeout'); + console.log('ACTS_StartAbility_2100 timeout'); } id = setTimeout(timeout, START_ABILITY_TIMEOUT); - console.log('Start ACTS_StartAbility_0100 timer id : ' + id); + console.log('Start ACTS_StartAbility_2100 timer id : ' + id); startAbilityProcess(abilityContext, { windowMode: 0, @@ -152,32 +152,32 @@ export default function abilityTest(abilityContext) { }) /* - * @tc.number: ACTS_StartAbility_0200 + * @tc.number: ACTS_StartAbility_2300 * @tc.name: Get the specified displayId to start Ability * @tc.desc: Verify that the ability to start when displayId is a string */ - it('ACTS_StartAbility_0200', 0, async function (done) { - console.log('ACTS_StartAbility_0200====ACTS_StartAbility_0200 Subscribe CallBack data:====>" + JSON.stringify(data)); + console.debug("====>ACTS_StartAbility_2300 Subscribe CallBack data:====>" + JSON.stringify(data)); async function processInfoCheck(data) { - console.info('====> ACTS_StartAbility_0200=====>'); + console.info('====> ACTS_StartAbility_2300=====>'); expect(data.parameters['displayId']).assertEqual(0); expect(data.parameters['windowMode']).assertEqual(0); done(); } if (data.event == "MultiInstanceStartFinish") { - console.info('====> ACTS_StartAbility_0200 start success=====>'); + console.info('====> ACTS_StartAbility_2300 start success=====>'); clearTimeout(id); processInfoCheck(data); commonEvent.unsubscribe(subscriber, unSubscribeCallback) } else if (data.event == "MultiInstanceStartNext") { - console.log('ACTS_StartAbility_0200 callBackSeq = ' + data.data); + console.log('ACTS_StartAbility_2300 callBackSeq = ' + data.data); } } @@ -193,11 +193,11 @@ export default function abilityTest(abilityContext) { function timeout() { expect().assertFail(); - console.log('ACTS_StartAbility_0200 timeout'); + console.log('ACTS_StartAbility_2300 timeout'); } id = setTimeout(timeout, START_ABILITY_TIMEOUT); - console.log('Start ACTS_StartAbility_0200 timer id : ' + id); + console.log('Start ACTS_StartAbility_2300 timer id : ' + id); startAbilityProcess(abilityContext, { windowMode: 0, @@ -211,32 +211,32 @@ export default function abilityTest(abilityContext) { }) /* - * @tc.number: ACTS_StartAbility_0300 + * @tc.number: ACTS_StartAbility_2500 * @tc.name: Get the specified displayId to start Ability * @tc.desc: Verify that the ability to start when the displayId is undefined */ - it('ACTS_StartAbility_0300', 0, async function (done) { - console.log('ACTS_StartAbility_0300====ACTS_StartAbility_0300 Subscribe CallBack data:====>" + JSON.stringify(data)); + console.debug("====>ACTS_StartAbility_2500 Subscribe CallBack data:====>" + JSON.stringify(data)); async function processInfoCheck(data) { - console.info('====> ACTS_StartAbility_0300=====>'); + console.info('====> ACTS_StartAbility_2500=====>'); expect(data.parameters['displayId']).assertEqual(0); expect(data.parameters['windowMode']).assertEqual(0); done(); } if (data.event == "MultiInstanceStartFinish") { - console.info('====> ACTS_StartAbility_0300 start success=====>'); + console.info('====> ACTS_StartAbility_2500 start success=====>'); clearTimeout(id); processInfoCheck(data); commonEvent.unsubscribe(subscriber, unSubscribeCallback) } else if (data.event == "MultiInstanceStartNext") { - console.log('ACTS_StartAbility_0300 callBackSeq = ' + data.data); + console.log('ACTS_StartAbility_2500 callBackSeq = ' + data.data); } } @@ -252,11 +252,11 @@ export default function abilityTest(abilityContext) { function timeout() { expect().assertFail(); - console.log('ACTS_StartAbility_0300 timeout'); + console.log('ACTS_StartAbility_2500 timeout'); } id = setTimeout(timeout, START_ABILITY_TIMEOUT); - console.log('Start ACTS_StartAbility_0300 timer id : ' + id); + console.log('Start ACTS_StartAbility_2500 timer id : ' + id); startAbilityProcess(abilityContext, { windowMode: 0, @@ -270,32 +270,32 @@ export default function abilityTest(abilityContext) { }) /* - * @tc.number: ACTS_StartAbility_0400 + * @tc.number: ACTS_StartAbility_2700 * @tc.name: Get the specified displayId to start Ability * @tc.desc: Validation parameters want to filter the DISPLAY_ID of parameters */ - it('ACTS_StartAbility_0400', 0, async function (done) { - console.log('ACTS_StartAbility_0400====ACTS_StartAbility_0400 Subscribe CallBack data:====>" + JSON.stringify(data)); + console.debug("====>ACTS_StartAbility_2700 Subscribe CallBack data:====>" + JSON.stringify(data)); async function processInfoCheck(data) { - console.info('====> ACTS_StartAbility_0400=====>'); + console.info('====> ACTS_StartAbility_2700=====>'); expect(data.parameters['windowMode']).assertEqual(0); expect(data.parameters['displayId']).assertEqual(0); done(); } if (data.event == "MultiInstanceStartFinish") { - console.info('====> ACTS_StartAbility_0400 start success=====>'); + console.info('====> ACTS_StartAbility_2700 start success=====>'); clearTimeout(id); processInfoCheck(data); commonEvent.unsubscribe(subscriber, unSubscribeCallback) } else if (data.event == "MultiInstanceStartNext") { - console.log('ACTS_StartAbility_0400 callBackSeq = ' + data.data); + console.log('ACTS_StartAbility_2700 callBackSeq = ' + data.data); } } @@ -311,11 +311,11 @@ export default function abilityTest(abilityContext) { function timeout() { expect().assertFail(); - console.log('ACTS_StartAbility_0400 timeout'); + console.log('ACTS_StartAbility_2700 timeout'); } id = setTimeout(timeout, START_ABILITY_TIMEOUT); - console.log('Start ACTS_StartAbility_0400 timer id : ' + id); + console.log('Start ACTS_StartAbility_2700 timer id : ' + id); startAbilityProcess(abilityContext, {}, { startId: 0, diff --git a/ability/ability_runtime/amsdisplayIdtest/actsamsstartabilitytest/entry/src/main/module.json b/ability/ability_runtime/amsdisplayIdtest/actsamsstartabilitytest/entry/src/main/module.json index 74bec329e..10544038c 100644 --- a/ability/ability_runtime/amsdisplayIdtest/actsamsstartabilitytest/entry/src/main/module.json +++ b/ability/ability_runtime/amsdisplayIdtest/actsamsstartabilitytest/entry/src/main/module.json @@ -6,8 +6,7 @@ "description": "$string:phone_entry_dsc", "mainElement": "MainAbility", "deviceTypes": [ - "default", - "phone" + "default" ], "deliveryWithInstall": true, "installationFree": false, diff --git a/ability/ability_runtime/amsgetabilityprocessinfo/actsgetabilityprocessinfotest/src/main/config.json b/ability/ability_runtime/amsgetabilityprocessinfo/actsgetabilityprocessinfotest/src/main/config.json index 3c1ef301a..2e086ab4a 100644 --- a/ability/ability_runtime/amsgetabilityprocessinfo/actsgetabilityprocessinfotest/src/main/config.json +++ b/ability/ability_runtime/amsgetabilityprocessinfo/actsgetabilityprocessinfotest/src/main/config.json @@ -17,8 +17,7 @@ "package": "com.example.abilityrunninginfostest", "name": ".entry", "deviceType": [ - "default", - "phone" + "default" ], "distro": { "deliveryWithInstall": true, @@ -138,4 +137,4 @@ "mainAbility": ".MainAbility", "srcPath": "" } -} +} diff --git a/ability/ability_runtime/apicover/apicoverhaptest/entry/src/main/module.json b/ability/ability_runtime/apicover/apicoverhaptest/entry/src/main/module.json index 98ba6b8eb..818876697 100644 --- a/ability/ability_runtime/apicover/apicoverhaptest/entry/src/main/module.json +++ b/ability/ability_runtime/apicover/apicoverhaptest/entry/src/main/module.json @@ -6,8 +6,7 @@ "description": "$string:phone_entry_dsc", "mainElement": "MainAbility", "deviceTypes": [ - "default", - "phone" + "default" ], "deliveryWithInstall": true, "installationFree": false, diff --git a/ability/ability_runtime/apicover/fasupplement/entry/src/main/config.json b/ability/ability_runtime/apicover/fasupplement/entry/src/main/config.json index 33a1c2ad6..add9ed425 100644 --- a/ability/ability_runtime/apicover/fasupplement/entry/src/main/config.json +++ b/ability/ability_runtime/apicover/fasupplement/entry/src/main/config.json @@ -15,8 +15,7 @@ "module": { "mainAbility": ".MainAbility", "deviceType": [ - "default", - "phone" + "default" ], "abilities": [ { diff --git a/ability/ability_runtime/apicover/formmodule/entry/src/main/module.json b/ability/ability_runtime/apicover/formmodule/entry/src/main/module.json index 71ed0df91..a232bdff7 100644 --- a/ability/ability_runtime/apicover/formmodule/entry/src/main/module.json +++ b/ability/ability_runtime/apicover/formmodule/entry/src/main/module.json @@ -6,8 +6,7 @@ "description": "$string:module1_desc", "mainElement": "ModuleAbility", "deviceTypes": [ - "default", - "phone" + "default" ], "deliveryWithInstall": true, "installationFree": false, diff --git a/ability/ability_runtime/apicover/stagesupplement/entry/src/main/module.json b/ability/ability_runtime/apicover/stagesupplement/entry/src/main/module.json index a73bebfec..a549d200a 100644 --- a/ability/ability_runtime/apicover/stagesupplement/entry/src/main/module.json +++ b/ability/ability_runtime/apicover/stagesupplement/entry/src/main/module.json @@ -6,8 +6,7 @@ "description": "$string:entry_desc", "mainElement": "MainAbility", "deviceTypes": [ - "default", - "phone" + "default" ], "deliveryWithInstall": true, "installationFree": false, diff --git a/ability/ability_runtime/apitest/entry/src/main/module.json b/ability/ability_runtime/apitest/entry/src/main/module.json index 60910719a..9d7df297d 100644 --- a/ability/ability_runtime/apitest/entry/src/main/module.json +++ b/ability/ability_runtime/apitest/entry/src/main/module.json @@ -6,8 +6,7 @@ "description": "$string:entry_desc", "mainElement": "MainAbility", "deviceTypes": [ - "default", - "phone" + "default" ], "deliveryWithInstall": true, "installationFree": false, diff --git a/ability/ability_runtime/context/actscontexttest/src/main/config.json b/ability/ability_runtime/context/actscontexttest/src/main/config.json index 8fbe3749c..9c3abbeda 100644 --- a/ability/ability_runtime/context/actscontexttest/src/main/config.json +++ b/ability/ability_runtime/context/actscontexttest/src/main/config.json @@ -17,8 +17,7 @@ "package": "com.example.actscontext", "name": ".entry", "deviceType": [ - "default", - "phone" + "default" ], "reqPermissions": [ { diff --git a/ability/ability_runtime/context/actscreatemodulecontextassist/entry/src/main/module.json b/ability/ability_runtime/context/actscreatemodulecontextassist/entry/src/main/module.json index bf0479375..061b93324 100644 --- a/ability/ability_runtime/context/actscreatemodulecontextassist/entry/src/main/module.json +++ b/ability/ability_runtime/context/actscreatemodulecontextassist/entry/src/main/module.json @@ -7,7 +7,6 @@ "mainElement": "MainAbility", "deviceTypes": [ "default", - "phone", "tablet" ], "deliveryWithInstall": true, diff --git a/ability/ability_runtime/context/actscreatemodulecontextassistone/entry/src/main/module.json b/ability/ability_runtime/context/actscreatemodulecontextassistone/entry/src/main/module.json index 4cf1d5c23..e5642d1ef 100644 --- a/ability/ability_runtime/context/actscreatemodulecontextassistone/entry/src/main/module.json +++ b/ability/ability_runtime/context/actscreatemodulecontextassistone/entry/src/main/module.json @@ -7,7 +7,6 @@ "mainElement": "MainAbility", "deviceTypes": [ "default", - "phone", "tablet" ], "deliveryWithInstall": true, diff --git a/ability/ability_runtime/context/actscreatemodulecontexttest/entry/src/main/module.json b/ability/ability_runtime/context/actscreatemodulecontexttest/entry/src/main/module.json index 95e1457d4..38120a8e1 100644 --- a/ability/ability_runtime/context/actscreatemodulecontexttest/entry/src/main/module.json +++ b/ability/ability_runtime/context/actscreatemodulecontexttest/entry/src/main/module.json @@ -7,7 +7,6 @@ "mainElement": "MainAbility", "deviceTypes": [ "default", - "phone", "tablet" ], "deliveryWithInstall": true, diff --git a/ability/ability_runtime/context/scene/defpermission/src/main/config.json b/ability/ability_runtime/context/scene/defpermission/src/main/config.json index 39b19be80..f6d3a6ae6 100644 --- a/ability/ability_runtime/context/scene/defpermission/src/main/config.json +++ b/ability/ability_runtime/context/scene/defpermission/src/main/config.json @@ -29,8 +29,7 @@ } ], "deviceType": [ - "default", - "phone" + "default" ], "distro": { "deliveryWithInstall": true, diff --git a/ability/ability_runtime/fa/faapplicationinfo/src/main/config.json b/ability/ability_runtime/fa/faapplicationinfo/src/main/config.json index 9e2475886..fdbdc0e8c 100644 --- a/ability/ability_runtime/fa/faapplicationinfo/src/main/config.json +++ b/ability/ability_runtime/fa/faapplicationinfo/src/main/config.json @@ -19,8 +19,7 @@ "mainAbility": ".MainAbility", "srcPath":"", "deviceType": [ - "default", - "phone" + "default" ], "distro": { "deliveryWithInstall": true, diff --git a/ability/ability_runtime/fa/faconfigurationconstant/src/main/config.json b/ability/ability_runtime/fa/faconfigurationconstant/src/main/config.json index 8e835a50d..89e3baeed 100644 --- a/ability/ability_runtime/fa/faconfigurationconstant/src/main/config.json +++ b/ability/ability_runtime/fa/faconfigurationconstant/src/main/config.json @@ -19,8 +19,7 @@ "mainAbility": ".MainAbility", "srcPath":"", "deviceType": [ - "default", - "phone" + "default" ], "distro": { "deliveryWithInstall": true, diff --git a/ability/ability_runtime/fa/facoverapi/src/main/config.json b/ability/ability_runtime/fa/facoverapi/src/main/config.json index ec09e45c5..b29ac689a 100644 --- a/ability/ability_runtime/fa/facoverapi/src/main/config.json +++ b/ability/ability_runtime/fa/facoverapi/src/main/config.json @@ -17,8 +17,7 @@ "package": "com.example.coverapi", "name": ".entry", "deviceType": [ - "default", - "phone" + "default" ], "distro": { "deliveryWithInstall": true, diff --git a/ability/ability_runtime/fa/faequeryabilitybywant/src/main/config.json b/ability/ability_runtime/fa/faequeryabilitybywant/src/main/config.json index 86d4a969a..c11e9aea3 100644 --- a/ability/ability_runtime/fa/faequeryabilitybywant/src/main/config.json +++ b/ability/ability_runtime/fa/faequeryabilitybywant/src/main/config.json @@ -19,8 +19,7 @@ "mainAbility": ".MainAbility", "srcPath":"", "deviceType": [ - "default", - "phone" + "default" ], "distro": { "deliveryWithInstall": true, diff --git a/ability/ability_runtime/faapicover/faapicoverhaptest/entry/src/main/config.json b/ability/ability_runtime/faapicover/faapicoverhaptest/entry/src/main/config.json index 46f6b4278..378a138d5 100644 --- a/ability/ability_runtime/faapicover/faapicoverhaptest/entry/src/main/config.json +++ b/ability/ability_runtime/faapicover/faapicoverhaptest/entry/src/main/config.json @@ -15,7 +15,6 @@ "module": { "mainAbility": ".MainAbility", "deviceType": [ - "default", "default", "tablet" ], diff --git a/ability/ability_runtime/faapicover/faauxiliary/entry/src/main/config.json b/ability/ability_runtime/faapicover/faauxiliary/entry/src/main/config.json index 793985417..ee0129cff 100644 --- a/ability/ability_runtime/faapicover/faauxiliary/entry/src/main/config.json +++ b/ability/ability_runtime/faapicover/faauxiliary/entry/src/main/config.json @@ -15,7 +15,6 @@ "module": { "mainAbility": ".MainAbility", "deviceType": [ - "default", "default", "tablet" ], diff --git a/ability/ability_runtime/featureability/actsfeatureabilitytest/entry/src/main/config.json b/ability/ability_runtime/featureability/actsfeatureabilitytest/entry/src/main/config.json index f90fa76aa..7855c62d8 100644 --- a/ability/ability_runtime/featureability/actsfeatureabilitytest/entry/src/main/config.json +++ b/ability/ability_runtime/featureability/actsfeatureabilitytest/entry/src/main/config.json @@ -22,7 +22,6 @@ "name": ".MyApplication", "mainAbility": "com.example.actsfeatureabilitytest.MainAbility", "deviceType": [ - "default", "default" ], "distro": { diff --git a/ability/ability_runtime/featureability/sceneproject/finishwithresultemptytest/src/main/config.json b/ability/ability_runtime/featureability/sceneproject/finishwithresultemptytest/src/main/config.json index ff10f1ef5..c07068a52 100644 --- a/ability/ability_runtime/featureability/sceneproject/finishwithresultemptytest/src/main/config.json +++ b/ability/ability_runtime/featureability/sceneproject/finishwithresultemptytest/src/main/config.json @@ -17,8 +17,7 @@ "package": "com.example.finishwithresultemptytest", "name": ".MyApplication", "deviceType": [ - "default", - "phone" + "default" ], "distro": { "deliveryWithInstall": true, diff --git a/ability/ability_runtime/featureability/sceneproject/finishwithresultpromiseparameterstest/src/main/config.json b/ability/ability_runtime/featureability/sceneproject/finishwithresultpromiseparameterstest/src/main/config.json index fcaed56ed..ec4a1a646 100644 --- a/ability/ability_runtime/featureability/sceneproject/finishwithresultpromiseparameterstest/src/main/config.json +++ b/ability/ability_runtime/featureability/sceneproject/finishwithresultpromiseparameterstest/src/main/config.json @@ -17,8 +17,7 @@ "package": "com.example.finishwithresultpromiseparameterstest", "name": ".MyApplication", "deviceType": [ - "default", - "phone" + "default" ], "distro": { "deliveryWithInstall": true, diff --git a/ability/ability_runtime/featureability/sceneproject/finishwithresulttest/src/main/config.json b/ability/ability_runtime/featureability/sceneproject/finishwithresulttest/src/main/config.json index 8ade1e80b..63f2c740b 100644 --- a/ability/ability_runtime/featureability/sceneproject/finishwithresulttest/src/main/config.json +++ b/ability/ability_runtime/featureability/sceneproject/finishwithresulttest/src/main/config.json @@ -17,8 +17,7 @@ "package": "com.example.finishwithresulttest", "name": ".MyApplication", "deviceType": [ - "default", - "phone" + "default" ], "distro": { "deliveryWithInstall": true, diff --git a/ability/ability_runtime/featureability/sceneproject/getcallingbundletest/src/main/config.json b/ability/ability_runtime/featureability/sceneproject/getcallingbundletest/src/main/config.json index d72c688f6..903c26eb6 100644 --- a/ability/ability_runtime/featureability/sceneproject/getcallingbundletest/src/main/config.json +++ b/ability/ability_runtime/featureability/sceneproject/getcallingbundletest/src/main/config.json @@ -17,8 +17,7 @@ "package": "com.example.getcallingbundlepromisetest", "name": ".MyApplication", "deviceType": [ - "default", - "phone" + "default" ], "distro": { "deliveryWithInstall": true, diff --git a/ability/ability_runtime/featureability/sceneproject/startability/src/main/config.json b/ability/ability_runtime/featureability/sceneproject/startability/src/main/config.json index 3fd7272e1..370b65c79 100644 --- a/ability/ability_runtime/featureability/sceneproject/startability/src/main/config.json +++ b/ability/ability_runtime/featureability/sceneproject/startability/src/main/config.json @@ -17,8 +17,7 @@ "package": "com.example.startability", "name": ".MyApplication", "deviceType": [ - "default", - "phone" + "default" ], "distro": { "deliveryWithInstall": true, diff --git a/ability/ability_runtime/featureability/sceneproject/startabilityforresult/src/main/config.json b/ability/ability_runtime/featureability/sceneproject/startabilityforresult/src/main/config.json index 6ae9094cd..743cbed82 100644 --- a/ability/ability_runtime/featureability/sceneproject/startabilityforresult/src/main/config.json +++ b/ability/ability_runtime/featureability/sceneproject/startabilityforresult/src/main/config.json @@ -17,8 +17,7 @@ "package": "com.example.startabilityforresult", "name": ".MyApplication", "deviceType": [ - "default", - "phone" + "default" ], "distro": { "deliveryWithInstall": true, diff --git a/ability/ability_runtime/featureability/sceneproject/terminateabilitytest/src/main/config.json b/ability/ability_runtime/featureability/sceneproject/terminateabilitytest/src/main/config.json index d542b37ff..3ceb3b97d 100644 --- a/ability/ability_runtime/featureability/sceneproject/terminateabilitytest/src/main/config.json +++ b/ability/ability_runtime/featureability/sceneproject/terminateabilitytest/src/main/config.json @@ -17,8 +17,7 @@ "package": "com.example.terminateabilitytest", "name": ".MyApplication", "deviceType": [ - "default", - "phone" + "default" ], "distro": { "deliveryWithInstall": true, diff --git a/ability/ability_runtime/formmanager/fa/formhostst_ets/formsystemhost/entry/src/main/config.json b/ability/ability_runtime/formmanager/fa/formhostst_ets/formsystemhost/entry/src/main/config.json index d7622a4ab..973ecd40d 100644 --- a/ability/ability_runtime/formmanager/fa/formhostst_ets/formsystemhost/entry/src/main/config.json +++ b/ability/ability_runtime/formmanager/fa/formhostst_ets/formsystemhost/entry/src/main/config.json @@ -18,8 +18,7 @@ "name": ".FormStHostApp", "mainAbility": ".MainAbility", "deviceType": [ - "default", - "phone" + "default" ], "distro": { "deliveryWithInstall": true, diff --git a/ability/ability_runtime/formmanager/fa/formhostst_ets/formsystemhostb/entry/src/main/config.json b/ability/ability_runtime/formmanager/fa/formhostst_ets/formsystemhostb/entry/src/main/config.json index ed27d691e..b71dc3859 100644 --- a/ability/ability_runtime/formmanager/fa/formhostst_ets/formsystemhostb/entry/src/main/config.json +++ b/ability/ability_runtime/formmanager/fa/formhostst_ets/formsystemhostb/entry/src/main/config.json @@ -18,8 +18,7 @@ "name": ".FormStHostAppB", "mainAbility": ".MainAbility", "deviceType": [ - "default", - "phone" + "default" ], "distro": { "deliveryWithInstall": true, diff --git a/ability/ability_runtime/formmanager/fa/formhostst_ets/formsystemhostc/entry/src/main/config.json b/ability/ability_runtime/formmanager/fa/formhostst_ets/formsystemhostc/entry/src/main/config.json index 0c1e0afe3..3be4bd52c 100644 --- a/ability/ability_runtime/formmanager/fa/formhostst_ets/formsystemhostc/entry/src/main/config.json +++ b/ability/ability_runtime/formmanager/fa/formhostst_ets/formsystemhostc/entry/src/main/config.json @@ -18,8 +18,7 @@ "name": ".FormStHostAppC", "mainAbility": ".MainAbility", "deviceType": [ - "default", - "phone" + "default" ], "distro": { "deliveryWithInstall": true, diff --git a/ability/ability_runtime/formmanager/fa/formhostst_ets/formsystemhostd/entry/src/main/config.json b/ability/ability_runtime/formmanager/fa/formhostst_ets/formsystemhostd/entry/src/main/config.json index 2acd7863a..84b8216fb 100644 --- a/ability/ability_runtime/formmanager/fa/formhostst_ets/formsystemhostd/entry/src/main/config.json +++ b/ability/ability_runtime/formmanager/fa/formhostst_ets/formsystemhostd/entry/src/main/config.json @@ -18,8 +18,7 @@ "name": ".FormStHostAppD", "mainAbility": ".MainAbility", "deviceType": [ - "default", - "phone" + "default" ], "distro": { "deliveryWithInstall": true, diff --git a/ability/ability_runtime/formmanager/fa/formhostst_ets/formsystemhoste/entry/src/main/config.json b/ability/ability_runtime/formmanager/fa/formhostst_ets/formsystemhoste/entry/src/main/config.json index 112c1d49b..7202578aa 100644 --- a/ability/ability_runtime/formmanager/fa/formhostst_ets/formsystemhoste/entry/src/main/config.json +++ b/ability/ability_runtime/formmanager/fa/formhostst_ets/formsystemhoste/entry/src/main/config.json @@ -18,8 +18,7 @@ "name": ".FormStHostAppE", "mainAbility": ".MainAbility", "deviceType": [ - "default", - "phone" + "default" ], "distro": { "deliveryWithInstall": true, diff --git a/ability/ability_runtime/formmanager/fa/formhostst_ets/formsystemhostf/entry/src/main/config.json b/ability/ability_runtime/formmanager/fa/formhostst_ets/formsystemhostf/entry/src/main/config.json index 2ac6615f0..4c3b111b0 100644 --- a/ability/ability_runtime/formmanager/fa/formhostst_ets/formsystemhostf/entry/src/main/config.json +++ b/ability/ability_runtime/formmanager/fa/formhostst_ets/formsystemhostf/entry/src/main/config.json @@ -18,8 +18,7 @@ "name": ".FormStHostAppF", "mainAbility": ".MainAbility", "deviceType": [ - "default", - "phone" + "default" ], "distro": { "deliveryWithInstall": true, diff --git a/ability/ability_runtime/formmanager/fa/formhostst_ets/formsystemhostg/entry/src/main/config.json b/ability/ability_runtime/formmanager/fa/formhostst_ets/formsystemhostg/entry/src/main/config.json index 075b857bc..0a861304b 100644 --- a/ability/ability_runtime/formmanager/fa/formhostst_ets/formsystemhostg/entry/src/main/config.json +++ b/ability/ability_runtime/formmanager/fa/formhostst_ets/formsystemhostg/entry/src/main/config.json @@ -18,8 +18,7 @@ "name": ".FormStHostAppG", "mainAbility": ".MainAbility", "deviceType": [ - "default", - "phone" + "default" ], "distro": { "deliveryWithInstall": true, diff --git a/ability/ability_runtime/formmanager/fa/formhostst_ets/formsystemhosti/entry/src/main/config.json b/ability/ability_runtime/formmanager/fa/formhostst_ets/formsystemhosti/entry/src/main/config.json index fb7f83992..dfd5a6cec 100644 --- a/ability/ability_runtime/formmanager/fa/formhostst_ets/formsystemhosti/entry/src/main/config.json +++ b/ability/ability_runtime/formmanager/fa/formhostst_ets/formsystemhosti/entry/src/main/config.json @@ -18,8 +18,7 @@ "name": ".FormStHostAppI", "mainAbility": ".MainAbility", "deviceType": [ - "default", - "phone" + "default" ], "distro": { "deliveryWithInstall": true, diff --git a/ability/ability_runtime/formmanager/fa/formhostst_ets/formsystemhostj/entry/src/main/config.json b/ability/ability_runtime/formmanager/fa/formhostst_ets/formsystemhostj/entry/src/main/config.json index 945f15352..c455593e1 100644 --- a/ability/ability_runtime/formmanager/fa/formhostst_ets/formsystemhostj/entry/src/main/config.json +++ b/ability/ability_runtime/formmanager/fa/formhostst_ets/formsystemhostj/entry/src/main/config.json @@ -18,8 +18,7 @@ "name": ".FormStHostApp", "mainAbility": ".MainAbility", "deviceType": [ - "default", - "phone" + "default" ], "distro": { "deliveryWithInstall": true, diff --git a/ability/ability_runtime/formmanager/fa/formhostst_ets/formsystemhostk/entry/src/main/config.json b/ability/ability_runtime/formmanager/fa/formhostst_ets/formsystemhostk/entry/src/main/config.json index b8a4957ba..97492d50d 100644 --- a/ability/ability_runtime/formmanager/fa/formhostst_ets/formsystemhostk/entry/src/main/config.json +++ b/ability/ability_runtime/formmanager/fa/formhostst_ets/formsystemhostk/entry/src/main/config.json @@ -18,8 +18,7 @@ "name": ".FormStHostAppK", "mainAbility": ".MainAbility", "deviceType": [ - "default", - "phone" + "default" ], "distro": { "deliveryWithInstall": true, diff --git a/ability/ability_runtime/formmanager/fa/formhostst_ets/formsystemhostl/entry/src/main/config.json b/ability/ability_runtime/formmanager/fa/formhostst_ets/formsystemhostl/entry/src/main/config.json index 11155c1bd..ccc69822b 100644 --- a/ability/ability_runtime/formmanager/fa/formhostst_ets/formsystemhostl/entry/src/main/config.json +++ b/ability/ability_runtime/formmanager/fa/formhostst_ets/formsystemhostl/entry/src/main/config.json @@ -18,8 +18,7 @@ "name": ".FormStHostAppL", "mainAbility": ".MainAbility", "deviceType": [ - "default", - "phone" + "default" ], "distro": { "deliveryWithInstall": true, diff --git a/ability/ability_runtime/formmanager/fa/formhostst_ets/formsystemhostn/entry/src/main/config.json b/ability/ability_runtime/formmanager/fa/formhostst_ets/formsystemhostn/entry/src/main/config.json index 530cf66d8..a6559bb00 100644 --- a/ability/ability_runtime/formmanager/fa/formhostst_ets/formsystemhostn/entry/src/main/config.json +++ b/ability/ability_runtime/formmanager/fa/formhostst_ets/formsystemhostn/entry/src/main/config.json @@ -18,8 +18,7 @@ "name": ".FormStHostAppN", "mainAbility": ".MainAbility", "deviceType": [ - "default", - "phone" + "default" ], "distro": { "deliveryWithInstall": true, diff --git a/ability/ability_runtime/formmanager/fa/formhostst_ets/formsystemhostnoperm/entry/src/main/config.json b/ability/ability_runtime/formmanager/fa/formhostst_ets/formsystemhostnoperm/entry/src/main/config.json index 478ab8725..e3102c1ac 100644 --- a/ability/ability_runtime/formmanager/fa/formhostst_ets/formsystemhostnoperm/entry/src/main/config.json +++ b/ability/ability_runtime/formmanager/fa/formhostst_ets/formsystemhostnoperm/entry/src/main/config.json @@ -18,8 +18,7 @@ "name": ".FormStHostAppNoPerm", "mainAbility": ".MainAbility", "deviceType": [ - "default", - "phone" + "default" ], "distro": { "deliveryWithInstall": true, diff --git a/ability/ability_runtime/formmanager/fa/formhostst_ets/formsystemhosto/entry/src/main/config.json b/ability/ability_runtime/formmanager/fa/formhostst_ets/formsystemhosto/entry/src/main/config.json index df6ad4771..464d586b8 100644 --- a/ability/ability_runtime/formmanager/fa/formhostst_ets/formsystemhosto/entry/src/main/config.json +++ b/ability/ability_runtime/formmanager/fa/formhostst_ets/formsystemhosto/entry/src/main/config.json @@ -18,8 +18,7 @@ "name": ".FormStHostAppO", "mainAbility": ".MainAbility", "deviceType": [ - "default", - "phone" + "default" ], "distro": { "deliveryWithInstall": true, diff --git a/ability/ability_runtime/formmanager/fa/formhostst_ets/formsystemhostp/entry/src/main/config.json b/ability/ability_runtime/formmanager/fa/formhostst_ets/formsystemhostp/entry/src/main/config.json index 83186cf50..1fa263dd5 100644 --- a/ability/ability_runtime/formmanager/fa/formhostst_ets/formsystemhostp/entry/src/main/config.json +++ b/ability/ability_runtime/formmanager/fa/formhostst_ets/formsystemhostp/entry/src/main/config.json @@ -18,8 +18,7 @@ "name": ".FormStHostAppP", "mainAbility": ".MainAbility", "deviceType": [ - "default", - "phone" + "default" ], "distro": { "deliveryWithInstall": true, diff --git a/ability/ability_runtime/formmanager/fa/formproviderst_ets/formsupplyapplicationA/entry/src/main/config.json b/ability/ability_runtime/formmanager/fa/formproviderst_ets/formsupplyapplicationA/entry/src/main/config.json index 0165ca2b9..44b6a9384 100644 --- a/ability/ability_runtime/formmanager/fa/formproviderst_ets/formsupplyapplicationA/entry/src/main/config.json +++ b/ability/ability_runtime/formmanager/fa/formproviderst_ets/formsupplyapplicationA/entry/src/main/config.json @@ -19,8 +19,7 @@ "mainAbility": ".MainAbility", "srcPath": "", "deviceType": [ - "default", - "phone" + "default" ], "distro": { "deliveryWithInstall": true, diff --git a/ability/ability_runtime/formmanager/fa/formproviderst_ets/formsupplyapplicationB/entry/src/main/config.json b/ability/ability_runtime/formmanager/fa/formproviderst_ets/formsupplyapplicationB/entry/src/main/config.json index 15274d76c..bf181235e 100644 --- a/ability/ability_runtime/formmanager/fa/formproviderst_ets/formsupplyapplicationB/entry/src/main/config.json +++ b/ability/ability_runtime/formmanager/fa/formproviderst_ets/formsupplyapplicationB/entry/src/main/config.json @@ -19,8 +19,7 @@ "mainAbility": ".MainAbility", "srcPath": "", "deviceType": [ - "default", - "phone" + "default" ], "distro": { "deliveryWithInstall": true, diff --git a/ability/ability_runtime/formmanager/fa/formproviderst_ets/formsupplyapplicationB/entry/src/main/js/widget/manifest.json b/ability/ability_runtime/formmanager/fa/formproviderst_ets/formsupplyapplicationB/entry/src/main/js/widget/manifest.json index a27710a2f..9f9e22496 100644 --- a/ability/ability_runtime/formmanager/fa/formproviderst_ets/formsupplyapplicationB/entry/src/main/js/widget/manifest.json +++ b/ability/ability_runtime/formmanager/fa/formproviderst_ets/formsupplyapplicationB/entry/src/main/js/widget/manifest.json @@ -1 +1 @@ -{"appID": "com.example.myapplication","appName": "$string:entry_MainAbility","versionName": "1.0.0","versionCode": 1000000,"minPlatformVersion": 7,"pages": ["pages/index/index"],"deviceType": ["phone"],"type": "form","window": {"autoDesignWidth": true,"designWidth": 720}} \ No newline at end of file +{"appID": "com.example.myapplication","appName": "$string:entry_MainAbility","versionName": "1.0.0","versionCode": 1000000,"minPlatformVersion": 7,"pages": ["pages/index/index"],"deviceType": ["default"],"type": "form","window": {"autoDesignWidth": true,"designWidth": 720}} \ No newline at end of file diff --git a/ability/ability_runtime/formmanager/fa/formproviderst_ets/formsupplyapplicationC/entry/src/main/config.json b/ability/ability_runtime/formmanager/fa/formproviderst_ets/formsupplyapplicationC/entry/src/main/config.json index 8e0e5e408..69df69ee7 100644 --- a/ability/ability_runtime/formmanager/fa/formproviderst_ets/formsupplyapplicationC/entry/src/main/config.json +++ b/ability/ability_runtime/formmanager/fa/formproviderst_ets/formsupplyapplicationC/entry/src/main/config.json @@ -19,8 +19,7 @@ "mainAbility": ".MainAbility", "srcPath": "", "deviceType": [ - "default", - "phone" + "default" ], "distro": { "deliveryWithInstall": true, diff --git a/ability/ability_runtime/formmanager/fa/formproviderst_ets/formsupplyapplicationC/entry/src/main/js/widget/manifest.json b/ability/ability_runtime/formmanager/fa/formproviderst_ets/formsupplyapplicationC/entry/src/main/js/widget/manifest.json index a27710a2f..9f9e22496 100644 --- a/ability/ability_runtime/formmanager/fa/formproviderst_ets/formsupplyapplicationC/entry/src/main/js/widget/manifest.json +++ b/ability/ability_runtime/formmanager/fa/formproviderst_ets/formsupplyapplicationC/entry/src/main/js/widget/manifest.json @@ -1 +1 @@ -{"appID": "com.example.myapplication","appName": "$string:entry_MainAbility","versionName": "1.0.0","versionCode": 1000000,"minPlatformVersion": 7,"pages": ["pages/index/index"],"deviceType": ["phone"],"type": "form","window": {"autoDesignWidth": true,"designWidth": 720}} \ No newline at end of file +{"appID": "com.example.myapplication","appName": "$string:entry_MainAbility","versionName": "1.0.0","versionCode": 1000000,"minPlatformVersion": 7,"pages": ["pages/index/index"],"deviceType": ["default"],"type": "form","window": {"autoDesignWidth": true,"designWidth": 720}} \ No newline at end of file diff --git a/ability/ability_runtime/formmanager/fa/formproviderst_ets/formsupplyapplicationD/entry/src/main/config.json b/ability/ability_runtime/formmanager/fa/formproviderst_ets/formsupplyapplicationD/entry/src/main/config.json index 5900f22d8..564ac4e68 100644 --- a/ability/ability_runtime/formmanager/fa/formproviderst_ets/formsupplyapplicationD/entry/src/main/config.json +++ b/ability/ability_runtime/formmanager/fa/formproviderst_ets/formsupplyapplicationD/entry/src/main/config.json @@ -19,8 +19,7 @@ "mainAbility": ".MainAbility", "srcPath": "", "deviceType": [ - "default", - "phone" + "default" ], "distro": { "deliveryWithInstall": true, diff --git a/ability/ability_runtime/formmanager/fa/formproviderst_ets/formsupplyapplicationD/entry/src/main/js/widget/manifest.json b/ability/ability_runtime/formmanager/fa/formproviderst_ets/formsupplyapplicationD/entry/src/main/js/widget/manifest.json index a27710a2f..9f9e22496 100644 --- a/ability/ability_runtime/formmanager/fa/formproviderst_ets/formsupplyapplicationD/entry/src/main/js/widget/manifest.json +++ b/ability/ability_runtime/formmanager/fa/formproviderst_ets/formsupplyapplicationD/entry/src/main/js/widget/manifest.json @@ -1 +1 @@ -{"appID": "com.example.myapplication","appName": "$string:entry_MainAbility","versionName": "1.0.0","versionCode": 1000000,"minPlatformVersion": 7,"pages": ["pages/index/index"],"deviceType": ["phone"],"type": "form","window": {"autoDesignWidth": true,"designWidth": 720}} \ No newline at end of file +{"appID": "com.example.myapplication","appName": "$string:entry_MainAbility","versionName": "1.0.0","versionCode": 1000000,"minPlatformVersion": 7,"pages": ["pages/index/index"],"deviceType": ["default"],"type": "form","window": {"autoDesignWidth": true,"designWidth": 720}} \ No newline at end of file diff --git a/ability/ability_runtime/formmanager/fa/formproviderst_ets/formsupplyapplicationE/entry/src/main/config.json b/ability/ability_runtime/formmanager/fa/formproviderst_ets/formsupplyapplicationE/entry/src/main/config.json index 4d878c851..6850e953f 100644 --- a/ability/ability_runtime/formmanager/fa/formproviderst_ets/formsupplyapplicationE/entry/src/main/config.json +++ b/ability/ability_runtime/formmanager/fa/formproviderst_ets/formsupplyapplicationE/entry/src/main/config.json @@ -19,8 +19,7 @@ "mainAbility": ".MainAbility", "srcPath": "", "deviceType": [ - "default", - "phone" + "default" ], "distro": { "deliveryWithInstall": true, diff --git a/ability/ability_runtime/formmanager/fa/formproviderst_ets/formsupplyapplicationE/entry/src/main/js/widget/manifest.json b/ability/ability_runtime/formmanager/fa/formproviderst_ets/formsupplyapplicationE/entry/src/main/js/widget/manifest.json index a27710a2f..9f9e22496 100644 --- a/ability/ability_runtime/formmanager/fa/formproviderst_ets/formsupplyapplicationE/entry/src/main/js/widget/manifest.json +++ b/ability/ability_runtime/formmanager/fa/formproviderst_ets/formsupplyapplicationE/entry/src/main/js/widget/manifest.json @@ -1 +1 @@ -{"appID": "com.example.myapplication","appName": "$string:entry_MainAbility","versionName": "1.0.0","versionCode": 1000000,"minPlatformVersion": 7,"pages": ["pages/index/index"],"deviceType": ["phone"],"type": "form","window": {"autoDesignWidth": true,"designWidth": 720}} \ No newline at end of file +{"appID": "com.example.myapplication","appName": "$string:entry_MainAbility","versionName": "1.0.0","versionCode": 1000000,"minPlatformVersion": 7,"pages": ["pages/index/index"],"deviceType": ["default"],"type": "form","window": {"autoDesignWidth": true,"designWidth": 720}} \ No newline at end of file diff --git a/ability/ability_runtime/formmanager/fa/formproviderst_ets/formsupplyapplicationF/entry/src/main/config.json b/ability/ability_runtime/formmanager/fa/formproviderst_ets/formsupplyapplicationF/entry/src/main/config.json index d4eb21880..d9c0ac6ff 100644 --- a/ability/ability_runtime/formmanager/fa/formproviderst_ets/formsupplyapplicationF/entry/src/main/config.json +++ b/ability/ability_runtime/formmanager/fa/formproviderst_ets/formsupplyapplicationF/entry/src/main/config.json @@ -19,8 +19,7 @@ "mainAbility": ".MainAbility", "srcPath": "", "deviceType": [ - "default", - "phone" + "default" ], "distro": { "deliveryWithInstall": true, diff --git a/ability/ability_runtime/formmanager/fa/formproviderst_ets/formsupplyapplicationF/entry/src/main/js/Form_Js001/manifest.json b/ability/ability_runtime/formmanager/fa/formproviderst_ets/formsupplyapplicationF/entry/src/main/js/Form_Js001/manifest.json index a27710a2f..9f9e22496 100644 --- a/ability/ability_runtime/formmanager/fa/formproviderst_ets/formsupplyapplicationF/entry/src/main/js/Form_Js001/manifest.json +++ b/ability/ability_runtime/formmanager/fa/formproviderst_ets/formsupplyapplicationF/entry/src/main/js/Form_Js001/manifest.json @@ -1 +1 @@ -{"appID": "com.example.myapplication","appName": "$string:entry_MainAbility","versionName": "1.0.0","versionCode": 1000000,"minPlatformVersion": 7,"pages": ["pages/index/index"],"deviceType": ["phone"],"type": "form","window": {"autoDesignWidth": true,"designWidth": 720}} \ No newline at end of file +{"appID": "com.example.myapplication","appName": "$string:entry_MainAbility","versionName": "1.0.0","versionCode": 1000000,"minPlatformVersion": 7,"pages": ["pages/index/index"],"deviceType": ["default"],"type": "form","window": {"autoDesignWidth": true,"designWidth": 720}} \ No newline at end of file diff --git a/ability/ability_runtime/formmanager/fa/formproviderst_ets/formsupplyapplicationG/entry/src/main/config.json b/ability/ability_runtime/formmanager/fa/formproviderst_ets/formsupplyapplicationG/entry/src/main/config.json index d7b259e3c..4acb32593 100644 --- a/ability/ability_runtime/formmanager/fa/formproviderst_ets/formsupplyapplicationG/entry/src/main/config.json +++ b/ability/ability_runtime/formmanager/fa/formproviderst_ets/formsupplyapplicationG/entry/src/main/config.json @@ -19,8 +19,7 @@ "mainAbility": ".MainAbility", "srcPath": "", "deviceType": [ - "default", - "phone" + "default" ], "distro": { "deliveryWithInstall": true, diff --git a/ability/ability_runtime/formmanager/fa/formproviderst_ets/formsupplyapplicationG/entry/src/main/js/Form_Js001/manifest.json b/ability/ability_runtime/formmanager/fa/formproviderst_ets/formsupplyapplicationG/entry/src/main/js/Form_Js001/manifest.json index a27710a2f..9f9e22496 100644 --- a/ability/ability_runtime/formmanager/fa/formproviderst_ets/formsupplyapplicationG/entry/src/main/js/Form_Js001/manifest.json +++ b/ability/ability_runtime/formmanager/fa/formproviderst_ets/formsupplyapplicationG/entry/src/main/js/Form_Js001/manifest.json @@ -1 +1 @@ -{"appID": "com.example.myapplication","appName": "$string:entry_MainAbility","versionName": "1.0.0","versionCode": 1000000,"minPlatformVersion": 7,"pages": ["pages/index/index"],"deviceType": ["phone"],"type": "form","window": {"autoDesignWidth": true,"designWidth": 720}} \ No newline at end of file +{"appID": "com.example.myapplication","appName": "$string:entry_MainAbility","versionName": "1.0.0","versionCode": 1000000,"minPlatformVersion": 7,"pages": ["pages/index/index"],"deviceType": ["default"],"type": "form","window": {"autoDesignWidth": true,"designWidth": 720}} \ No newline at end of file diff --git a/ability/ability_runtime/formmanager/fa/formproviderst_ets/formsupplyapplicationH/entry/src/main/config.json b/ability/ability_runtime/formmanager/fa/formproviderst_ets/formsupplyapplicationH/entry/src/main/config.json index 62979bb7e..b9335aa88 100644 --- a/ability/ability_runtime/formmanager/fa/formproviderst_ets/formsupplyapplicationH/entry/src/main/config.json +++ b/ability/ability_runtime/formmanager/fa/formproviderst_ets/formsupplyapplicationH/entry/src/main/config.json @@ -19,8 +19,7 @@ "mainAbility": ".MainAbility", "srcPath": "", "deviceType": [ - "default", - "phone" + "default" ], "distro": { "deliveryWithInstall": true, diff --git a/ability/ability_runtime/formmanager/fa/formproviderst_ets/formsupplyapplicationH/entry/src/main/js/widget/manifest.json b/ability/ability_runtime/formmanager/fa/formproviderst_ets/formsupplyapplicationH/entry/src/main/js/widget/manifest.json index a27710a2f..9f9e22496 100644 --- a/ability/ability_runtime/formmanager/fa/formproviderst_ets/formsupplyapplicationH/entry/src/main/js/widget/manifest.json +++ b/ability/ability_runtime/formmanager/fa/formproviderst_ets/formsupplyapplicationH/entry/src/main/js/widget/manifest.json @@ -1 +1 @@ -{"appID": "com.example.myapplication","appName": "$string:entry_MainAbility","versionName": "1.0.0","versionCode": 1000000,"minPlatformVersion": 7,"pages": ["pages/index/index"],"deviceType": ["phone"],"type": "form","window": {"autoDesignWidth": true,"designWidth": 720}} \ No newline at end of file +{"appID": "com.example.myapplication","appName": "$string:entry_MainAbility","versionName": "1.0.0","versionCode": 1000000,"minPlatformVersion": 7,"pages": ["pages/index/index"],"deviceType": ["default"],"type": "form","window": {"autoDesignWidth": true,"designWidth": 720}} \ No newline at end of file diff --git a/ability/ability_runtime/formmanager/fa/formproviderst_ets/formsupplyapplicationNotSysApp/entry/src/main/config.json b/ability/ability_runtime/formmanager/fa/formproviderst_ets/formsupplyapplicationNotSysApp/entry/src/main/config.json index eb22f83f9..905faf9cb 100644 --- a/ability/ability_runtime/formmanager/fa/formproviderst_ets/formsupplyapplicationNotSysApp/entry/src/main/config.json +++ b/ability/ability_runtime/formmanager/fa/formproviderst_ets/formsupplyapplicationNotSysApp/entry/src/main/config.json @@ -19,8 +19,7 @@ "mainAbility": ".MainAbility", "srcPath": "", "deviceType": [ - "default", - "phone" + "default" ], "distro": { "deliveryWithInstall": true, diff --git a/ability/ability_runtime/formmanager/fa/formproviderst_ets/formsystemprovidera/entry/src/main/config.json b/ability/ability_runtime/formmanager/fa/formproviderst_ets/formsystemprovidera/entry/src/main/config.json index e8097cca4..2c7e2f033 100644 --- a/ability/ability_runtime/formmanager/fa/formproviderst_ets/formsystemprovidera/entry/src/main/config.json +++ b/ability/ability_runtime/formmanager/fa/formproviderst_ets/formsystemprovidera/entry/src/main/config.json @@ -18,8 +18,7 @@ "name": ".FormSTApp", "mainAbility": ".MainAbility", "deviceType": [ - "default", - "phone" + "default" ], "distro": { "deliveryWithInstall": true, diff --git a/ability/ability_runtime/formmanager/fa/formproviderst_ets/formsystemproviderb/entry/src/main/config.json b/ability/ability_runtime/formmanager/fa/formproviderst_ets/formsystemproviderb/entry/src/main/config.json index 95f8b8d4b..580bd6ba8 100644 --- a/ability/ability_runtime/formmanager/fa/formproviderst_ets/formsystemproviderb/entry/src/main/config.json +++ b/ability/ability_runtime/formmanager/fa/formproviderst_ets/formsystemproviderb/entry/src/main/config.json @@ -18,8 +18,7 @@ "name": ".FormSTApp", "mainAbility": ".MainAbility", "deviceType": [ - "default", - "phone" + "default" ], "distro": { "deliveryWithInstall": true, diff --git a/ability/ability_runtime/formmanager/fa/formproviderst_ets/formsystemproviderc/entry/src/main/config.json b/ability/ability_runtime/formmanager/fa/formproviderst_ets/formsystemproviderc/entry/src/main/config.json index b8b993c94..33895996e 100644 --- a/ability/ability_runtime/formmanager/fa/formproviderst_ets/formsystemproviderc/entry/src/main/config.json +++ b/ability/ability_runtime/formmanager/fa/formproviderst_ets/formsystemproviderc/entry/src/main/config.json @@ -18,8 +18,7 @@ "name": ".FormSTApp", "mainAbility": ".MainAbility", "deviceType": [ - "default", - "phone" + "default" ], "distro": { "deliveryWithInstall": true, diff --git a/ability/ability_runtime/formmanager/fa/formproviderst_ets/formsystemproviderd/entry/src/main/config.json b/ability/ability_runtime/formmanager/fa/formproviderst_ets/formsystemproviderd/entry/src/main/config.json index 6d4215078..896b1f000 100644 --- a/ability/ability_runtime/formmanager/fa/formproviderst_ets/formsystemproviderd/entry/src/main/config.json +++ b/ability/ability_runtime/formmanager/fa/formproviderst_ets/formsystemproviderd/entry/src/main/config.json @@ -18,8 +18,7 @@ "name": ".FormSTApp", "mainAbility": ".MainAbility", "deviceType": [ - "default", - "phone" + "default" ], "distro": { "deliveryWithInstall": true, diff --git a/ability/ability_runtime/formmanager/fa/formsystemtest_ets/formacquiretest/entry/src/main/config.json b/ability/ability_runtime/formmanager/fa/formsystemtest_ets/formacquiretest/entry/src/main/config.json index 867c55128..51c25667f 100644 --- a/ability/ability_runtime/formmanager/fa/formsystemtest_ets/formacquiretest/entry/src/main/config.json +++ b/ability/ability_runtime/formmanager/fa/formsystemtest_ets/formacquiretest/entry/src/main/config.json @@ -18,8 +18,7 @@ "name": ".FormAcquireSTApp", "mainAbility": "com.ohos.st.formacquiretest.MainAbility", "deviceType": [ - "default", - "phone" + "default" ], "distro": { "deliveryWithInstall": true, diff --git a/ability/ability_runtime/formmanager/fa/formsystemtest_ets/formacquiretest2/entry/src/main/config.json b/ability/ability_runtime/formmanager/fa/formsystemtest_ets/formacquiretest2/entry/src/main/config.json index cca586d29..8f39d6594 100644 --- a/ability/ability_runtime/formmanager/fa/formsystemtest_ets/formacquiretest2/entry/src/main/config.json +++ b/ability/ability_runtime/formmanager/fa/formsystemtest_ets/formacquiretest2/entry/src/main/config.json @@ -18,8 +18,7 @@ "name": ".FormAcquire2STApp", "mainAbility": ".MainAbility", "deviceType": [ - "default", - "phone" + "default" ], "distro": { "deliveryWithInstall": true, diff --git a/ability/ability_runtime/formmanager/fa/formsystemtest_ets/formdeletetest/entry/src/main/config.json b/ability/ability_runtime/formmanager/fa/formsystemtest_ets/formdeletetest/entry/src/main/config.json index 491be0168..c9d587f01 100644 --- a/ability/ability_runtime/formmanager/fa/formsystemtest_ets/formdeletetest/entry/src/main/config.json +++ b/ability/ability_runtime/formmanager/fa/formsystemtest_ets/formdeletetest/entry/src/main/config.json @@ -18,8 +18,7 @@ "name": ".FormDeleteSTApp", "mainAbility": ".MainAbility", "deviceType": [ - "default", - "phone" + "default" ], "distro": { "deliveryWithInstall": true, diff --git a/ability/ability_runtime/formmanager/fa/formsystemtest_ets/formdynamicrefreshtest/entry/src/main/config.json b/ability/ability_runtime/formmanager/fa/formsystemtest_ets/formdynamicrefreshtest/entry/src/main/config.json index 7867a43be..1c91d9b8f 100644 --- a/ability/ability_runtime/formmanager/fa/formsystemtest_ets/formdynamicrefreshtest/entry/src/main/config.json +++ b/ability/ability_runtime/formmanager/fa/formsystemtest_ets/formdynamicrefreshtest/entry/src/main/config.json @@ -18,8 +18,7 @@ "name": ".FormDynamicSTApp", "mainAbility": ".MainAbility", "deviceType": [ - "default", - "phone" + "default" ], "distro": { "deliveryWithInstall": true, diff --git a/ability/ability_runtime/formmanager/fa/formsystemtest_ets/formfuzztest/entry/src/main/config.json b/ability/ability_runtime/formmanager/fa/formsystemtest_ets/formfuzztest/entry/src/main/config.json index fcc584b7d..391f66c5a 100644 --- a/ability/ability_runtime/formmanager/fa/formsystemtest_ets/formfuzztest/entry/src/main/config.json +++ b/ability/ability_runtime/formmanager/fa/formsystemtest_ets/formfuzztest/entry/src/main/config.json @@ -18,8 +18,7 @@ "name": ".FormFuzzSTApp", "mainAbility": ".MainAbility", "deviceType": [ - "default", - "phone" + "default" ], "distro": { "deliveryWithInstall": true, diff --git a/ability/ability_runtime/formmanager/fa/formsystemtest_ets/formgetformsinfotest/formsoneandonetest/entry/src/main/config.json b/ability/ability_runtime/formmanager/fa/formsystemtest_ets/formgetformsinfotest/formsoneandonetest/entry/src/main/config.json index 7e0badee1..d1b3b45f6 100644 --- a/ability/ability_runtime/formmanager/fa/formsystemtest_ets/formgetformsinfotest/formsoneandonetest/entry/src/main/config.json +++ b/ability/ability_runtime/formmanager/fa/formsystemtest_ets/formgetformsinfotest/formsoneandonetest/entry/src/main/config.json @@ -18,8 +18,7 @@ "name": ".FormSTApp", "mainAbility": ".MainAbility", "deviceType": [ - "default", - "phone" + "default" ], "distro": { "deliveryWithInstall": true, diff --git a/ability/ability_runtime/formmanager/fa/formsystemtest_ets/formgetformsinfotest/formsoneandtwotest/entry/src/main/config.json b/ability/ability_runtime/formmanager/fa/formsystemtest_ets/formgetformsinfotest/formsoneandtwotest/entry/src/main/config.json index 87b9f7db2..7e41352fe 100644 --- a/ability/ability_runtime/formmanager/fa/formsystemtest_ets/formgetformsinfotest/formsoneandtwotest/entry/src/main/config.json +++ b/ability/ability_runtime/formmanager/fa/formsystemtest_ets/formgetformsinfotest/formsoneandtwotest/entry/src/main/config.json @@ -18,8 +18,7 @@ "name": ".FormSTApp", "mainAbility": ".MainAbility", "deviceType": [ - "default", - "phone" + "default" ], "distro": { "deliveryWithInstall": true, diff --git a/ability/ability_runtime/formmanager/fa/formsystemtest_ets/formgetformsinfotest/formsoneandzerotest/entry/src/main/config.json b/ability/ability_runtime/formmanager/fa/formsystemtest_ets/formgetformsinfotest/formsoneandzerotest/entry/src/main/config.json index 5f7a98a6b..1d2fb9f02 100644 --- a/ability/ability_runtime/formmanager/fa/formsystemtest_ets/formgetformsinfotest/formsoneandzerotest/entry/src/main/config.json +++ b/ability/ability_runtime/formmanager/fa/formsystemtest_ets/formgetformsinfotest/formsoneandzerotest/entry/src/main/config.json @@ -18,8 +18,7 @@ "name": ".FormSTApp", "mainAbility": ".MainAbility", "deviceType": [ - "default", - "phone" + "default" ], "distro": { "deliveryWithInstall": true, diff --git a/ability/ability_runtime/formmanager/fa/formsystemtest_ets/formgetformsinfotest/formswithoutpermtest/entry/src/main/config.json b/ability/ability_runtime/formmanager/fa/formsystemtest_ets/formgetformsinfotest/formswithoutpermtest/entry/src/main/config.json index aaec29db5..8c18ebe92 100644 --- a/ability/ability_runtime/formmanager/fa/formsystemtest_ets/formgetformsinfotest/formswithoutpermtest/entry/src/main/config.json +++ b/ability/ability_runtime/formmanager/fa/formsystemtest_ets/formgetformsinfotest/formswithoutpermtest/entry/src/main/config.json @@ -18,8 +18,7 @@ "name": ".FormSTApp", "mainAbility": ".MainAbility", "deviceType": [ - "default", - "phone" + "default" ], "distro": { "deliveryWithInstall": true, diff --git a/ability/ability_runtime/formmanager/fa/formsystemtest_ets/formgetformsinfotest/formszerotest/entry/src/main/config.json b/ability/ability_runtime/formmanager/fa/formsystemtest_ets/formgetformsinfotest/formszerotest/entry/src/main/config.json index 75396a3a2..c2bb1ac8d 100644 --- a/ability/ability_runtime/formmanager/fa/formsystemtest_ets/formgetformsinfotest/formszerotest/entry/src/main/config.json +++ b/ability/ability_runtime/formmanager/fa/formsystemtest_ets/formgetformsinfotest/formszerotest/entry/src/main/config.json @@ -18,8 +18,7 @@ "name": ".FormSTApp", "mainAbility": ".MainAbility", "deviceType": [ - "default", - "phone" + "default" ], "distro": { "deliveryWithInstall": true, diff --git a/ability/ability_runtime/formmanager/fa/formsystemtest_ets/formhostdeathrecipienttest/entry/src/main/config.json b/ability/ability_runtime/formmanager/fa/formsystemtest_ets/formhostdeathrecipienttest/entry/src/main/config.json index 84313c183..81e8ccc06 100644 --- a/ability/ability_runtime/formmanager/fa/formsystemtest_ets/formhostdeathrecipienttest/entry/src/main/config.json +++ b/ability/ability_runtime/formmanager/fa/formsystemtest_ets/formhostdeathrecipienttest/entry/src/main/config.json @@ -18,8 +18,7 @@ "name": ".FormHostDeathRecipientSTApp", "mainAbility": ".MainAbility", "deviceType": [ - "default", - "phone" + "default" ], "distro": { "deliveryWithInstall": true, diff --git a/ability/ability_runtime/formmanager/fa/formsystemtest_ets/formperformancetest/entry/src/main/config.json b/ability/ability_runtime/formmanager/fa/formsystemtest_ets/formperformancetest/entry/src/main/config.json index 60458105a..973c113e2 100644 --- a/ability/ability_runtime/formmanager/fa/formsystemtest_ets/formperformancetest/entry/src/main/config.json +++ b/ability/ability_runtime/formmanager/fa/formsystemtest_ets/formperformancetest/entry/src/main/config.json @@ -18,8 +18,7 @@ "name": ".FormPerformanceSTApp", "mainAbility": ".MainAbility", "deviceType": [ - "default", - "phone" + "default" ], "distro": { "deliveryWithInstall": true, diff --git a/ability/ability_runtime/formmanager/fa/formsystemtest_ets/formreleasetest/entry/src/main/config.json b/ability/ability_runtime/formmanager/fa/formsystemtest_ets/formreleasetest/entry/src/main/config.json index 467b44dc3..6f728ad92 100644 --- a/ability/ability_runtime/formmanager/fa/formsystemtest_ets/formreleasetest/entry/src/main/config.json +++ b/ability/ability_runtime/formmanager/fa/formsystemtest_ets/formreleasetest/entry/src/main/config.json @@ -18,8 +18,7 @@ "name": ".FormReleaseSTApp", "mainAbility": ".MainAbility", "deviceType": [ - "default", - "phone" + "default" ], "distro": { "deliveryWithInstall": true, diff --git a/ability/ability_runtime/formmanager/fa/formsystemtest_ets/formstatetest_disable/entry/src/main/config.json b/ability/ability_runtime/formmanager/fa/formsystemtest_ets/formstatetest_disable/entry/src/main/config.json index 8040926bf..086d7f09b 100644 --- a/ability/ability_runtime/formmanager/fa/formsystemtest_ets/formstatetest_disable/entry/src/main/config.json +++ b/ability/ability_runtime/formmanager/fa/formsystemtest_ets/formstatetest_disable/entry/src/main/config.json @@ -18,8 +18,7 @@ "name": ".FormStateSTApp", "mainAbility": ".MainAbility", "deviceType": [ - "default", - "phone" + "default" ], "distro": { "deliveryWithInstall": true, diff --git a/ability/ability_runtime/formmanager/fa/formsystemtest_ets/formstatetest_enable/entry/src/main/config.json b/ability/ability_runtime/formmanager/fa/formsystemtest_ets/formstatetest_enable/entry/src/main/config.json index 1ee904b08..1d583e111 100644 --- a/ability/ability_runtime/formmanager/fa/formsystemtest_ets/formstatetest_enable/entry/src/main/config.json +++ b/ability/ability_runtime/formmanager/fa/formsystemtest_ets/formstatetest_enable/entry/src/main/config.json @@ -18,8 +18,7 @@ "name": ".FormStateSTApp", "mainAbility": ".MainAbility", "deviceType": [ - "default", - "phone" + "default" ], "distro": { "deliveryWithInstall": true, diff --git a/ability/ability_runtime/formmanager/fa/formsystemtest_ets/formstatetest_notifyinvisible/entry/src/main/config.json b/ability/ability_runtime/formmanager/fa/formsystemtest_ets/formstatetest_notifyinvisible/entry/src/main/config.json index 58d83feef..df314f34c 100644 --- a/ability/ability_runtime/formmanager/fa/formsystemtest_ets/formstatetest_notifyinvisible/entry/src/main/config.json +++ b/ability/ability_runtime/formmanager/fa/formsystemtest_ets/formstatetest_notifyinvisible/entry/src/main/config.json @@ -18,8 +18,7 @@ "name": ".FormStateSTApp", "mainAbility": ".MainAbility", "deviceType": [ - "default", - "phone" + "default" ], "distro": { "deliveryWithInstall": true, diff --git a/ability/ability_runtime/formmanager/fa/formsystemtest_ets/formstatetest_notifyinvisible2/entry/src/main/config.json b/ability/ability_runtime/formmanager/fa/formsystemtest_ets/formstatetest_notifyinvisible2/entry/src/main/config.json index c8e3a5b4e..1c5d42833 100644 --- a/ability/ability_runtime/formmanager/fa/formsystemtest_ets/formstatetest_notifyinvisible2/entry/src/main/config.json +++ b/ability/ability_runtime/formmanager/fa/formsystemtest_ets/formstatetest_notifyinvisible2/entry/src/main/config.json @@ -18,8 +18,7 @@ "name": ".FormStateSTApp", "mainAbility": ".MainAbility", "deviceType": [ - "default", - "phone" + "default" ], "distro": { "deliveryWithInstall": true, diff --git a/ability/ability_runtime/formmanager/fa/formsystemtest_ets/formstatetest_notifyvisible/entry/src/main/config.json b/ability/ability_runtime/formmanager/fa/formsystemtest_ets/formstatetest_notifyvisible/entry/src/main/config.json index 8101fc1ef..7ffade9ce 100644 --- a/ability/ability_runtime/formmanager/fa/formsystemtest_ets/formstatetest_notifyvisible/entry/src/main/config.json +++ b/ability/ability_runtime/formmanager/fa/formsystemtest_ets/formstatetest_notifyvisible/entry/src/main/config.json @@ -18,8 +18,7 @@ "name": ".FormStateSTApp", "mainAbility": ".MainAbility", "deviceType": [ - "default", - "phone" + "default" ], "distro": { "deliveryWithInstall": true, diff --git a/ability/ability_runtime/formmanager/fa/formsystemtest_ets/formstresstest/entry/src/main/config.json b/ability/ability_runtime/formmanager/fa/formsystemtest_ets/formstresstest/entry/src/main/config.json index 4c72406e0..481eaf1f8 100644 --- a/ability/ability_runtime/formmanager/fa/formsystemtest_ets/formstresstest/entry/src/main/config.json +++ b/ability/ability_runtime/formmanager/fa/formsystemtest_ets/formstresstest/entry/src/main/config.json @@ -18,8 +18,7 @@ "name": ".FormStressSTApp", "mainAbility": ".MainAbility", "deviceType": [ - "default", - "phone" + "default" ], "distro": { "deliveryWithInstall": true, diff --git a/ability/ability_runtime/formmanager/fa/formsystemtest_ets/formupdatefreshtest/entry/src/main/config.json b/ability/ability_runtime/formmanager/fa/formsystemtest_ets/formupdatefreshtest/entry/src/main/config.json index 459805110..cdb483bd0 100644 --- a/ability/ability_runtime/formmanager/fa/formsystemtest_ets/formupdatefreshtest/entry/src/main/config.json +++ b/ability/ability_runtime/formmanager/fa/formsystemtest_ets/formupdatefreshtest/entry/src/main/config.json @@ -18,8 +18,7 @@ "name": ".FormUpdateSTApp", "mainAbility": ".MainAbility", "deviceType": [ - "default", - "phone" + "default" ], "distro": { "deliveryWithInstall": true, diff --git a/ability/ability_runtime/freeinstalltest/connectabilityfatest/actsfreeinstallconnectabilityfatest/entry/src/main/config.json b/ability/ability_runtime/freeinstalltest/connectabilityfatest/actsfreeinstallconnectabilityfatest/entry/src/main/config.json index a8de7e041..22df173f2 100644 --- a/ability/ability_runtime/freeinstalltest/connectabilityfatest/actsfreeinstallconnectabilityfatest/entry/src/main/config.json +++ b/ability/ability_runtime/freeinstalltest/connectabilityfatest/actsfreeinstallconnectabilityfatest/entry/src/main/config.json @@ -17,7 +17,6 @@ "mainAbility": ".MainAbility", "deviceType": [ "default", - "phone", "tablet" ], "abilities": [ diff --git a/ability/ability_runtime/freeinstalltest/connectabilityfatest/connectdifferentapplication/entry/src/main/module.json b/ability/ability_runtime/freeinstalltest/connectabilityfatest/connectdifferentapplication/entry/src/main/module.json index a44ae73f2..870d47283 100644 --- a/ability/ability_runtime/freeinstalltest/connectabilityfatest/connectdifferentapplication/entry/src/main/module.json +++ b/ability/ability_runtime/freeinstalltest/connectabilityfatest/connectdifferentapplication/entry/src/main/module.json @@ -6,8 +6,7 @@ "description": "$string:entry_desc", "mainElement": "MainAbility", "deviceTypes": [ - "default", - "phone" + "default" ], "deliveryWithInstall": true, "installationFree": true, diff --git a/ability/ability_runtime/freeinstalltest/connectabilityfatest/connectfamyapplication1/entry/src/main/config.json b/ability/ability_runtime/freeinstalltest/connectabilityfatest/connectfamyapplication1/entry/src/main/config.json index 72d22a6da..ecdbbf50b 100644 --- a/ability/ability_runtime/freeinstalltest/connectabilityfatest/connectfamyapplication1/entry/src/main/config.json +++ b/ability/ability_runtime/freeinstalltest/connectabilityfatest/connectfamyapplication1/entry/src/main/config.json @@ -17,7 +17,6 @@ "mainAbility": ".MainAbility", "deviceType": [ "default", - "phone", "tablet" ], "abilities": [ diff --git a/ability/ability_runtime/freeinstalltest/connectabilityfatest/connectfamyapplication10/entry/src/main/config.json b/ability/ability_runtime/freeinstalltest/connectabilityfatest/connectfamyapplication10/entry/src/main/config.json index 7142d1ac2..27def2da9 100644 --- a/ability/ability_runtime/freeinstalltest/connectabilityfatest/connectfamyapplication10/entry/src/main/config.json +++ b/ability/ability_runtime/freeinstalltest/connectabilityfatest/connectfamyapplication10/entry/src/main/config.json @@ -17,7 +17,6 @@ "mainAbility": ".MainAbility", "deviceType": [ "default", - "phone", "tablet" ], "abilities": [ diff --git a/ability/ability_runtime/freeinstalltest/connectabilityfatest/connectfamyapplication11/entry/src/main/config.json b/ability/ability_runtime/freeinstalltest/connectabilityfatest/connectfamyapplication11/entry/src/main/config.json index 08da37265..e5e132bc0 100644 --- a/ability/ability_runtime/freeinstalltest/connectabilityfatest/connectfamyapplication11/entry/src/main/config.json +++ b/ability/ability_runtime/freeinstalltest/connectabilityfatest/connectfamyapplication11/entry/src/main/config.json @@ -17,7 +17,6 @@ "mainAbility": ".MainAbility", "deviceType": [ "default", - "phone", "tablet" ], "abilities": [ diff --git a/ability/ability_runtime/freeinstalltest/connectabilityfatest/connectfamyapplication2/entry/src/main/config.json b/ability/ability_runtime/freeinstalltest/connectabilityfatest/connectfamyapplication2/entry/src/main/config.json index 0aa213f4e..3db489dcc 100644 --- a/ability/ability_runtime/freeinstalltest/connectabilityfatest/connectfamyapplication2/entry/src/main/config.json +++ b/ability/ability_runtime/freeinstalltest/connectabilityfatest/connectfamyapplication2/entry/src/main/config.json @@ -17,7 +17,6 @@ "mainAbility": ".MainAbility", "deviceType": [ "default", - "phone", "tablet" ], "abilities": [ diff --git a/ability/ability_runtime/freeinstalltest/connectabilityfatest/connectfamyapplication4/entry/src/main/config.json b/ability/ability_runtime/freeinstalltest/connectabilityfatest/connectfamyapplication4/entry/src/main/config.json index 62552e6ef..d027cc117 100644 --- a/ability/ability_runtime/freeinstalltest/connectabilityfatest/connectfamyapplication4/entry/src/main/config.json +++ b/ability/ability_runtime/freeinstalltest/connectabilityfatest/connectfamyapplication4/entry/src/main/config.json @@ -17,7 +17,6 @@ "mainAbility": ".MainAbility", "deviceType": [ "default", - "phone", "tablet" ], "abilities": [ diff --git a/ability/ability_runtime/freeinstalltest/connectabilityfatest/connectfamyapplication5/entry/src/main/config.json b/ability/ability_runtime/freeinstalltest/connectabilityfatest/connectfamyapplication5/entry/src/main/config.json index b4aff27cf..dbbf53d38 100644 --- a/ability/ability_runtime/freeinstalltest/connectabilityfatest/connectfamyapplication5/entry/src/main/config.json +++ b/ability/ability_runtime/freeinstalltest/connectabilityfatest/connectfamyapplication5/entry/src/main/config.json @@ -17,7 +17,6 @@ "mainAbility": ".MainAbility", "deviceType": [ "default", - "phone", "tablet" ], "abilities": [ diff --git a/ability/ability_runtime/freeinstalltest/connectabilityfatest/connectfamyapplication6/entry/src/main/config.json b/ability/ability_runtime/freeinstalltest/connectabilityfatest/connectfamyapplication6/entry/src/main/config.json index c8d4f645f..46e17f512 100644 --- a/ability/ability_runtime/freeinstalltest/connectabilityfatest/connectfamyapplication6/entry/src/main/config.json +++ b/ability/ability_runtime/freeinstalltest/connectabilityfatest/connectfamyapplication6/entry/src/main/config.json @@ -17,7 +17,6 @@ "mainAbility": ".MainAbility", "deviceType": [ "default", - "phone", "tablet" ], "abilities": [ diff --git a/ability/ability_runtime/freeinstalltest/connectabilityfatest/connectfamyapplication7/entry/src/main/config.json b/ability/ability_runtime/freeinstalltest/connectabilityfatest/connectfamyapplication7/entry/src/main/config.json index 911a5f748..36ea92d4a 100644 --- a/ability/ability_runtime/freeinstalltest/connectabilityfatest/connectfamyapplication7/entry/src/main/config.json +++ b/ability/ability_runtime/freeinstalltest/connectabilityfatest/connectfamyapplication7/entry/src/main/config.json @@ -17,7 +17,6 @@ "mainAbility": ".MainAbility", "deviceType": [ "default", - "phone", "tablet" ], "abilities": [ diff --git a/ability/ability_runtime/freeinstalltest/connectabilityfatest/connectfamyapplication8/entry/src/main/config.json b/ability/ability_runtime/freeinstalltest/connectabilityfatest/connectfamyapplication8/entry/src/main/config.json index 6e36e87bf..a34f57d62 100644 --- a/ability/ability_runtime/freeinstalltest/connectabilityfatest/connectfamyapplication8/entry/src/main/config.json +++ b/ability/ability_runtime/freeinstalltest/connectabilityfatest/connectfamyapplication8/entry/src/main/config.json @@ -17,7 +17,6 @@ "mainAbility": ".MainAbility", "deviceType": [ "default", - "phone", "tablet" ], "abilities": [ diff --git a/ability/ability_runtime/freeinstalltest/connectabilityfatest/connectfamyapplication9/entry/src/main/config.json b/ability/ability_runtime/freeinstalltest/connectabilityfatest/connectfamyapplication9/entry/src/main/config.json index 842927fc8..3f1654296 100644 --- a/ability/ability_runtime/freeinstalltest/connectabilityfatest/connectfamyapplication9/entry/src/main/config.json +++ b/ability/ability_runtime/freeinstalltest/connectabilityfatest/connectfamyapplication9/entry/src/main/config.json @@ -17,7 +17,6 @@ "mainAbility": ".MainAbility", "deviceType": [ "default", - "phone", "tablet" ], "abilities": [ diff --git a/ability/ability_runtime/freeinstalltest/connectabilitystagetest/actsfreeinstallconnectabilitystagetest/entry/src/main/module.json b/ability/ability_runtime/freeinstalltest/connectabilitystagetest/actsfreeinstallconnectabilitystagetest/entry/src/main/module.json index 119d4f70c..d853356e6 100644 --- a/ability/ability_runtime/freeinstalltest/connectabilitystagetest/actsfreeinstallconnectabilitystagetest/entry/src/main/module.json +++ b/ability/ability_runtime/freeinstalltest/connectabilitystagetest/actsfreeinstallconnectabilitystagetest/entry/src/main/module.json @@ -7,7 +7,6 @@ "mainElement": "MainAbility", "deviceTypes": [ "default", - "phone", "tablet" ], "deliveryWithInstall": true, diff --git a/ability/ability_runtime/freeinstalltest/connectabilitystagetest/connectstagemyapplication0/entry/src/main/module.json b/ability/ability_runtime/freeinstalltest/connectabilitystagetest/connectstagemyapplication0/entry/src/main/module.json index 75fe4e025..b5dd8f0af 100644 --- a/ability/ability_runtime/freeinstalltest/connectabilitystagetest/connectstagemyapplication0/entry/src/main/module.json +++ b/ability/ability_runtime/freeinstalltest/connectabilitystagetest/connectstagemyapplication0/entry/src/main/module.json @@ -7,7 +7,6 @@ "mainElement": "MainAbility", "deviceTypes": [ "default", - "phone", "tablet" ], "deliveryWithInstall": true, diff --git a/ability/ability_runtime/freeinstalltest/connectabilitystagetest/connectstagemyapplication1/entry/src/main/module.json b/ability/ability_runtime/freeinstalltest/connectabilitystagetest/connectstagemyapplication1/entry/src/main/module.json index 609fcefb2..7bc35e32a 100644 --- a/ability/ability_runtime/freeinstalltest/connectabilitystagetest/connectstagemyapplication1/entry/src/main/module.json +++ b/ability/ability_runtime/freeinstalltest/connectabilitystagetest/connectstagemyapplication1/entry/src/main/module.json @@ -7,7 +7,6 @@ "mainElement": "MainAbility", "deviceTypes": [ "default", - "phone", "tablet" ], "deliveryWithInstall": true, diff --git a/ability/ability_runtime/freeinstalltest/connectabilitystagetest/connectstagemyapplication2/entry/src/main/module.json b/ability/ability_runtime/freeinstalltest/connectabilitystagetest/connectstagemyapplication2/entry/src/main/module.json index 0753984bb..af8a46b64 100644 --- a/ability/ability_runtime/freeinstalltest/connectabilitystagetest/connectstagemyapplication2/entry/src/main/module.json +++ b/ability/ability_runtime/freeinstalltest/connectabilitystagetest/connectstagemyapplication2/entry/src/main/module.json @@ -7,7 +7,6 @@ "mainElement": "MainAbility", "deviceTypes": [ "default", - "phone", "tablet" ], "deliveryWithInstall": true, diff --git a/ability/ability_runtime/freeinstalltest/connectabilitystagetest/connectstagemyapplication3/entry/src/main/module.json b/ability/ability_runtime/freeinstalltest/connectabilitystagetest/connectstagemyapplication3/entry/src/main/module.json index cafff6f83..77b01e1ca 100644 --- a/ability/ability_runtime/freeinstalltest/connectabilitystagetest/connectstagemyapplication3/entry/src/main/module.json +++ b/ability/ability_runtime/freeinstalltest/connectabilitystagetest/connectstagemyapplication3/entry/src/main/module.json @@ -7,7 +7,6 @@ "mainElement": "MainAbility", "deviceTypes": [ "default", - "phone", "tablet" ], "deliveryWithInstall": true, diff --git a/ability/ability_runtime/freeinstalltest/connectabilitystagetest/connectstagemyapplication4/entry/src/main/module.json b/ability/ability_runtime/freeinstalltest/connectabilitystagetest/connectstagemyapplication4/entry/src/main/module.json index e0844712b..e1ea42011 100644 --- a/ability/ability_runtime/freeinstalltest/connectabilitystagetest/connectstagemyapplication4/entry/src/main/module.json +++ b/ability/ability_runtime/freeinstalltest/connectabilitystagetest/connectstagemyapplication4/entry/src/main/module.json @@ -7,7 +7,6 @@ "mainElement": "MainAbility", "deviceTypes": [ "default", - "phone", "tablet" ], "deliveryWithInstall": true, diff --git a/ability/ability_runtime/freeinstalltest/connectabilitystagetest/connectstagemyapplication5/entry/src/main/module.json b/ability/ability_runtime/freeinstalltest/connectabilitystagetest/connectstagemyapplication5/entry/src/main/module.json index 232318e7d..ff364d660 100644 --- a/ability/ability_runtime/freeinstalltest/connectabilitystagetest/connectstagemyapplication5/entry/src/main/module.json +++ b/ability/ability_runtime/freeinstalltest/connectabilitystagetest/connectstagemyapplication5/entry/src/main/module.json @@ -7,7 +7,6 @@ "mainElement": "MainAbility", "deviceTypes": [ "default", - "phone", "tablet" ], "deliveryWithInstall": true, diff --git a/ability/ability_runtime/freeinstalltest/connectabilitystagetest/connectstagemyapplication6/entry/src/main/module.json b/ability/ability_runtime/freeinstalltest/connectabilitystagetest/connectstagemyapplication6/entry/src/main/module.json index 7e0b93abd..c1efed96e 100644 --- a/ability/ability_runtime/freeinstalltest/connectabilitystagetest/connectstagemyapplication6/entry/src/main/module.json +++ b/ability/ability_runtime/freeinstalltest/connectabilitystagetest/connectstagemyapplication6/entry/src/main/module.json @@ -7,7 +7,6 @@ "mainElement": "MainAbility", "deviceTypes": [ "default", - "phone", "tablet" ], "deliveryWithInstall": true, diff --git a/ability/ability_runtime/freeinstalltest/connectabilitystagetest/connectstagemyapplication7/entry/src/main/module.json b/ability/ability_runtime/freeinstalltest/connectabilitystagetest/connectstagemyapplication7/entry/src/main/module.json index 6744f7fc6..a06383e72 100644 --- a/ability/ability_runtime/freeinstalltest/connectabilitystagetest/connectstagemyapplication7/entry/src/main/module.json +++ b/ability/ability_runtime/freeinstalltest/connectabilitystagetest/connectstagemyapplication7/entry/src/main/module.json @@ -7,7 +7,6 @@ "mainElement": "MainAbility", "deviceTypes": [ "default", - "phone", "tablet" ], "deliveryWithInstall": true, diff --git a/ability/ability_runtime/freeinstalltest/connectabilitystagetest/connectstagemyapplication8/entry/src/main/module.json b/ability/ability_runtime/freeinstalltest/connectabilitystagetest/connectstagemyapplication8/entry/src/main/module.json index 478e6066b..6a7f18aff 100644 --- a/ability/ability_runtime/freeinstalltest/connectabilitystagetest/connectstagemyapplication8/entry/src/main/module.json +++ b/ability/ability_runtime/freeinstalltest/connectabilitystagetest/connectstagemyapplication8/entry/src/main/module.json @@ -7,7 +7,6 @@ "mainElement": "MainAbility", "deviceTypes": [ "default", - "phone", "tablet" ], "deliveryWithInstall": true, diff --git a/ability/ability_runtime/freeinstalltest/mockservice/entry/src/main/module.json b/ability/ability_runtime/freeinstalltest/mockservice/entry/src/main/module.json index cd3297539..ea0f21c8b 100644 --- a/ability/ability_runtime/freeinstalltest/mockservice/entry/src/main/module.json +++ b/ability/ability_runtime/freeinstalltest/mockservice/entry/src/main/module.json @@ -6,8 +6,7 @@ "description": "$string:entry_desc", "mainElement": "MainAbility", "deviceTypes": [ - "default", - "phone" + "default" ], "requestPermissions": [ {"name": "ohos.permission.INSTALL_BUNDLE"}], "deliveryWithInstall": true, diff --git a/ability/ability_runtime/freeinstalltest/mockservicetimeout/entry/src/main/module.json b/ability/ability_runtime/freeinstalltest/mockservicetimeout/entry/src/main/module.json index cd3297539..ea0f21c8b 100644 --- a/ability/ability_runtime/freeinstalltest/mockservicetimeout/entry/src/main/module.json +++ b/ability/ability_runtime/freeinstalltest/mockservicetimeout/entry/src/main/module.json @@ -6,8 +6,7 @@ "description": "$string:entry_desc", "mainElement": "MainAbility", "deviceTypes": [ - "default", - "phone" + "default" ], "requestPermissions": [ {"name": "ohos.permission.INSTALL_BUNDLE"}], "deliveryWithInstall": true, diff --git a/ability/ability_runtime/freeinstalltest/startabilityfatest/actsfreeinstallstartabilityfatest/entry/src/main/config.json b/ability/ability_runtime/freeinstalltest/startabilityfatest/actsfreeinstallstartabilityfatest/entry/src/main/config.json index 22e9f23d2..2a76818c4 100644 --- a/ability/ability_runtime/freeinstalltest/startabilityfatest/actsfreeinstallstartabilityfatest/entry/src/main/config.json +++ b/ability/ability_runtime/freeinstalltest/startabilityfatest/actsfreeinstallstartabilityfatest/entry/src/main/config.json @@ -20,7 +20,6 @@ "mainAbility": ".MainAbility", "deviceType": [ "default", - "phone", "tablet" ], "abilities": [ diff --git a/ability/ability_runtime/freeinstalltest/startabilityfatest/actsstartabilitynotargetbundlelistfatest/entry/src/main/config.json b/ability/ability_runtime/freeinstalltest/startabilityfatest/actsstartabilitynotargetbundlelistfatest/entry/src/main/config.json index e2a3d25c2..b616bf8f9 100644 --- a/ability/ability_runtime/freeinstalltest/startabilityfatest/actsstartabilitynotargetbundlelistfatest/entry/src/main/config.json +++ b/ability/ability_runtime/freeinstalltest/startabilityfatest/actsstartabilitynotargetbundlelistfatest/entry/src/main/config.json @@ -17,7 +17,6 @@ "mainAbility": ".MainAbility", "deviceType": [ "default", - "phone", "tablet" ], "abilities": [ diff --git a/ability/ability_runtime/freeinstalltest/startabilityfatest/atomizationfaentry/entry/src/main/config.json b/ability/ability_runtime/freeinstalltest/startabilityfatest/atomizationfaentry/entry/src/main/config.json index f82162213..9f46d2668 100644 --- a/ability/ability_runtime/freeinstalltest/startabilityfatest/atomizationfaentry/entry/src/main/config.json +++ b/ability/ability_runtime/freeinstalltest/startabilityfatest/atomizationfaentry/entry/src/main/config.json @@ -18,8 +18,7 @@ "name": ".MyApplication", "mainAbility": ".MainAbility", "deviceType": [ - "default", - "phone" + "default" ], "distro": { "deliveryWithInstall": true, diff --git a/ability/ability_runtime/freeinstalltest/startabilityfatest/atomizationfahm2/entry/src/main/config.json b/ability/ability_runtime/freeinstalltest/startabilityfatest/atomizationfahm2/entry/src/main/config.json index 73338153d..28d4358ad 100644 --- a/ability/ability_runtime/freeinstalltest/startabilityfatest/atomizationfahm2/entry/src/main/config.json +++ b/ability/ability_runtime/freeinstalltest/startabilityfatest/atomizationfahm2/entry/src/main/config.json @@ -19,8 +19,7 @@ "mainAbility": ".MainAbility", "srcPath": "", "deviceType": [ - "default", - "phone" + "default" ], "distro": { "deliveryWithInstall": true, diff --git a/ability/ability_runtime/freeinstalltest/startabilityfatest/atomizationfahm4/entry/src/main/config.json b/ability/ability_runtime/freeinstalltest/startabilityfatest/atomizationfahm4/entry/src/main/config.json index 3e52e38ff..08ad0ff9f 100644 --- a/ability/ability_runtime/freeinstalltest/startabilityfatest/atomizationfahm4/entry/src/main/config.json +++ b/ability/ability_runtime/freeinstalltest/startabilityfatest/atomizationfahm4/entry/src/main/config.json @@ -19,8 +19,7 @@ "mainAbility": ".MainAbility", "srcPath": "", "deviceType": [ - "default", - "phone" + "default" ], "distro": { "deliveryWithInstall": true, diff --git a/ability/ability_runtime/freeinstalltest/startabilityfatest/famyapplication1/entry/src/main/config.json b/ability/ability_runtime/freeinstalltest/startabilityfatest/famyapplication1/entry/src/main/config.json index 88c725016..d553dea67 100644 --- a/ability/ability_runtime/freeinstalltest/startabilityfatest/famyapplication1/entry/src/main/config.json +++ b/ability/ability_runtime/freeinstalltest/startabilityfatest/famyapplication1/entry/src/main/config.json @@ -16,8 +16,7 @@ "module": { "mainAbility": ".MainAbility1", "deviceType": [ - "default", - "phone" + "default" ], "abilities": [ { diff --git a/ability/ability_runtime/freeinstalltest/startabilityforresultfatest/actsfreeinstallstartabilityforresultfatest/entry/src/main/config.json b/ability/ability_runtime/freeinstalltest/startabilityforresultfatest/actsfreeinstallstartabilityforresultfatest/entry/src/main/config.json index 35447c5a7..ea117659f 100644 --- a/ability/ability_runtime/freeinstalltest/startabilityforresultfatest/actsfreeinstallstartabilityforresultfatest/entry/src/main/config.json +++ b/ability/ability_runtime/freeinstalltest/startabilityforresultfatest/actsfreeinstallstartabilityforresultfatest/entry/src/main/config.json @@ -20,7 +20,6 @@ "mainAbility": ".MainAbility", "deviceType": [ "default", - "phone", "tablet" ], "abilities": [ diff --git a/ability/ability_runtime/freeinstalltest/startabilityforresultfatest/actsstartabilityforresultnotargetfatest/entry/src/main/config.json b/ability/ability_runtime/freeinstalltest/startabilityforresultfatest/actsstartabilityforresultnotargetfatest/entry/src/main/config.json index 74248c803..477a33158 100644 --- a/ability/ability_runtime/freeinstalltest/startabilityforresultfatest/actsstartabilityforresultnotargetfatest/entry/src/main/config.json +++ b/ability/ability_runtime/freeinstalltest/startabilityforresultfatest/actsstartabilityforresultnotargetfatest/entry/src/main/config.json @@ -17,7 +17,6 @@ "mainAbility": ".MainAbility", "deviceType": [ "default", - "phone", "tablet" ], "abilities": [ diff --git a/ability/ability_runtime/freeinstalltest/startabilityforresultfatest/atomizationresulta/entry/src/main/config.json b/ability/ability_runtime/freeinstalltest/startabilityforresultfatest/atomizationresulta/entry/src/main/config.json index 410ec6177..b76422435 100644 --- a/ability/ability_runtime/freeinstalltest/startabilityforresultfatest/atomizationresulta/entry/src/main/config.json +++ b/ability/ability_runtime/freeinstalltest/startabilityforresultfatest/atomizationresulta/entry/src/main/config.json @@ -19,8 +19,7 @@ "mainAbility": ".MainAbility", "srcPath": "", "deviceType": [ - "default", - "phone" + "default" ], "distro": { "deliveryWithInstall": true, diff --git a/ability/ability_runtime/freeinstalltest/startabilityforresultfatest/atomizationresultfaentry/entry/src/main/config.json b/ability/ability_runtime/freeinstalltest/startabilityforresultfatest/atomizationresultfaentry/entry/src/main/config.json index bf2c4bdd8..71c232d68 100644 --- a/ability/ability_runtime/freeinstalltest/startabilityforresultfatest/atomizationresultfaentry/entry/src/main/config.json +++ b/ability/ability_runtime/freeinstalltest/startabilityforresultfatest/atomizationresultfaentry/entry/src/main/config.json @@ -19,8 +19,7 @@ "mainAbility": ".MainAbility", "srcPath": "", "deviceType": [ - "default", - "phone" + "default" ], "distro": { "deliveryWithInstall": true, diff --git a/ability/ability_runtime/freeinstalltest/startabilityforresultfatest/atomizationresultfahm1/entry/src/main/config.json b/ability/ability_runtime/freeinstalltest/startabilityforresultfatest/atomizationresultfahm1/entry/src/main/config.json index 98cb3fa60..4b0e8589a 100644 --- a/ability/ability_runtime/freeinstalltest/startabilityforresultfatest/atomizationresultfahm1/entry/src/main/config.json +++ b/ability/ability_runtime/freeinstalltest/startabilityforresultfatest/atomizationresultfahm1/entry/src/main/config.json @@ -19,8 +19,7 @@ "mainAbility": ".MainAbility", "srcPath": "", "deviceType": [ - "default", - "phone" + "default" ], "distro": { "deliveryWithInstall": true, diff --git a/ability/ability_runtime/freeinstalltest/startabilityforresultfatest/atomizationresultfahm2/entry/src/main/config.json b/ability/ability_runtime/freeinstalltest/startabilityforresultfatest/atomizationresultfahm2/entry/src/main/config.json index ba68362c3..6497716b6 100644 --- a/ability/ability_runtime/freeinstalltest/startabilityforresultfatest/atomizationresultfahm2/entry/src/main/config.json +++ b/ability/ability_runtime/freeinstalltest/startabilityforresultfatest/atomizationresultfahm2/entry/src/main/config.json @@ -19,8 +19,7 @@ "mainAbility": ".MainAbility", "srcPath": "", "deviceType": [ - "default", - "phone" + "default" ], "distro": { "deliveryWithInstall": true, diff --git a/ability/ability_runtime/freeinstalltest/startabilityforresultfatest/faresultmyapplication1/entry/src/main/config.json b/ability/ability_runtime/freeinstalltest/startabilityforresultfatest/faresultmyapplication1/entry/src/main/config.json index 72cb78a7a..5a75be1f6 100644 --- a/ability/ability_runtime/freeinstalltest/startabilityforresultfatest/faresultmyapplication1/entry/src/main/config.json +++ b/ability/ability_runtime/freeinstalltest/startabilityforresultfatest/faresultmyapplication1/entry/src/main/config.json @@ -17,7 +17,6 @@ "mainAbility": ".MainAbility1", "deviceType": [ "default", - "phone", "tablet" ], "abilities": [ diff --git a/ability/ability_runtime/freeinstalltest/startabilityforresultstagetest/actsfreeinstallstartabilityforresultstagetest/entry/src/main/module.json b/ability/ability_runtime/freeinstalltest/startabilityforresultstagetest/actsfreeinstallstartabilityforresultstagetest/entry/src/main/module.json index af04d14f6..5772ab67c 100644 --- a/ability/ability_runtime/freeinstalltest/startabilityforresultstagetest/actsfreeinstallstartabilityforresultstagetest/entry/src/main/module.json +++ b/ability/ability_runtime/freeinstalltest/startabilityforresultstagetest/actsfreeinstallstartabilityforresultstagetest/entry/src/main/module.json @@ -7,7 +7,6 @@ "mainElement": "MainAbility", "deviceTypes": [ "default", - "phone", "tablet" ], "deliveryWithInstall": true, diff --git a/ability/ability_runtime/freeinstalltest/startabilityforresultstagetest/actsstartabilityforresultnotargetbundleliststagetest/entry/src/main/module.json b/ability/ability_runtime/freeinstalltest/startabilityforresultstagetest/actsstartabilityforresultnotargetbundleliststagetest/entry/src/main/module.json index af04d14f6..5772ab67c 100644 --- a/ability/ability_runtime/freeinstalltest/startabilityforresultstagetest/actsstartabilityforresultnotargetbundleliststagetest/entry/src/main/module.json +++ b/ability/ability_runtime/freeinstalltest/startabilityforresultstagetest/actsstartabilityforresultnotargetbundleliststagetest/entry/src/main/module.json @@ -7,7 +7,6 @@ "mainElement": "MainAbility", "deviceTypes": [ "default", - "phone", "tablet" ], "deliveryWithInstall": true, diff --git a/ability/ability_runtime/freeinstalltest/startabilityforresultstagetest/atomizationresultstageentry/entry/src/main/module.json b/ability/ability_runtime/freeinstalltest/startabilityforresultstagetest/atomizationresultstageentry/entry/src/main/module.json index 3ecd447ec..91476a305 100644 --- a/ability/ability_runtime/freeinstalltest/startabilityforresultstagetest/atomizationresultstageentry/entry/src/main/module.json +++ b/ability/ability_runtime/freeinstalltest/startabilityforresultstagetest/atomizationresultstageentry/entry/src/main/module.json @@ -7,7 +7,6 @@ "mainElement": "MainAbility", "deviceTypes": [ "default", - "phone", "tablet" ], "deliveryWithInstall": true, diff --git a/ability/ability_runtime/freeinstalltest/startabilityforresultstagetest/atomizationresultstagehm2/entry/src/main/module.json b/ability/ability_runtime/freeinstalltest/startabilityforresultstagetest/atomizationresultstagehm2/entry/src/main/module.json index f22c3e8fe..75cca7824 100644 --- a/ability/ability_runtime/freeinstalltest/startabilityforresultstagetest/atomizationresultstagehm2/entry/src/main/module.json +++ b/ability/ability_runtime/freeinstalltest/startabilityforresultstagetest/atomizationresultstagehm2/entry/src/main/module.json @@ -7,7 +7,6 @@ "mainElement": "MainAbility", "deviceTypes": [ "default", - "phone", "tablet" ], "deliveryWithInstall": true, diff --git a/ability/ability_runtime/freeinstalltest/startabilityforresultstagetest/atomizationresultstagehnm2/entry/src/main/module.json b/ability/ability_runtime/freeinstalltest/startabilityforresultstagetest/atomizationresultstagehnm2/entry/src/main/module.json index 1569ee82b..b7ab4cd75 100644 --- a/ability/ability_runtime/freeinstalltest/startabilityforresultstagetest/atomizationresultstagehnm2/entry/src/main/module.json +++ b/ability/ability_runtime/freeinstalltest/startabilityforresultstagetest/atomizationresultstagehnm2/entry/src/main/module.json @@ -7,7 +7,6 @@ "mainElement": "MainAbility", "deviceTypes": [ "default", - "phone", "tablet" ], "deliveryWithInstall": true, diff --git a/ability/ability_runtime/freeinstalltest/startabilityforresultstagetest/stageresultmyapplication1/entry/src/main/module.json b/ability/ability_runtime/freeinstalltest/startabilityforresultstagetest/stageresultmyapplication1/entry/src/main/module.json index 88c6c58c2..20f9f942e 100644 --- a/ability/ability_runtime/freeinstalltest/startabilityforresultstagetest/stageresultmyapplication1/entry/src/main/module.json +++ b/ability/ability_runtime/freeinstalltest/startabilityforresultstagetest/stageresultmyapplication1/entry/src/main/module.json @@ -7,7 +7,6 @@ "mainElement": "MainAbility1", "deviceTypes": [ "default", - "phone", "tablet" ], "deliveryWithInstall": true, diff --git a/ability/ability_runtime/freeinstalltest/startabilitystagetest/actsfreeinstallstartabilitystagetest/entry/src/main/module.json b/ability/ability_runtime/freeinstalltest/startabilitystagetest/actsfreeinstallstartabilitystagetest/entry/src/main/module.json index e4c26cd0c..a4f6dcd2a 100644 --- a/ability/ability_runtime/freeinstalltest/startabilitystagetest/actsfreeinstallstartabilitystagetest/entry/src/main/module.json +++ b/ability/ability_runtime/freeinstalltest/startabilitystagetest/actsfreeinstallstartabilitystagetest/entry/src/main/module.json @@ -1,80 +1,79 @@ { - "module": { - "name": "entry", - "type": "entry", - "srcEntrance": "./ets/Application/AbilityStage.ts", - "description": "$string:entry_desc", - "mainElement": "MainAbility", - "deviceTypes": [ + "module": { + "name": "entry", + "type": "entry", + "srcEntrance": "./ets/Application/AbilityStage.ts", + "description": "$string:entry_desc", + "mainElement": "MainAbility", + "deviceTypes": [ "default", - "phone", - "tablet" - ], - "deliveryWithInstall": true, - "installationFree": false, - "pages": "$profile:main_pages", - "uiSyntax": "ets", - "abilities": [ - { - "name": "com.open.harmony.packagemag.MainAbility", - "srcEntrance": "./ets/MainAbility/MainAbility.ts", - "description": "$string:MainAbility_desc", - "icon": "$media:icon", - "label": "$string:MainAbility_label", - "visible": true, - "skills": [ - { - "entities": [ - "entity.system.home" - ], - "actions": [ - "action.system.home" - ] - } - ] - }, - { - "name": "MainAbility1", - "srcEntrance": "./ets/MainAbility1/MainAbility1.ts", - "description": "$string:MainAbility1_desc", - "icon": "$media:icon", - "label": "$string:MainAbility1_label" - } - ], - "requestPermissions": [ - { - "name": "ohos.permission.GET_BUNDLE_INFO_PRIVILEGED" - }, - { - "name": "ohos.permission.GET_BUNDLE_INFO" - }, - { - "name": "ohos.permission.CHANGE_ABILITY_ENABLED_STATE" - }, - { - "name": "ohos.permission.DISTRIBUTED_DATASYNC" - }, - { - "name":"ohos.permission.START_ABILITIES_FROM_BACKGROUND" - }, - { - "name":"ohos.permission.START_INVISIBLE_ABILITY" - } - ], - "extensionAbilities": [ - { - "name": "com.open.harmony.packagemag.ServiceAbility", - "srcEntrance": "./ets/ServiceAbility/ServiceAbility.ts", - "label": "$string:form_ServiceAbility_label", - "description": "$string:form_ServiceAbility_desc", - "type": "service", - "metadata": [ - { - "name": "ohos.extension.form", - "resource": "$profile:form_config" - } - ] - } - ] - } - } \ No newline at end of file + "tablet" + ], + "deliveryWithInstall": true, + "installationFree": false, + "pages": "$profile:main_pages", + "uiSyntax": "ets", + "abilities": [ + { + "name": "com.open.harmony.packagemag.MainAbility", + "srcEntrance": "./ets/MainAbility/MainAbility.ts", + "description": "$string:MainAbility_desc", + "icon": "$media:icon", + "label": "$string:MainAbility_label", + "visible": true, + "skills": [ + { + "entities": [ + "entity.system.home" + ], + "actions": [ + "action.system.home" + ] + } + ] + }, + { + "name": "MainAbility1", + "srcEntrance": "./ets/MainAbility1/MainAbility1.ts", + "description": "$string:MainAbility1_desc", + "icon": "$media:icon", + "label": "$string:MainAbility1_label" + } + ], + "requestPermissions": [ + { + "name": "ohos.permission.GET_BUNDLE_INFO_PRIVILEGED" + }, + { + "name": "ohos.permission.GET_BUNDLE_INFO" + }, + { + "name": "ohos.permission.CHANGE_ABILITY_ENABLED_STATE" + }, + { + "name": "ohos.permission.DISTRIBUTED_DATASYNC" + }, + { + "name": "ohos.permission.START_ABILITIES_FROM_BACKGROUND" + }, + { + "name": "ohos.permission.START_INVISIBLE_ABILITY" + } + ], + "extensionAbilities": [ + { + "name": "com.open.harmony.packagemag.ServiceAbility", + "srcEntrance": "./ets/ServiceAbility/ServiceAbility.ts", + "label": "$string:form_ServiceAbility_label", + "description": "$string:form_ServiceAbility_desc", + "type": "service", + "metadata": [ + { + "name": "ohos.extension.form", + "resource": "$profile:form_config" + } + ] + } + ] + } +} \ No newline at end of file diff --git a/ability/ability_runtime/freeinstalltest/startabilitystagetest/actsstartabilitynotargetbundleliststagetest/entry/src/main/module.json b/ability/ability_runtime/freeinstalltest/startabilitystagetest/actsstartabilitynotargetbundleliststagetest/entry/src/main/module.json index 2050df38b..56ad2c95b 100644 --- a/ability/ability_runtime/freeinstalltest/startabilitystagetest/actsstartabilitynotargetbundleliststagetest/entry/src/main/module.json +++ b/ability/ability_runtime/freeinstalltest/startabilitystagetest/actsstartabilitynotargetbundleliststagetest/entry/src/main/module.json @@ -7,7 +7,6 @@ "mainElement": "MainAbility", "deviceTypes": [ "default", - "phone", "tablet" ], "deliveryWithInstall": true, diff --git a/ability/ability_runtime/freeinstalltest/startabilitystagetest/atomizationstageentry/entry/src/main/module.json b/ability/ability_runtime/freeinstalltest/startabilitystagetest/atomizationstageentry/entry/src/main/module.json index a9bc619bd..3e1063d9d 100644 --- a/ability/ability_runtime/freeinstalltest/startabilitystagetest/atomizationstageentry/entry/src/main/module.json +++ b/ability/ability_runtime/freeinstalltest/startabilitystagetest/atomizationstageentry/entry/src/main/module.json @@ -1,67 +1,66 @@ { - "module": { - "name": "entry", - "type": "entry", - "srcEntrance": "./ets/Application/AbilityStage.ts", - "description": "$string:entry_desc", - "mainElement": "MainAbility", - "deviceTypes": [ + "module": { + "name": "entry", + "type": "entry", + "srcEntrance": "./ets/Application/AbilityStage.ts", + "description": "$string:entry_desc", + "mainElement": "MainAbility", + "deviceTypes": [ "default", - "phone", - "tablet" - ], - "deliveryWithInstall": true, - "installationFree": true, - "pages": "$profile:main_pages", - "uiSyntax": "ets", - "abilities": [ - { - "name": "com.example.qianyiyingyong.MainAbility", - "srcEntrance": "./ets/MainAbility/MainAbility.ts", - "description": "$string:MainAbility_desc", - "icon": "$media:icon", - "label": "$string:MainAbility_label", - "visible": true, - "skills": [ - { - "entities": [ - "entity.system.home" - ], - "actions": [ - "action.system.home" - ] - } - ] - } - ], - "requestPermissions": [ - { - "name": "ohos.permission.GET_BUNDLE_INFO_PRIVILEGED" - }, - { - "name": "ohos.permission.GET_BUNDLE_INFO" - }, - { - "name": "ohos.permission.CHANGE_ABILITY_ENABLED_STATE" - }, - { - "name": "ohos.permission.DISTRIBUTED_DATASYNC" - } - ], - "extensionAbilities": [ - { - "name": "com.example.qianyiyingyong.ServiceAbility", - "srcEntrance": "./ets/ServiceAbility/ServiceAbility.ts", - "label": "$string:form_ServiceAbility_label", - "description": "$string:form_ServiceAbility_desc", - "type": "service", - "metadata": [ - { - "name": "ohos.extension.form", - "resource": "$profile:form_config" - } - ] - } - ] - } - } \ No newline at end of file + "tablet" + ], + "deliveryWithInstall": true, + "installationFree": true, + "pages": "$profile:main_pages", + "uiSyntax": "ets", + "abilities": [ + { + "name": "com.example.qianyiyingyong.MainAbility", + "srcEntrance": "./ets/MainAbility/MainAbility.ts", + "description": "$string:MainAbility_desc", + "icon": "$media:icon", + "label": "$string:MainAbility_label", + "visible": true, + "skills": [ + { + "entities": [ + "entity.system.home" + ], + "actions": [ + "action.system.home" + ] + } + ] + } + ], + "requestPermissions": [ + { + "name": "ohos.permission.GET_BUNDLE_INFO_PRIVILEGED" + }, + { + "name": "ohos.permission.GET_BUNDLE_INFO" + }, + { + "name": "ohos.permission.CHANGE_ABILITY_ENABLED_STATE" + }, + { + "name": "ohos.permission.DISTRIBUTED_DATASYNC" + } + ], + "extensionAbilities": [ + { + "name": "com.example.qianyiyingyong.ServiceAbility", + "srcEntrance": "./ets/ServiceAbility/ServiceAbility.ts", + "label": "$string:form_ServiceAbility_label", + "description": "$string:form_ServiceAbility_desc", + "type": "service", + "metadata": [ + { + "name": "ohos.extension.form", + "resource": "$profile:form_config" + } + ] + } + ] + } +} \ No newline at end of file diff --git a/ability/ability_runtime/freeinstalltest/startabilitystagetest/atomizationstagehm2/entry/src/main/module.json b/ability/ability_runtime/freeinstalltest/startabilitystagetest/atomizationstagehm2/entry/src/main/module.json index ae8721b06..71879587c 100644 --- a/ability/ability_runtime/freeinstalltest/startabilitystagetest/atomizationstagehm2/entry/src/main/module.json +++ b/ability/ability_runtime/freeinstalltest/startabilitystagetest/atomizationstagehm2/entry/src/main/module.json @@ -1,52 +1,51 @@ { - "module": { - "name": "hnm2", - "type": "feature", - "srcEntrance": "./ets/Application/AbilityStage.ts", - "description": "$string:hnm2_desc", - "mainElement": "MainAbility", - "deviceTypes": [ + "module": { + "name": "hnm2", + "type": "feature", + "srcEntrance": "./ets/Application/AbilityStage.ts", + "description": "$string:hnm2_desc", + "mainElement": "MainAbility", + "deviceTypes": [ "default", - "phone", - "tablet" - ], - "deliveryWithInstall": true, - "installationFree": false, - "pages": "$profile:main_pages", - "uiSyntax": "ets", - "abilities": [ - { - "name": "com.example.hm2.MainAbility", - "srcEntrance": "./ets/MainAbility/MainAbility.ts", - "description": "$string:MainAbility_desc", - "icon": "$media:icon", - "label": "$string:MainAbility_label", - "visible": true, - "skills": [ - { - "entities": [ - "entity.system.home" - ], - "actions": [ - "action.system.home" - ] - } - ] - } - ], - "requestPermissions": [ - { - "name": "ohos.permission.GET_BUNDLE_INFO_PRIVILEGED" - }, - { - "name": "ohos.permission.GET_BUNDLE_INFO" - }, - { - "name": "ohos.permission.CHANGE_ABILITY_ENABLED_STATE" - }, - { - "name": "ohos.permission.DISTRIBUTED_DATASYNC" - } - ] - } - } \ No newline at end of file + "tablet" + ], + "deliveryWithInstall": true, + "installationFree": false, + "pages": "$profile:main_pages", + "uiSyntax": "ets", + "abilities": [ + { + "name": "com.example.hm2.MainAbility", + "srcEntrance": "./ets/MainAbility/MainAbility.ts", + "description": "$string:MainAbility_desc", + "icon": "$media:icon", + "label": "$string:MainAbility_label", + "visible": true, + "skills": [ + { + "entities": [ + "entity.system.home" + ], + "actions": [ + "action.system.home" + ] + } + ] + } + ], + "requestPermissions": [ + { + "name": "ohos.permission.GET_BUNDLE_INFO_PRIVILEGED" + }, + { + "name": "ohos.permission.GET_BUNDLE_INFO" + }, + { + "name": "ohos.permission.CHANGE_ABILITY_ENABLED_STATE" + }, + { + "name": "ohos.permission.DISTRIBUTED_DATASYNC" + } + ] + } +} \ No newline at end of file diff --git a/ability/ability_runtime/freeinstalltest/startabilitystagetest/atomizationstagehm4/entry/src/main/module.json b/ability/ability_runtime/freeinstalltest/startabilitystagetest/atomizationstagehm4/entry/src/main/module.json index 9321c9b25..dbbcce16c 100644 --- a/ability/ability_runtime/freeinstalltest/startabilitystagetest/atomizationstagehm4/entry/src/main/module.json +++ b/ability/ability_runtime/freeinstalltest/startabilitystagetest/atomizationstagehm4/entry/src/main/module.json @@ -7,7 +7,6 @@ "mainElement": "MainAbility", "deviceTypes": [ "default", - "phone", "tablet" ], "deliveryWithInstall": true, diff --git a/ability/ability_runtime/freeinstalltest/startabilitystagetest/stagemyapplication1/entry/src/main/module.json b/ability/ability_runtime/freeinstalltest/startabilitystagetest/stagemyapplication1/entry/src/main/module.json index 973365f5d..581880d0f 100644 --- a/ability/ability_runtime/freeinstalltest/startabilitystagetest/stagemyapplication1/entry/src/main/module.json +++ b/ability/ability_runtime/freeinstalltest/startabilitystagetest/stagemyapplication1/entry/src/main/module.json @@ -7,7 +7,6 @@ "mainElement": "MainAbility", "deviceTypes": [ "default", - "phone", "tablet" ], "deliveryWithInstall": true, diff --git a/ability/ability_runtime/killprocesswithaccountstage/ActsKillProcessWithAccountRelyHap/entry/src/main/module.json b/ability/ability_runtime/killprocesswithaccountstage/ActsKillProcessWithAccountRelyHap/entry/src/main/module.json index d64acbeb2..ee022dba9 100644 --- a/ability/ability_runtime/killprocesswithaccountstage/ActsKillProcessWithAccountRelyHap/entry/src/main/module.json +++ b/ability/ability_runtime/killprocesswithaccountstage/ActsKillProcessWithAccountRelyHap/entry/src/main/module.json @@ -6,8 +6,7 @@ "description": "$string:phone_entry_dsc", "mainElement": "MainAbility", "deviceTypes": [ - "default", - "phone" + "default" ], "deliveryWithInstall": true, "installationFree": false, diff --git a/ability/ability_runtime/killprocesswithaccountstage/ActsKillProcessWithAccountTest/entry/src/main/module.json b/ability/ability_runtime/killprocesswithaccountstage/ActsKillProcessWithAccountTest/entry/src/main/module.json index ee7c929a8..f6541c5d8 100644 --- a/ability/ability_runtime/killprocesswithaccountstage/ActsKillProcessWithAccountTest/entry/src/main/module.json +++ b/ability/ability_runtime/killprocesswithaccountstage/ActsKillProcessWithAccountTest/entry/src/main/module.json @@ -1,85 +1,84 @@ { - "module": { - "name": "phone", - "type": "entry", - "srcEntrance": "./ets/Application/AbilityStage.ts", - "description": "$string:phone_entry_dsc", - "mainElement": "MainAbility", - "deviceTypes": [ - "default", - "phone" - ], - "deliveryWithInstall": true, - "installationFree": false, - "uiSyntax": "ets", - "pages": "$profile:main_pages", - "abilities": [ - { - "name": "com.acts.killprocesswithaccount.MainAbility", - "srcEntrance": "./ets/MainAbility/MainAbility.ts", - "description": "$string:phone_entry_main", - "icon": "$media:icon", - "label": "$string:entry_label", - "visible": true, - "orientation": "portrait", - "launchType": "singleton", - "skills": [ - { - "actions": [ - "action.system.home" - ], - "entities":[ - "entity.system.home" - ] - } - ] - } - ], - "requestPermissions": [ - { - "name":"ohos.permission.GET_BUNDLE_INFO_PRIVILEGED", - "reason":"need use ohos.permission.GET_BUNDLE_INFO_PRIVILEGED" - }, - { - "name":"ohos.permission.GET_BUNDLE_INFO", - "reason":"need use ohos.permission.GET_BUNDLE_INFO" - }, - { - "name":"ohos.permission.CHANGE_ABILITY_ENABLED_STATE", - "reason":"need use ohos.permission.CHANGE_ABILITY_ENABLED_STATE" - }, - { - "name":"ohos.permission.REMOVE_CACHE_FILES", - "reason":"need use ohos.permission.REMOVE_CACHE_FILES" - }, - { - "name":"ohos.permission.LISTEN_BUNDLE_CHANGE", - "reason":"need use ohos.permission.LISTEN_BUNDLE_CHANGE" - }, - { - "name":"ohos.permission.MANAGE_MISSIONS", - "reason":"need use ohos.permission.MANAGE_MISSIONS" - }, - { - "name":"ohos.permission.GET_RUNNING_INFO", - "reason":"need use ohos.permission.GET_RUNNING_INFO" - }, - { - "name":"ohos.permission.INTERACT_ACROSS_LOCAL_ACCOUNTS", - "reason":"need use ohos.permission.GET_RUNNING_INFO" - }, - { - "name":"ohos.permission.CLEAN_BACKGROUND_PROCESSES", - "reason":"need use ohos.permission.GET_RUNNING_INFO" - }, - { - "name":"ohos.permission.START_ABILITIES_FROM_BACKGROUND", - "reason":"need use ohos.permission.START_ABILITIES_FROM_BACKGROUND" - }, - { - "name":"ohos.permission.START_INVISIBLE_ABILITY", - "reason":"need use ohos.permission.START_INVISIBLE_ABILITY" - } - ] - } -} + "module": { + "name": "phone", + "type": "entry", + "srcEntrance": "./ets/Application/AbilityStage.ts", + "description": "$string:phone_entry_dsc", + "mainElement": "MainAbility", + "deviceTypes": [ + "default" + ], + "deliveryWithInstall": true, + "installationFree": false, + "uiSyntax": "ets", + "pages": "$profile:main_pages", + "abilities": [ + { + "name": "com.acts.killprocesswithaccount.MainAbility", + "srcEntrance": "./ets/MainAbility/MainAbility.ts", + "description": "$string:phone_entry_main", + "icon": "$media:icon", + "label": "$string:entry_label", + "visible": true, + "orientation": "portrait", + "launchType": "singleton", + "skills": [ + { + "actions": [ + "action.system.home" + ], + "entities": [ + "entity.system.home" + ] + } + ] + } + ], + "requestPermissions": [ + { + "name": "ohos.permission.GET_BUNDLE_INFO_PRIVILEGED", + "reason": "need use ohos.permission.GET_BUNDLE_INFO_PRIVILEGED" + }, + { + "name": "ohos.permission.GET_BUNDLE_INFO", + "reason": "need use ohos.permission.GET_BUNDLE_INFO" + }, + { + "name": "ohos.permission.CHANGE_ABILITY_ENABLED_STATE", + "reason": "need use ohos.permission.CHANGE_ABILITY_ENABLED_STATE" + }, + { + "name": "ohos.permission.REMOVE_CACHE_FILES", + "reason": "need use ohos.permission.REMOVE_CACHE_FILES" + }, + { + "name": "ohos.permission.LISTEN_BUNDLE_CHANGE", + "reason": "need use ohos.permission.LISTEN_BUNDLE_CHANGE" + }, + { + "name": "ohos.permission.MANAGE_MISSIONS", + "reason": "need use ohos.permission.MANAGE_MISSIONS" + }, + { + "name": "ohos.permission.GET_RUNNING_INFO", + "reason": "need use ohos.permission.GET_RUNNING_INFO" + }, + { + "name": "ohos.permission.INTERACT_ACROSS_LOCAL_ACCOUNTS", + "reason": "need use ohos.permission.GET_RUNNING_INFO" + }, + { + "name": "ohos.permission.CLEAN_BACKGROUND_PROCESSES", + "reason": "need use ohos.permission.GET_RUNNING_INFO" + }, + { + "name": "ohos.permission.START_ABILITIES_FROM_BACKGROUND", + "reason": "need use ohos.permission.START_ABILITIES_FROM_BACKGROUND" + }, + { + "name": "ohos.permission.START_INVISIBLE_ABILITY", + "reason": "need use ohos.permission.START_INVISIBLE_ABILITY" + } + ] + } +} \ No newline at end of file diff --git a/ability/ability_runtime/newwant/actsnewwantapi7relyhap/entry/src/main/config.json b/ability/ability_runtime/newwant/actsnewwantapi7relyhap/entry/src/main/config.json index 8f852119c..02cdbd7af 100644 --- a/ability/ability_runtime/newwant/actsnewwantapi7relyhap/entry/src/main/config.json +++ b/ability/ability_runtime/newwant/actsnewwantapi7relyhap/entry/src/main/config.json @@ -17,8 +17,7 @@ "package": "com.example.newwanthapapi7", "name": ".MyApplication", "deviceType": [ - "default", - "phone" + "default" ], "distro": { "deliveryWithInstall": true, diff --git a/ability/ability_runtime/newwant/actsnewwantarelyhap/entry/src/main/module.json b/ability/ability_runtime/newwant/actsnewwantarelyhap/entry/src/main/module.json index 90b1bea00..1fa9958ea 100644 --- a/ability/ability_runtime/newwant/actsnewwantarelyhap/entry/src/main/module.json +++ b/ability/ability_runtime/newwant/actsnewwantarelyhap/entry/src/main/module.json @@ -1,70 +1,68 @@ { - "module": { - "name": "phone", - "type": "entry", - "srcEntrance": "./ets/Application/AbilityStage.ts", - "description": "$string:phone_entry_dsc", - "mainElement": "MainAbility", - "deviceTypes": [ - "default", - "phone" - ], - "deliveryWithInstall": true, - "installationFree": false, - "uiSyntax": "ets", - "pages": "$profile:main_pages", - "abilities": [ - { - "name": "com.example.newwanthapc.MainAbility", - "srcEntrance": "./ets/MainAbility/MainAbility.ts", - "description": "$string:phone_entry_main", - "icon": "$media:icon", - "label": "$string:entry_label", - "visible": true, - "launchType": "singleton", - "orientation": "portrait", - "skills": [ - { - "actions": [ - "action.system.home" - ], - "entities":[ - "entity.system.home" - ] - } - ] - } - ], - "requestPermissions": [ - { - "name":"ohos.permission.GET_BUNDLE_INFO_PRIVILEGED", - "reason":"need use ohos.permission.GET_BUNDLE_INFO_PRIVILEGED" - }, - { - "name":"ohos.permission.GET_BUNDLE_INFO", - "reason":"need use ohos.permission.GET_BUNDLE_INFO" - }, - { - "name":"ohos.permission.CHANGE_ABILITY_ENABLED_STATE", - "reason":"need use ohos.permission.CHANGE_ABILITY_ENABLED_STATE" - }, - { - "name":"ohos.permission.REMOVE_CACHE_FILES", - "reason":"need use ohos.permission.REMOVE_CACHE_FILES" - }, - { - "name":"ohos.permission.LISTEN_BUNDLE_CHANGE", - "reason":"need use ohos.permission.LISTEN_BUNDLE_CHANGE" - }, - { - "name":"ohos.permission.INSTALL_BUNDLE", - "reason":"need use ohos.permission.INSTALL_BUNDLE" - }, - { - "name":"ohos.permission.START_ABILITIES_FROM_BACKGROUND", - "reason":"need use ohos.permission.START_ABILITIES_FROM_BACKGROUND" - } - ] - - } -} + "module": { + "name": "phone", + "type": "entry", + "srcEntrance": "./ets/Application/AbilityStage.ts", + "description": "$string:phone_entry_dsc", + "mainElement": "MainAbility", + "deviceTypes": [ + "default" + ], + "deliveryWithInstall": true, + "installationFree": false, + "uiSyntax": "ets", + "pages": "$profile:main_pages", + "abilities": [ + { + "name": "com.example.newwanthapc.MainAbility", + "srcEntrance": "./ets/MainAbility/MainAbility.ts", + "description": "$string:phone_entry_main", + "icon": "$media:icon", + "label": "$string:entry_label", + "visible": true, + "launchType": "singleton", + "orientation": "portrait", + "skills": [ + { + "actions": [ + "action.system.home" + ], + "entities": [ + "entity.system.home" + ] + } + ] + } + ], + "requestPermissions": [ + { + "name": "ohos.permission.GET_BUNDLE_INFO_PRIVILEGED", + "reason": "need use ohos.permission.GET_BUNDLE_INFO_PRIVILEGED" + }, + { + "name": "ohos.permission.GET_BUNDLE_INFO", + "reason": "need use ohos.permission.GET_BUNDLE_INFO" + }, + { + "name": "ohos.permission.CHANGE_ABILITY_ENABLED_STATE", + "reason": "need use ohos.permission.CHANGE_ABILITY_ENABLED_STATE" + }, + { + "name": "ohos.permission.REMOVE_CACHE_FILES", + "reason": "need use ohos.permission.REMOVE_CACHE_FILES" + }, + { + "name": "ohos.permission.LISTEN_BUNDLE_CHANGE", + "reason": "need use ohos.permission.LISTEN_BUNDLE_CHANGE" + }, + { + "name": "ohos.permission.INSTALL_BUNDLE", + "reason": "need use ohos.permission.INSTALL_BUNDLE" + }, + { + "name": "ohos.permission.START_ABILITIES_FROM_BACKGROUND", + "reason": "need use ohos.permission.START_ABILITIES_FROM_BACKGROUND" + } + ] + } +} \ No newline at end of file diff --git a/ability/ability_runtime/newwant/actsnewwantbrelyhap/entry/src/main/module.json b/ability/ability_runtime/newwant/actsnewwantbrelyhap/entry/src/main/module.json index 053048272..a795df6f8 100644 --- a/ability/ability_runtime/newwant/actsnewwantbrelyhap/entry/src/main/module.json +++ b/ability/ability_runtime/newwant/actsnewwantbrelyhap/entry/src/main/module.json @@ -1,70 +1,68 @@ { - "module": { - "name": "com.example.newwanthapb", - "type": "feature", - "srcEntrance": "./ets/Application/AbilityStage.ts", - "description": "$string:phone_entry_dsc", - "mainElement": "MainAbility", - "deviceTypes": [ - "default", - "phone" - ], - "deliveryWithInstall": true, - "installationFree": false, - "uiSyntax": "ets", - "pages": "$profile:main_pages", - "abilities": [ - { - "name": "com.example.newwanthapb.MainAbility", - "srcEntrance": "./ets/MainAbility/MainAbility.ts", - "description": "$string:phone_entry_main", - "icon": "$media:icon", - "label": "$string:entry_label", - "visible": true, - "launchType": "singleton", - "orientation": "portrait", - "skills": [ - { - "actions": [ - "action.system.home" - ], - "entities":[ - "entity.system.home" - ] - } - ] - } - ], - "requestPermissions": [ - { - "name":"ohos.permission.GET_BUNDLE_INFO_PRIVILEGED", - "reason":"need use ohos.permission.GET_BUNDLE_INFO_PRIVILEGED" - }, - { - "name":"ohos.permission.GET_BUNDLE_INFO", - "reason":"need use ohos.permission.GET_BUNDLE_INFO" - }, - { - "name":"ohos.permission.CHANGE_ABILITY_ENABLED_STATE", - "reason":"need use ohos.permission.CHANGE_ABILITY_ENABLED_STATE" - }, - { - "name":"ohos.permission.REMOVE_CACHE_FILES", - "reason":"need use ohos.permission.REMOVE_CACHE_FILES" - }, - { - "name":"ohos.permission.LISTEN_BUNDLE_CHANGE", - "reason":"need use ohos.permission.LISTEN_BUNDLE_CHANGE" - }, - { - "name":"ohos.permission.INSTALL_BUNDLE", - "reason":"need use ohos.permission.INSTALL_BUNDLE" - }, - { - "name":"ohos.permission.START_ABILITIES_FROM_BACKGROUND", - "reason":"need use ohos.permission.START_ABILITIES_FROM_BACKGROUND" - } - ] - - } -} + "module": { + "name": "com.example.newwanthapb", + "type": "feature", + "srcEntrance": "./ets/Application/AbilityStage.ts", + "description": "$string:phone_entry_dsc", + "mainElement": "MainAbility", + "deviceTypes": [ + "default" + ], + "deliveryWithInstall": true, + "installationFree": false, + "uiSyntax": "ets", + "pages": "$profile:main_pages", + "abilities": [ + { + "name": "com.example.newwanthapb.MainAbility", + "srcEntrance": "./ets/MainAbility/MainAbility.ts", + "description": "$string:phone_entry_main", + "icon": "$media:icon", + "label": "$string:entry_label", + "visible": true, + "launchType": "singleton", + "orientation": "portrait", + "skills": [ + { + "actions": [ + "action.system.home" + ], + "entities": [ + "entity.system.home" + ] + } + ] + } + ], + "requestPermissions": [ + { + "name": "ohos.permission.GET_BUNDLE_INFO_PRIVILEGED", + "reason": "need use ohos.permission.GET_BUNDLE_INFO_PRIVILEGED" + }, + { + "name": "ohos.permission.GET_BUNDLE_INFO", + "reason": "need use ohos.permission.GET_BUNDLE_INFO" + }, + { + "name": "ohos.permission.CHANGE_ABILITY_ENABLED_STATE", + "reason": "need use ohos.permission.CHANGE_ABILITY_ENABLED_STATE" + }, + { + "name": "ohos.permission.REMOVE_CACHE_FILES", + "reason": "need use ohos.permission.REMOVE_CACHE_FILES" + }, + { + "name": "ohos.permission.LISTEN_BUNDLE_CHANGE", + "reason": "need use ohos.permission.LISTEN_BUNDLE_CHANGE" + }, + { + "name": "ohos.permission.INSTALL_BUNDLE", + "reason": "need use ohos.permission.INSTALL_BUNDLE" + }, + { + "name": "ohos.permission.START_ABILITIES_FROM_BACKGROUND", + "reason": "need use ohos.permission.START_ABILITIES_FROM_BACKGROUND" + } + ] + } +} \ No newline at end of file diff --git a/ability/ability_runtime/newwant/actsnewwantrelyhap/entry/src/main/module.json b/ability/ability_runtime/newwant/actsnewwantrelyhap/entry/src/main/module.json index f226b8244..48557c9de 100644 --- a/ability/ability_runtime/newwant/actsnewwantrelyhap/entry/src/main/module.json +++ b/ability/ability_runtime/newwant/actsnewwantrelyhap/entry/src/main/module.json @@ -1,91 +1,89 @@ { - "module": { - "name": "com.example.newwanthapa", - "type": "entry", - "srcEntrance": "./ets/Application/AbilityStage.ts", - "description": "$string:phone_entry_dsc", - "mainElement": "MainAbility", - "deviceTypes": [ - "default", - "phone" - ], - "deliveryWithInstall": true, - "installationFree": false, - "uiSyntax": "ets", - "pages": "$profile:main_pages", - "abilities": [ - { - "name": "com.example.newwanthapa.MainAbility", - "srcEntrance": "./ets/MainAbility/MainAbility.ts", - "description": "$string:phone_entry_main", - "icon": "$media:icon", - "label": "$string:entry_label", - "visible": true, - "orientation": "portrait", - "launchType": "standard", - "skills": [ - { - "actions": [ - "action.system.home" - ], - "entities":[ - "entity.system.home" - ] - } - ] - }, - { - "name": "com.example.newwanthapa.SecondAbility", - "srcEntrance": "./ets/SecondAbility/SecondAbility.ts", - "description": "$string:phone_entry_main", - "icon": "$media:icon", - "label": "$string:entry_label", - "visible": true, - "orientation": "portrait", - "launchType": "singleton" - } - ], - "extensionAbilities": [ + "module": { + "name": "com.example.newwanthapa", + "type": "entry", + "srcEntrance": "./ets/Application/AbilityStage.ts", + "description": "$string:phone_entry_dsc", + "mainElement": "MainAbility", + "deviceTypes": [ + "default" + ], + "deliveryWithInstall": true, + "installationFree": false, + "uiSyntax": "ets", + "pages": "$profile:main_pages", + "abilities": [ + { + "name": "com.example.newwanthapa.MainAbility", + "srcEntrance": "./ets/MainAbility/MainAbility.ts", + "description": "$string:phone_entry_main", + "icon": "$media:icon", + "label": "$string:entry_label", + "visible": true, + "orientation": "portrait", + "launchType": "standard", + "skills": [ { - "srcEntrance": "./ets/ServiceAbility/ServiceAbility.ts", - "name": "com.example.newwanthapa.ServiceAbility", - "icon": "$media:icon", - "srcLanguage": "ets", - "description": "$string:phone_entry_main", - "type": "service", - "visible": true + "actions": [ + "action.system.home" + ], + "entities": [ + "entity.system.home" + ] } - ], - "requestPermissions": [ - { - "name":"ohos.permission.GET_BUNDLE_INFO_PRIVILEGED", - "reason":"need use ohos.permission.GET_BUNDLE_INFO_PRIVILEGED" - }, - { - "name":"ohos.permission.GET_BUNDLE_INFO", - "reason":"need use ohos.permission.GET_BUNDLE_INFO" - }, - { - "name":"ohos.permission.CHANGE_ABILITY_ENABLED_STATE", - "reason":"need use ohos.permission.CHANGE_ABILITY_ENABLED_STATE" - }, - { - "name":"ohos.permission.REMOVE_CACHE_FILES", - "reason":"need use ohos.permission.REMOVE_CACHE_FILES" - }, - { - "name":"ohos.permission.LISTEN_BUNDLE_CHANGE", - "reason":"need use ohos.permission.LISTEN_BUNDLE_CHANGE" - }, - { - "name":"ohos.permission.INSTALL_BUNDLE", - "reason":"need use ohos.permission.INSTALL_BUNDLE" - }, - { - "name":"ohos.permission.START_ABILITIES_FROM_BACKGROUND", - "reason":"need use ohos.permission.START_ABILITIES_FROM_BACKGROUND" - } ] - - } -} + }, + { + "name": "com.example.newwanthapa.SecondAbility", + "srcEntrance": "./ets/SecondAbility/SecondAbility.ts", + "description": "$string:phone_entry_main", + "icon": "$media:icon", + "label": "$string:entry_label", + "visible": true, + "orientation": "portrait", + "launchType": "singleton" + } + ], + "extensionAbilities": [ + { + "srcEntrance": "./ets/ServiceAbility/ServiceAbility.ts", + "name": "com.example.newwanthapa.ServiceAbility", + "icon": "$media:icon", + "srcLanguage": "ets", + "description": "$string:phone_entry_main", + "type": "service", + "visible": true + } + ], + "requestPermissions": [ + { + "name": "ohos.permission.GET_BUNDLE_INFO_PRIVILEGED", + "reason": "need use ohos.permission.GET_BUNDLE_INFO_PRIVILEGED" + }, + { + "name": "ohos.permission.GET_BUNDLE_INFO", + "reason": "need use ohos.permission.GET_BUNDLE_INFO" + }, + { + "name": "ohos.permission.CHANGE_ABILITY_ENABLED_STATE", + "reason": "need use ohos.permission.CHANGE_ABILITY_ENABLED_STATE" + }, + { + "name": "ohos.permission.REMOVE_CACHE_FILES", + "reason": "need use ohos.permission.REMOVE_CACHE_FILES" + }, + { + "name": "ohos.permission.LISTEN_BUNDLE_CHANGE", + "reason": "need use ohos.permission.LISTEN_BUNDLE_CHANGE" + }, + { + "name": "ohos.permission.INSTALL_BUNDLE", + "reason": "need use ohos.permission.INSTALL_BUNDLE" + }, + { + "name": "ohos.permission.START_ABILITIES_FROM_BACKGROUND", + "reason": "need use ohos.permission.START_ABILITIES_FROM_BACKGROUND" + } + ] + } +} \ No newline at end of file diff --git a/ability/ability_runtime/newwant/actsnewwanttest/entry/src/main/module.json b/ability/ability_runtime/newwant/actsnewwanttest/entry/src/main/module.json index fad375b73..9d32568b0 100644 --- a/ability/ability_runtime/newwant/actsnewwanttest/entry/src/main/module.json +++ b/ability/ability_runtime/newwant/actsnewwanttest/entry/src/main/module.json @@ -1,86 +1,84 @@ { - "module": { - "name": "phone", - "type": "entry", - "srcEntrance": "./ets/Application/AbilityStage.ts", - "description": "$string:phone_entry_dsc", - "mainElement": "MainAbility", - "deviceTypes": [ - "default", - "phone" - ], - "deliveryWithInstall": true, - "installationFree": false, - "uiSyntax": "ets", - "pages": "$profile:main_pages", - "abilities": [ - { - "name": "com.example.newwanttest.MainAbility", - "srcEntrance": "./ets/MainAbility/MainAbility.ts", - "description": "$string:phone_entry_main", - "icon": "$media:icon", - "label": "$string:entry_label", - "visible": true, - "orientation": "portrait", - "launchType": "singleton", - "skills": [ - { - "actions": [ - "action.system.home" - ], - "entities":[ - "entity.system.home" - ] - } - ] - } - ], - "requestPermissions": [ + "module": { + "name": "phone", + "type": "entry", + "srcEntrance": "./ets/Application/AbilityStage.ts", + "description": "$string:phone_entry_dsc", + "mainElement": "MainAbility", + "deviceTypes": [ + "default" + ], + "deliveryWithInstall": true, + "installationFree": false, + "uiSyntax": "ets", + "pages": "$profile:main_pages", + "abilities": [ + { + "name": "com.example.newwanttest.MainAbility", + "srcEntrance": "./ets/MainAbility/MainAbility.ts", + "description": "$string:phone_entry_main", + "icon": "$media:icon", + "label": "$string:entry_label", + "visible": true, + "orientation": "portrait", + "launchType": "singleton", + "skills": [ { - "name":"ohos.permission.GET_BUNDLE_INFO_PRIVILEGED", - "reason":"need use ohos.permission.GET_BUNDLE_INFO_PRIVILEGED" - }, - { - "name":"ohos.permission.GET_BUNDLE_INFO", - "reason":"need use ohos.permission.GET_BUNDLE_INFO" - }, - { - "name":"ohos.permission.CHANGE_ABILITY_ENABLED_STATE", - "reason":"need use ohos.permission.CHANGE_ABILITY_ENABLED_STATE" - }, - { - "name":"ohos.permission.REMOVE_CACHE_FILES", - "reason":"need use ohos.permission.REMOVE_CACHE_FILES" - }, - { - "name":"ohos.permission.LISTEN_BUNDLE_CHANGE", - "reason":"need use ohos.permission.LISTEN_BUNDLE_CHANGE" - }, - { - "name":"ohos.permission.INSTALL_BUNDLE", - "reason":"need use ohos.permission.INSTALL_BUNDLE" - }, - { - "name":"ohos.permission.MANAGE_MISSIONS", - "reason":"need use ohos.permission.MANAGE_MISSIONS" - }, - { - "name":"ohos.permission.GET_RUNNING_INFO", - "reason":"need use ohos.permission.GET_RUNNING_INFO" - }, - { - "name":"ohos.permission.CLEAN_BACKGROUND_PROCESSES", - "reason":"need use ohos.permission.CLEAN_BACKGROUND_PROCESSES" - }, - { - "name":"ohos.permission.CLEAN_APPLICATION_DATA", - "reason":"need use ohos.permission.CLEAN_APPLICATION_DATA" - }, - { - "name":"ohos.permission.START_ABILITIES_FROM_BACKGROUND", - "reason":"need use ohos.permission.START_ABILITIES_FROM_BACKGROUND" + "actions": [ + "action.system.home" + ], + "entities": [ + "entity.system.home" + ] } ] - - } -} + } + ], + "requestPermissions": [ + { + "name": "ohos.permission.GET_BUNDLE_INFO_PRIVILEGED", + "reason": "need use ohos.permission.GET_BUNDLE_INFO_PRIVILEGED" + }, + { + "name": "ohos.permission.GET_BUNDLE_INFO", + "reason": "need use ohos.permission.GET_BUNDLE_INFO" + }, + { + "name": "ohos.permission.CHANGE_ABILITY_ENABLED_STATE", + "reason": "need use ohos.permission.CHANGE_ABILITY_ENABLED_STATE" + }, + { + "name": "ohos.permission.REMOVE_CACHE_FILES", + "reason": "need use ohos.permission.REMOVE_CACHE_FILES" + }, + { + "name": "ohos.permission.LISTEN_BUNDLE_CHANGE", + "reason": "need use ohos.permission.LISTEN_BUNDLE_CHANGE" + }, + { + "name": "ohos.permission.INSTALL_BUNDLE", + "reason": "need use ohos.permission.INSTALL_BUNDLE" + }, + { + "name": "ohos.permission.MANAGE_MISSIONS", + "reason": "need use ohos.permission.MANAGE_MISSIONS" + }, + { + "name": "ohos.permission.GET_RUNNING_INFO", + "reason": "need use ohos.permission.GET_RUNNING_INFO" + }, + { + "name": "ohos.permission.CLEAN_BACKGROUND_PROCESSES", + "reason": "need use ohos.permission.CLEAN_BACKGROUND_PROCESSES" + }, + { + "name": "ohos.permission.CLEAN_APPLICATION_DATA", + "reason": "need use ohos.permission.CLEAN_APPLICATION_DATA" + }, + { + "name": "ohos.permission.START_ABILITIES_FROM_BACKGROUND", + "reason": "need use ohos.permission.START_ABILITIES_FROM_BACKGROUND" + } + ] + } +} \ No newline at end of file diff --git a/ability/ability_runtime/non_concurrent/acts_systemappa_test/entry/src/main/module.json b/ability/ability_runtime/non_concurrent/acts_systemappa_test/entry/src/main/module.json index 7d0bbbc30..ba5a3ae4f 100644 --- a/ability/ability_runtime/non_concurrent/acts_systemappa_test/entry/src/main/module.json +++ b/ability/ability_runtime/non_concurrent/acts_systemappa_test/entry/src/main/module.json @@ -6,8 +6,7 @@ "description": "$string:phone_entry_dsc", "mainElement": "MainAbility", "deviceTypes": [ - "default", - "phone" + "default" ], "deliveryWithInstall": true, "installationFree": false, diff --git a/ability/ability_runtime/non_concurrent/acts_systemappone_rely_test/entry/src/main/module.json b/ability/ability_runtime/non_concurrent/acts_systemappone_rely_test/entry/src/main/module.json index d6e32dc29..36d9b5d90 100644 --- a/ability/ability_runtime/non_concurrent/acts_systemappone_rely_test/entry/src/main/module.json +++ b/ability/ability_runtime/non_concurrent/acts_systemappone_rely_test/entry/src/main/module.json @@ -6,8 +6,7 @@ "description": "$string:phone_entry_dsc", "mainElement": "MainAbility", "deviceTypes": [ - "default", - "phone" + "default" ], "deliveryWithInstall": true, "installationFree": false, diff --git a/ability/ability_runtime/non_concurrent/actsthirdappatest/entry/src/main/module.json b/ability/ability_runtime/non_concurrent/actsthirdappatest/entry/src/main/module.json index 5ef03ebb1..22cbe512b 100755 --- a/ability/ability_runtime/non_concurrent/actsthirdappatest/entry/src/main/module.json +++ b/ability/ability_runtime/non_concurrent/actsthirdappatest/entry/src/main/module.json @@ -6,7 +6,7 @@ "description": "$string:entry_desc", "mainElement": "MainAbility", "deviceTypes": [ - "phone", + "default", "tablet" ], "deliveryWithInstall": true, diff --git a/ability/ability_runtime/non_concurrent/actsthirdapponerelytest/entry/src/main/module.json b/ability/ability_runtime/non_concurrent/actsthirdapponerelytest/entry/src/main/module.json index d9dd4cd50..f06041ba3 100755 --- a/ability/ability_runtime/non_concurrent/actsthirdapponerelytest/entry/src/main/module.json +++ b/ability/ability_runtime/non_concurrent/actsthirdapponerelytest/entry/src/main/module.json @@ -6,7 +6,7 @@ "description": "$string:phone_entry_dsc", "mainElement": "MainAbility", "deviceTypes": [ - "phone" + "default" ], "deliveryWithInstall": true, "installationFree": false, diff --git a/ability/ability_runtime/processmultiinstance/actsamsprocessmultiinstancehapaarelyhap/entry/src/main/module.json b/ability/ability_runtime/processmultiinstance/actsamsprocessmultiinstancehapaarelyhap/entry/src/main/module.json index 05b2fb1fd..76dea9891 100644 --- a/ability/ability_runtime/processmultiinstance/actsamsprocessmultiinstancehapaarelyhap/entry/src/main/module.json +++ b/ability/ability_runtime/processmultiinstance/actsamsprocessmultiinstancehapaarelyhap/entry/src/main/module.json @@ -6,8 +6,7 @@ "description": "$string:phone_entry_dsc", "mainElement": "MainAbility", "deviceTypes": [ - "default", - "phone" + "default" ], "deliveryWithInstall": true, "installationFree": false, diff --git a/ability/ability_runtime/processmultiinstance/actsamsprocessmultiinstancehapabrelyhap/entry/src/main/module.json b/ability/ability_runtime/processmultiinstance/actsamsprocessmultiinstancehapabrelyhap/entry/src/main/module.json index d72dfee71..6ab227a69 100644 --- a/ability/ability_runtime/processmultiinstance/actsamsprocessmultiinstancehapabrelyhap/entry/src/main/module.json +++ b/ability/ability_runtime/processmultiinstance/actsamsprocessmultiinstancehapabrelyhap/entry/src/main/module.json @@ -7,8 +7,7 @@ "description": "$string:phone_entry_dsc", "mainElement": "MainAbility", "deviceTypes": [ - "default", - "phone" + "default" ], "deliveryWithInstall": true, "installationFree": false, diff --git a/ability/ability_runtime/processmultiinstance/actsamsprocessmultiinstancehapbarelyhap/entry/src/main/module.json b/ability/ability_runtime/processmultiinstance/actsamsprocessmultiinstancehapbarelyhap/entry/src/main/module.json index 7cf6ec523..32ac12a1c 100644 --- a/ability/ability_runtime/processmultiinstance/actsamsprocessmultiinstancehapbarelyhap/entry/src/main/module.json +++ b/ability/ability_runtime/processmultiinstance/actsamsprocessmultiinstancehapbarelyhap/entry/src/main/module.json @@ -6,8 +6,7 @@ "description": "$string:phone_entry_dsc", "mainElement": "MainAbility", "deviceTypes": [ - "default", - "phone" + "default" ], "deliveryWithInstall": true, "installationFree": false, diff --git a/ability/ability_runtime/processmultiinstance/actsamsprocessmultiinstancehapbbrelyhap/entry/src/main/module.json b/ability/ability_runtime/processmultiinstance/actsamsprocessmultiinstancehapbbrelyhap/entry/src/main/module.json index ac8458c67..81f489d77 100644 --- a/ability/ability_runtime/processmultiinstance/actsamsprocessmultiinstancehapbbrelyhap/entry/src/main/module.json +++ b/ability/ability_runtime/processmultiinstance/actsamsprocessmultiinstancehapbbrelyhap/entry/src/main/module.json @@ -6,8 +6,7 @@ "description": "$string:phone_entry_dsc", "mainElement": "MainAbility", "deviceTypes": [ - "default", - "phone" + "default" ], "deliveryWithInstall": true, "installationFree": false, diff --git a/ability/ability_runtime/processmultiinstance/actsamsprocessmultiinstancehapbcrelyhap/entry/src/main/module.json b/ability/ability_runtime/processmultiinstance/actsamsprocessmultiinstancehapbcrelyhap/entry/src/main/module.json index 815f276fb..3ee7f7d16 100644 --- a/ability/ability_runtime/processmultiinstance/actsamsprocessmultiinstancehapbcrelyhap/entry/src/main/module.json +++ b/ability/ability_runtime/processmultiinstance/actsamsprocessmultiinstancehapbcrelyhap/entry/src/main/module.json @@ -7,8 +7,7 @@ "description": "$string:phone_entry_dsc", "mainElement": "MainAbility", "deviceTypes": [ - "default", - "phone" + "default" ], "deliveryWithInstall": true, "installationFree": false, diff --git a/ability/ability_runtime/processmultiinstance/actsamsprocessmultiinstancehapbdrelyhap/entry/src/main/module.json b/ability/ability_runtime/processmultiinstance/actsamsprocessmultiinstancehapbdrelyhap/entry/src/main/module.json index 2e6a60ec7..4da00c32f 100644 --- a/ability/ability_runtime/processmultiinstance/actsamsprocessmultiinstancehapbdrelyhap/entry/src/main/module.json +++ b/ability/ability_runtime/processmultiinstance/actsamsprocessmultiinstancehapbdrelyhap/entry/src/main/module.json @@ -7,8 +7,7 @@ "description": "$string:phone_entry_dsc", "mainElement": "MainAbility", "deviceTypes": [ - "default", - "phone" + "default" ], "deliveryWithInstall": true, "installationFree": false, diff --git a/ability/ability_runtime/processmultiinstance/actsamsprocessmultiinstancehapberelyhap/entry/src/main/module.json b/ability/ability_runtime/processmultiinstance/actsamsprocessmultiinstancehapberelyhap/entry/src/main/module.json index 0ed216baf..8af9c2d1b 100644 --- a/ability/ability_runtime/processmultiinstance/actsamsprocessmultiinstancehapberelyhap/entry/src/main/module.json +++ b/ability/ability_runtime/processmultiinstance/actsamsprocessmultiinstancehapberelyhap/entry/src/main/module.json @@ -7,8 +7,7 @@ "description": "$string:phone_entry_dsc", "mainElement": "MainAbility", "deviceTypes": [ - "default", - "phone" + "default" ], "deliveryWithInstall": true, "installationFree": false, diff --git a/ability/ability_runtime/processmultiinstance/actsamsprocessmultiinstancehapbfrelyhap/entry/src/main/module.json b/ability/ability_runtime/processmultiinstance/actsamsprocessmultiinstancehapbfrelyhap/entry/src/main/module.json index 405388a61..63c94d0a5 100644 --- a/ability/ability_runtime/processmultiinstance/actsamsprocessmultiinstancehapbfrelyhap/entry/src/main/module.json +++ b/ability/ability_runtime/processmultiinstance/actsamsprocessmultiinstancehapbfrelyhap/entry/src/main/module.json @@ -7,8 +7,7 @@ "description": "$string:phone_entry_dsc", "mainElement": "MainAbility", "deviceTypes": [ - "default", - "phone" + "default" ], "deliveryWithInstall": true, "installationFree": false, diff --git a/ability/ability_runtime/processmultiinstance/actsamsprocessmultiinstancetest/entry/src/main/module.json b/ability/ability_runtime/processmultiinstance/actsamsprocessmultiinstancetest/entry/src/main/module.json index ec1042081..030b958d1 100644 --- a/ability/ability_runtime/processmultiinstance/actsamsprocessmultiinstancetest/entry/src/main/module.json +++ b/ability/ability_runtime/processmultiinstance/actsamsprocessmultiinstancetest/entry/src/main/module.json @@ -1,85 +1,84 @@ { - "module": { - "name": "phone", - "type": "entry", - "srcEntrance": "./ets/Application/AbilityStage.ts", - "description": "$string:phone_entry_dsc", - "mainElement": "MainAbility", - "deviceTypes": [ - "default", - "phone" - ], - "deliveryWithInstall": true, - "installationFree": false, - "uiSyntax": "ets", - "pages": "$profile:main_pages", - "abilities": [ - { - "name": "com.example.processmultiinstance.MainAbility", - "srcEntrance": "./ets/MainAbility/MainAbility.ts", - "description": "$string:phone_entry_main", - "icon": "$media:icon", - "label": "$string:entry_label", - "visible": true, - "orientation": "portrait", - "launchType": "singleton", - "skills": [ - { - "actions": [ - "action.system.home" - ], - "entities":[ - "entity.system.home" - ] - } - ] - } - ], - "requestPermissions": [ - { - "name":"ohos.permission.GET_BUNDLE_INFO_PRIVILEGED", - "reason":"need use ohos.permission.GET_BUNDLE_INFO_PRIVILEGED" - }, - { - "name":"ohos.permission.GET_BUNDLE_INFO", - "reason":"need use ohos.permission.GET_BUNDLE_INFO" - }, - { - "name":"ohos.permission.CHANGE_ABILITY_ENABLED_STATE", - "reason":"need use ohos.permission.CHANGE_ABILITY_ENABLED_STATE" - }, - { - "name":"ohos.permission.REMOVE_CACHE_FILES", - "reason":"need use ohos.permission.REMOVE_CACHE_FILES" - }, - { - "name":"ohos.permission.LISTEN_BUNDLE_CHANGE", - "reason":"need use ohos.permission.LISTEN_BUNDLE_CHANGE" - }, - { - "name":"ohos.permission.INSTALL_BUNDLE", - "reason":"need use ohos.permission.INSTALL_BUNDLE" - }, - { - "name":"ohos.permission.MANAGE_MISSIONS", - "reason":"need use ohos.permission.MANAGE_MISSIONS" - }, - { - "name":"ohos.permission.GET_RUNNING_INFO", - "reason":"need use ohos.permission.GET_RUNNING_INFO" - }, - { - "name":"ohos.permission.CLEAN_BACKGROUND_PROCESSES", - "reason":"need use ohos.permission.CLEAN_BACKGROUND_PROCESSES" - }, - { - "name":"ohos.permission.CLEAN_APPLICATION_DATA", - "reason":"need use ohos.permission.CLEAN_APPLICATION_DATA" - }, - { - "name":"ohos.permission.START_ABILITIES_FROM_BACKGROUND", - "reason":"need use ohos.permission.START_ABILITIES_FROM_BACKGROUND" - } - ] - } -} + "module": { + "name": "phone", + "type": "entry", + "srcEntrance": "./ets/Application/AbilityStage.ts", + "description": "$string:phone_entry_dsc", + "mainElement": "MainAbility", + "deviceTypes": [ + "default" + ], + "deliveryWithInstall": true, + "installationFree": false, + "uiSyntax": "ets", + "pages": "$profile:main_pages", + "abilities": [ + { + "name": "com.example.processmultiinstance.MainAbility", + "srcEntrance": "./ets/MainAbility/MainAbility.ts", + "description": "$string:phone_entry_main", + "icon": "$media:icon", + "label": "$string:entry_label", + "visible": true, + "orientation": "portrait", + "launchType": "singleton", + "skills": [ + { + "actions": [ + "action.system.home" + ], + "entities": [ + "entity.system.home" + ] + } + ] + } + ], + "requestPermissions": [ + { + "name": "ohos.permission.GET_BUNDLE_INFO_PRIVILEGED", + "reason": "need use ohos.permission.GET_BUNDLE_INFO_PRIVILEGED" + }, + { + "name": "ohos.permission.GET_BUNDLE_INFO", + "reason": "need use ohos.permission.GET_BUNDLE_INFO" + }, + { + "name": "ohos.permission.CHANGE_ABILITY_ENABLED_STATE", + "reason": "need use ohos.permission.CHANGE_ABILITY_ENABLED_STATE" + }, + { + "name": "ohos.permission.REMOVE_CACHE_FILES", + "reason": "need use ohos.permission.REMOVE_CACHE_FILES" + }, + { + "name": "ohos.permission.LISTEN_BUNDLE_CHANGE", + "reason": "need use ohos.permission.LISTEN_BUNDLE_CHANGE" + }, + { + "name": "ohos.permission.INSTALL_BUNDLE", + "reason": "need use ohos.permission.INSTALL_BUNDLE" + }, + { + "name": "ohos.permission.MANAGE_MISSIONS", + "reason": "need use ohos.permission.MANAGE_MISSIONS" + }, + { + "name": "ohos.permission.GET_RUNNING_INFO", + "reason": "need use ohos.permission.GET_RUNNING_INFO" + }, + { + "name": "ohos.permission.CLEAN_BACKGROUND_PROCESSES", + "reason": "need use ohos.permission.CLEAN_BACKGROUND_PROCESSES" + }, + { + "name": "ohos.permission.CLEAN_APPLICATION_DATA", + "reason": "need use ohos.permission.CLEAN_APPLICATION_DATA" + }, + { + "name": "ohos.permission.START_ABILITIES_FROM_BACKGROUND", + "reason": "need use ohos.permission.START_ABILITIES_FROM_BACKGROUND" + } + ] + } +} \ No newline at end of file diff --git a/ability/ability_runtime/stage/actslifecyclemultihap2/entry/src/main/module.json b/ability/ability_runtime/stage/actslifecyclemultihap2/entry/src/main/module.json index f2c1d762c..bf250d20a 100644 --- a/ability/ability_runtime/stage/actslifecyclemultihap2/entry/src/main/module.json +++ b/ability/ability_runtime/stage/actslifecyclemultihap2/entry/src/main/module.json @@ -1,122 +1,125 @@ { - "module": { - "name": "hap2", - "type": "feature", - "srcEntrance": "./ets/Application/AbilityStage.ts", - "description": "$string:hap2_desc", - "mainElement": "MainAbility", - "deviceTypes": [ - "default", - "phone" - ], - "deliveryWithInstall": true, - "installationFree": false, - "uiSyntax": "ets", - "pages": "$profile:main_pages", - "abilities": [{ - "name": "com.example.lifecycletest.Hap2MainAbility1", - "srcEntrance": "./ets/Hap2MainAbility1/Hap2MainAbility1.ts", - "description": "$string:Hap2MainAbility1_desc", - "icon": "$media:icon", - "label": "$string:Hap2MainAbility1_label", - "visible": true, - "orientation": "portrait", - "skills": [{ - "actions": [ - "action.system.home" - ], - "entities": [ - "entity.system.home" - ] - }] - }, - { - "name": "Hap2MainAbility2", - "srcEntrance": "./ets/Hap2MainAbility2/Hap2MainAbility2.ts", - "description": "$string:Hap2MainAbility2_desc", - "icon": "$media:icon", - "label": "$string:Hap2MainAbility2_label" - }, + "module": { + "name": "hap2", + "type": "feature", + "srcEntrance": "./ets/Application/AbilityStage.ts", + "description": "$string:hap2_desc", + "mainElement": "MainAbility", + "deviceTypes": [ + "default" + ], + "deliveryWithInstall": true, + "installationFree": false, + "uiSyntax": "ets", + "pages": "$profile:main_pages", + "abilities": [ + { + "name": "com.example.lifecycletest.Hap2MainAbility1", + "srcEntrance": "./ets/Hap2MainAbility1/Hap2MainAbility1.ts", + "description": "$string:Hap2MainAbility1_desc", + "icon": "$media:icon", + "label": "$string:Hap2MainAbility1_label", + "visible": true, + "orientation": "portrait", + "skills": [ { - "name": "Hap2MainAbility3", - "srcEntrance": "./ets/Hap2MainAbility3/Hap2MainAbility3.ts", - "description": "$string:Hap2MainAbility3_desc", - "icon": "$media:icon", - "label": "$string:Hap2MainAbility3_label" - }, - { - "name": "Hap2MainAbility4", - "srcEntrance": "./ets/Hap2MainAbility4/Hap2MainAbility4.ts", - "description": "$string:Hap2MainAbility4_desc", - "icon": "$media:icon", - "label": "$string:Hap2MainAbility4_label", - "launchType": "singleton" - }, - { - "name": "Hap2MainAbility5", - "srcEntrance": "./ets/Hap2MainAbility5/Hap2MainAbility5.ts", - "description": "$string:Hap2MainAbility5_desc", - "icon": "$media:icon", - "label": "$string:Hap2MainAbility5_label", - "launchType": "standard" - }, - { - "name": "Hap2MainAbility6", - "srcEntrance": "./ets/Hap2MainAbility6/Hap2MainAbility6.ts", - "description": "$string:Hap2MainAbility6_desc", - "icon": "$media:icon", - "label": "$string:Hap2MainAbility6_label" - }, - { - "name": "Hap2MainAbility7", - "srcEntrance": "./ets/Hap2MainAbility7/Hap2MainAbility7.ts", - "description": "$string:Hap2MainAbility7_desc", - "icon": "$media:icon", - "label": "$string:Hap2MainAbility7_label" - }, - { - "name": "Hap2MainAbility8", - "srcEntrance": "./ets/Hap2MainAbility8/Hap2MainAbility8.ts", - "description": "$string:Hap2MainAbility8_desc", - "icon": "$media:icon", - "label": "$string:Hap2MainAbility8_label" - }, - { - "name": "Hap2MainAbility9", - "srcEntrance": "./ets/Hap2MainAbility9/Hap2MainAbility9.ts", - "description": "$string:Hap2MainAbility9_desc", - "icon": "$media:icon", - "label": "$string:Hap2MainAbility9_label" - }, - { - "name": "Hap2MainAbility10", - "srcEntrance": "./ets/Hap2MainAbility10/Hap2MainAbility10.ts", - "description": "$string:Hap2MainAbility10_desc", - "icon": "$media:icon", - "label": "$string:Hap2MainAbility10_label" - }], - "requestPermissions": [ - { - "name": "ohos.permission.GET_BUNDLE_INFO" - }, - { - "name": "ohos.permission.MANAGE_MISSIONS" - }, - { - "name": "ohos.permission.INSTALL_BUNDLE" - }, - { - "name": "ohos.permission.GET_BUNDLE_INFO_PRIVILEGED" - }, - { - "name": "ohos.permission.CHANGE_ABILITY_ENABLED_STATE" - }, - { - "name": "ohos.permission.REMOVE_CACHE_FILES" - }, - { - "name": "ohos.permission.LISTEN_BUNDLE_CHANGE" - } - ] - } + "actions": [ + "action.system.home" + ], + "entities": [ + "entity.system.home" + ] + } + ] + }, + { + "name": "Hap2MainAbility2", + "srcEntrance": "./ets/Hap2MainAbility2/Hap2MainAbility2.ts", + "description": "$string:Hap2MainAbility2_desc", + "icon": "$media:icon", + "label": "$string:Hap2MainAbility2_label" + }, + { + "name": "Hap2MainAbility3", + "srcEntrance": "./ets/Hap2MainAbility3/Hap2MainAbility3.ts", + "description": "$string:Hap2MainAbility3_desc", + "icon": "$media:icon", + "label": "$string:Hap2MainAbility3_label" + }, + { + "name": "Hap2MainAbility4", + "srcEntrance": "./ets/Hap2MainAbility4/Hap2MainAbility4.ts", + "description": "$string:Hap2MainAbility4_desc", + "icon": "$media:icon", + "label": "$string:Hap2MainAbility4_label", + "launchType": "singleton" + }, + { + "name": "Hap2MainAbility5", + "srcEntrance": "./ets/Hap2MainAbility5/Hap2MainAbility5.ts", + "description": "$string:Hap2MainAbility5_desc", + "icon": "$media:icon", + "label": "$string:Hap2MainAbility5_label", + "launchType": "standard" + }, + { + "name": "Hap2MainAbility6", + "srcEntrance": "./ets/Hap2MainAbility6/Hap2MainAbility6.ts", + "description": "$string:Hap2MainAbility6_desc", + "icon": "$media:icon", + "label": "$string:Hap2MainAbility6_label" + }, + { + "name": "Hap2MainAbility7", + "srcEntrance": "./ets/Hap2MainAbility7/Hap2MainAbility7.ts", + "description": "$string:Hap2MainAbility7_desc", + "icon": "$media:icon", + "label": "$string:Hap2MainAbility7_label" + }, + { + "name": "Hap2MainAbility8", + "srcEntrance": "./ets/Hap2MainAbility8/Hap2MainAbility8.ts", + "description": "$string:Hap2MainAbility8_desc", + "icon": "$media:icon", + "label": "$string:Hap2MainAbility8_label" + }, + { + "name": "Hap2MainAbility9", + "srcEntrance": "./ets/Hap2MainAbility9/Hap2MainAbility9.ts", + "description": "$string:Hap2MainAbility9_desc", + "icon": "$media:icon", + "label": "$string:Hap2MainAbility9_label" + }, + { + "name": "Hap2MainAbility10", + "srcEntrance": "./ets/Hap2MainAbility10/Hap2MainAbility10.ts", + "description": "$string:Hap2MainAbility10_desc", + "icon": "$media:icon", + "label": "$string:Hap2MainAbility10_label" + } + ], + "requestPermissions": [ + { + "name": "ohos.permission.GET_BUNDLE_INFO" + }, + { + "name": "ohos.permission.MANAGE_MISSIONS" + }, + { + "name": "ohos.permission.INSTALL_BUNDLE" + }, + { + "name": "ohos.permission.GET_BUNDLE_INFO_PRIVILEGED" + }, + { + "name": "ohos.permission.CHANGE_ABILITY_ENABLED_STATE" + }, + { + "name": "ohos.permission.REMOVE_CACHE_FILES" + }, + { + "name": "ohos.permission.LISTEN_BUNDLE_CHANGE" + } + ] + } } \ No newline at end of file diff --git a/ability/ability_runtime/stage/actslifecyclemultihap3/entry/src/main/module.json b/ability/ability_runtime/stage/actslifecyclemultihap3/entry/src/main/module.json index 5165038ad..250d552db 100644 --- a/ability/ability_runtime/stage/actslifecyclemultihap3/entry/src/main/module.json +++ b/ability/ability_runtime/stage/actslifecyclemultihap3/entry/src/main/module.json @@ -6,66 +6,69 @@ "description": "$string:hap3_desc", "mainElement": "MainAbility", "deviceTypes": [ - "default", - "phone" + "default" ], "deliveryWithInstall": true, "installationFree": false, "uiSyntax": "ets", "pages": "$profile:main_pages", - "abilities": [{ - "name": "com.example.lifecycletest.Hap3MainAbility1", - "srcEntrance": "./ets/Hap3MainAbility1/Hap3MainAbility1.ts", - "description": "$string:Hap3MainAbility1_desc", - "icon": "$media:icon", - "label": "$string:Hap3MainAbility1_label", - "visible": true, - "orientation": "portrait", - "skills": [{ - "actions": [ - "action.system.home" - ], - "entities": [ - "entity.system.home" + "abilities": [ + { + "name": "com.example.lifecycletest.Hap3MainAbility1", + "srcEntrance": "./ets/Hap3MainAbility1/Hap3MainAbility1.ts", + "description": "$string:Hap3MainAbility1_desc", + "icon": "$media:icon", + "label": "$string:Hap3MainAbility1_label", + "visible": true, + "orientation": "portrait", + "skills": [ + { + "actions": [ + "action.system.home" + ], + "entities": [ + "entity.system.home" + ] + } ] - }] - }, - { - "name": "Hap3MainAbility2", - "srcEntrance": "./ets/Hap3MainAbility2/Hap3MainAbility2.ts", - "description": "$string:Hap3MainAbility2_desc", - "icon": "$media:icon", - "label": "$string:Hap3MainAbility2_label" - }, - { - "name": "Hap3MainAbility3", - "srcEntrance": "./ets/Hap3MainAbility3/Hap3MainAbility3.ts", - "description": "$string:Hap3MainAbility3_desc", - "icon": "$media:icon", - "label": "$string:Hap3MainAbility3_label" - }], - "requestPermissions": [ + }, + { + "name": "Hap3MainAbility2", + "srcEntrance": "./ets/Hap3MainAbility2/Hap3MainAbility2.ts", + "description": "$string:Hap3MainAbility2_desc", + "icon": "$media:icon", + "label": "$string:Hap3MainAbility2_label" + }, + { + "name": "Hap3MainAbility3", + "srcEntrance": "./ets/Hap3MainAbility3/Hap3MainAbility3.ts", + "description": "$string:Hap3MainAbility3_desc", + "icon": "$media:icon", + "label": "$string:Hap3MainAbility3_label" + } + ], + "requestPermissions": [ { - "name": "ohos.permission.GET_BUNDLE_INFO" + "name": "ohos.permission.GET_BUNDLE_INFO" }, { - "name": "ohos.permission.MANAGE_MISSIONS" + "name": "ohos.permission.MANAGE_MISSIONS" }, { - "name": "ohos.permission.INSTALL_BUNDLE" + "name": "ohos.permission.INSTALL_BUNDLE" }, { - "name": "ohos.permission.GET_BUNDLE_INFO_PRIVILEGED" + "name": "ohos.permission.GET_BUNDLE_INFO_PRIVILEGED" }, { - "name": "ohos.permission.CHANGE_ABILITY_ENABLED_STATE" + "name": "ohos.permission.CHANGE_ABILITY_ENABLED_STATE" }, { - "name": "ohos.permission.REMOVE_CACHE_FILES" + "name": "ohos.permission.REMOVE_CACHE_FILES" }, { - "name": "ohos.permission.LISTEN_BUNDLE_CHANGE" + "name": "ohos.permission.LISTEN_BUNDLE_CHANGE" } - ] + ] } } \ No newline at end of file diff --git a/ability/ability_runtime/stage/actslifecyclemultihaptest/entry/src/main/module.json b/ability/ability_runtime/stage/actslifecyclemultihaptest/entry/src/main/module.json index 564159e9f..28dc72058 100644 --- a/ability/ability_runtime/stage/actslifecyclemultihaptest/entry/src/main/module.json +++ b/ability/ability_runtime/stage/actslifecyclemultihaptest/entry/src/main/module.json @@ -1,113 +1,116 @@ { - "module": { - "name": "phone", - "type": "entry", - "srcEntrance": "./ets/Application/AbilityStage.ts", - "description": "$string:phone_entry_dsc", - "mainElement": "MainAbility", - "deviceTypes": [ - "default", - "phone" - ], - "deliveryWithInstall": true, - "installationFree": false, - "uiSyntax": "ets", - "pages": "$profile:main_pages", - "abilities": [{ - "name": "com.example.lifecycletest.MainAbility", - "srcEntrance": "./ets/MainAbility/MainAbility.ts", - "description": "$string:phone_entry_main", - "icon": "$media:icon", - "label": "$string:entry_label", - "visible": true, - "orientation": "portrait", - "skills": [{ - "actions": [ - "action.system.home" - ], - "entities": [ - "entity.system.home" - ] - }] - }, - { - "name": "MainAbility1", - "srcEntrance": "./ets/MainAbility1/MainAbility1.ts", - "description": "$string:MainAbility1_desc", - "icon": "$media:icon", - "label": "$string:MainAbility1_label" - }, + "module": { + "name": "phone", + "type": "entry", + "srcEntrance": "./ets/Application/AbilityStage.ts", + "description": "$string:phone_entry_dsc", + "mainElement": "MainAbility", + "deviceTypes": [ + "default" + ], + "deliveryWithInstall": true, + "installationFree": false, + "uiSyntax": "ets", + "pages": "$profile:main_pages", + "abilities": [ + { + "name": "com.example.lifecycletest.MainAbility", + "srcEntrance": "./ets/MainAbility/MainAbility.ts", + "description": "$string:phone_entry_main", + "icon": "$media:icon", + "label": "$string:entry_label", + "visible": true, + "orientation": "portrait", + "skills": [ { - "name": "MainAbility2", - "srcEntrance": "./ets/MainAbility2/MainAbility2.ts", - "description": "$string:MainAbility2_desc", - "icon": "$media:icon", - "label": "$string:MainAbility2_label" - }, - { - "name": "MainAbility3", - "srcEntrance": "./ets/MainAbility3/MainAbility3.ts", - "description": "$string:MainAbility3_desc", - "icon": "$media:icon", - "label": "$string:MainAbility3_label" - }, - { - "name": "MainAbility4", - "srcEntrance": "./ets/MainAbility4/MainAbility4.ts", - "description": "$string:MainAbility4_desc", - "icon": "$media:icon", - "label": "$string:MainAbility4_label" - }, - { - "name": "MainAbility5", - "srcEntrance": "./ets/MainAbility5/MainAbility5.ts", - "description": "$string:MainAbility5_desc", - "icon": "$media:icon", - "label": "$string:MainAbility5_label" - }, - { - "name": "MainAbility6", - "srcEntrance": "./ets/MainAbility6/MainAbility6.ts", - "description": "$string:MainAbility6_desc", - "icon": "$media:icon", - "label": "$string:MainAbility6_label", - "launchType": "standard" - }, - { - "name": "MainAbility7", - "srcEntrance": "./ets/MainAbility7/MainAbility7.ts", - "description": "$string:MainAbility7_desc", - "icon": "$media:icon", - "label": "$string:MainAbility7_label" - }], - "requestPermissions": [ - { - "name": "ohos.permission.GET_BUNDLE_INFO" - }, - { - "name": "ohos.permission.MANAGE_MISSIONS" - }, - { - "name": "ohos.permission.INSTALL_BUNDLE" - }, - { - "name": "ohos.permission.GET_BUNDLE_INFO_PRIVILEGED" - }, - { - "name": "ohos.permission.CHANGE_ABILITY_ENABLED_STATE" - }, - { - "name": "ohos.permission.REMOVE_CACHE_FILES" - }, - { - "name": "ohos.permission.LISTEN_BUNDLE_CHANGE" - }, - { - "name":"ohos.permission.START_ABILITIES_FROM_BACKGROUND" - }, - { - "name":"ohos.permission.START_INVISIBLE_ABILITY" - } - ] - } + "actions": [ + "action.system.home" + ], + "entities": [ + "entity.system.home" + ] + } + ] + }, + { + "name": "MainAbility1", + "srcEntrance": "./ets/MainAbility1/MainAbility1.ts", + "description": "$string:MainAbility1_desc", + "icon": "$media:icon", + "label": "$string:MainAbility1_label" + }, + { + "name": "MainAbility2", + "srcEntrance": "./ets/MainAbility2/MainAbility2.ts", + "description": "$string:MainAbility2_desc", + "icon": "$media:icon", + "label": "$string:MainAbility2_label" + }, + { + "name": "MainAbility3", + "srcEntrance": "./ets/MainAbility3/MainAbility3.ts", + "description": "$string:MainAbility3_desc", + "icon": "$media:icon", + "label": "$string:MainAbility3_label" + }, + { + "name": "MainAbility4", + "srcEntrance": "./ets/MainAbility4/MainAbility4.ts", + "description": "$string:MainAbility4_desc", + "icon": "$media:icon", + "label": "$string:MainAbility4_label" + }, + { + "name": "MainAbility5", + "srcEntrance": "./ets/MainAbility5/MainAbility5.ts", + "description": "$string:MainAbility5_desc", + "icon": "$media:icon", + "label": "$string:MainAbility5_label" + }, + { + "name": "MainAbility6", + "srcEntrance": "./ets/MainAbility6/MainAbility6.ts", + "description": "$string:MainAbility6_desc", + "icon": "$media:icon", + "label": "$string:MainAbility6_label", + "launchType": "standard" + }, + { + "name": "MainAbility7", + "srcEntrance": "./ets/MainAbility7/MainAbility7.ts", + "description": "$string:MainAbility7_desc", + "icon": "$media:icon", + "label": "$string:MainAbility7_label" + } + ], + "requestPermissions": [ + { + "name": "ohos.permission.GET_BUNDLE_INFO" + }, + { + "name": "ohos.permission.MANAGE_MISSIONS" + }, + { + "name": "ohos.permission.INSTALL_BUNDLE" + }, + { + "name": "ohos.permission.GET_BUNDLE_INFO_PRIVILEGED" + }, + { + "name": "ohos.permission.CHANGE_ABILITY_ENABLED_STATE" + }, + { + "name": "ohos.permission.REMOVE_CACHE_FILES" + }, + { + "name": "ohos.permission.LISTEN_BUNDLE_CHANGE" + }, + { + "name": "ohos.permission.START_ABILITIES_FROM_BACKGROUND" + }, + { + "name": "ohos.permission.START_INVISIBLE_ABILITY" + } + ] + } } \ No newline at end of file diff --git a/ability/ability_runtime/stage/actslifecyclemultihaptest/hap4/src/main/module.json b/ability/ability_runtime/stage/actslifecyclemultihaptest/hap4/src/main/module.json index 3c9d185ac..a13f5e23b 100644 --- a/ability/ability_runtime/stage/actslifecyclemultihaptest/hap4/src/main/module.json +++ b/ability/ability_runtime/stage/actslifecyclemultihaptest/hap4/src/main/module.json @@ -6,53 +6,56 @@ "description": "$string:hap4_desc", "mainElement": "Hap4MainAbility1", "deviceTypes": [ - "default", - "phone" + "default" ], "deliveryWithInstall": true, "installationFree": false, "uiSyntax": "ets", "process": "hap4mainability", "pages": "$profile:main_pages", - "abilities": [{ - "name": "com.example.lifecycletest.hap4mainability", - "srcEntrance": "./ets/hap4mainability/hap4mainability.ts", - "description": "$string:Hap4MainAbility1_desc", - "icon": "$media:icon", - "label": "$string:Hap4MainAbility1_label", - "visible": true, - "orientation": "portrait", - "skills": [{ - "actions": [ - "action.system.home" - ], - "entities": [ - "entity.system.home" + "abilities": [ + { + "name": "com.example.lifecycletest.hap4mainability", + "srcEntrance": "./ets/hap4mainability/hap4mainability.ts", + "description": "$string:Hap4MainAbility1_desc", + "icon": "$media:icon", + "label": "$string:Hap4MainAbility1_label", + "visible": true, + "orientation": "portrait", + "skills": [ + { + "actions": [ + "action.system.home" + ], + "entities": [ + "entity.system.home" + ] + } ] - }] - }], - "requestPermissions": [ + } + ], + "requestPermissions": [ { - "name": "ohos.permission.GET_BUNDLE_INFO" + "name": "ohos.permission.GET_BUNDLE_INFO" }, { - "name": "ohos.permission.MANAGE_MISSIONS" + "name": "ohos.permission.MANAGE_MISSIONS" }, { - "name": "ohos.permission.INSTALL_BUNDLE" + "name": "ohos.permission.INSTALL_BUNDLE" }, { - "name": "ohos.permission.GET_BUNDLE_INFO_PRIVILEGED" + "name": "ohos.permission.GET_BUNDLE_INFO_PRIVILEGED" }, { - "name": "ohos.permission.CHANGE_ABILITY_ENABLED_STATE" + "name": "ohos.permission.CHANGE_ABILITY_ENABLED_STATE" }, { - "name": "ohos.permission.REMOVE_CACHE_FILES" + "name": "ohos.permission.REMOVE_CACHE_FILES" }, { - "name": "ohos.permission.LISTEN_BUNDLE_CHANGE" + "name": "ohos.permission.LISTEN_BUNDLE_CHANGE" } - ] + ] } } \ No newline at end of file diff --git a/ability/ability_runtime/stage/actslifecyclesinglehaptest/entry/src/main/module.json b/ability/ability_runtime/stage/actslifecyclesinglehaptest/entry/src/main/module.json index 0e9c03ada..7e935fc6f 100644 --- a/ability/ability_runtime/stage/actslifecyclesinglehaptest/entry/src/main/module.json +++ b/ability/ability_runtime/stage/actslifecyclesinglehaptest/entry/src/main/module.json @@ -1,148 +1,151 @@ { - "module": { - "name": "phone", - "type": "entry", - "srcEntrance": "./ets/Application/AbilityStage.ts", - "description": "$string:phone_entry_dsc", - "mainElement": "MainAbility", - "deviceTypes": [ + "module": { + "name": "phone", + "type": "entry", + "srcEntrance": "./ets/Application/AbilityStage.ts", + "description": "$string:phone_entry_dsc", + "mainElement": "MainAbility", + "deviceTypes": [ "default", - "phone", - "tablet" - ], - "deliveryWithInstall": true, - "installationFree": false, - "uiSyntax": "ets", - "pages": "$profile:main_pages", - "abilities": [{ - "name": "com.example.lifecycle_xts.MainAbility", - "srcEntrance": "./ets/MainAbility/MainAbility.ts", - "description": "$string:phone_entry_main", - "icon": "$media:icon", - "label": "$string:entry_label", - "visible": true, - "orientation": "portrait", - "skills": [{ - "actions": [ - "action.system.home" - ], - "entities": [ - "entity.system.home" - ] - }] - }, - { - "name": "MainAbility1", - "srcEntrance": "./ets/MainAbility1/MainAbility1.ts", - "description": "$string:MainAbility1_desc", - "icon": "$media:icon", - "label": "$string:MainAbility1_label" - }, + "tablet" + ], + "deliveryWithInstall": true, + "installationFree": false, + "uiSyntax": "ets", + "pages": "$profile:main_pages", + "abilities": [ + { + "name": "com.example.lifecycle_xts.MainAbility", + "srcEntrance": "./ets/MainAbility/MainAbility.ts", + "description": "$string:phone_entry_main", + "icon": "$media:icon", + "label": "$string:entry_label", + "visible": true, + "orientation": "portrait", + "skills": [ { - "name": "MainAbility2", - "srcEntrance": "./ets/MainAbility2/MainAbility2.ts", - "description": "$string:MainAbility2_desc", - "icon": "$media:icon", - "label": "$string:MainAbility2_label" - }, - { - "name": "MainAbility3", - "srcEntrance": "./ets/MainAbility3/MainAbility3.ts", - "description": "$string:MainAbility3_desc", - "icon": "$media:icon", - "label": "$string:MainAbility3_label" - }, - { - "name": "MainAbility4", - "srcEntrance": "./ets/MainAbility4/MainAbility4.ts", - "description": "$string:MainAbility4_desc", - "icon": "$media:icon", - "label": "$string:MainAbility4_label" - }, - { - "name": "MainAbility5", - "srcEntrance": "./ets/MainAbility5/MainAbility5.ts", - "description": "$string:MainAbility5_desc", - "icon": "$media:icon", - "label": "$string:MainAbility5_label" - }, - { - "name": "MainAbility6", - "srcEntrance": "./ets/MainAbility6/MainAbility6.ts", - "description": "$string:MainAbility6_desc", - "icon": "$media:icon", - "label": "$string:MainAbility6_label" - }, - { - "name": "MainAbility7", - "srcEntrance": "./ets/MainAbility7/MainAbility7.ts", - "description": "$string:MainAbility7_desc", - "launchType": "singleton", - "icon": "$media:icon", - "label": "$string:MainAbility7_label" - }, - { - "name": "MainAbility8", - "srcEntrance": "./ets/MainAbility8/MainAbility8.ts", - "description": "$string:MainAbility8_desc", - "launchType": "standard", - "icon": "$media:icon", - "label": "$string:MainAbility8_label" - }, - { - "name": "MainAbility9", - "srcEntrance": "./ets/MainAbility9/MainAbility9.ts", - "description": "$string:MainAbility9_desc", - "icon": "$media:icon", - "label": "$string:MainAbility9_label" - }, - { - "name": "Hap1MainAbility1", - "srcEntrance": "./ets/Hap1MainAbility1/Hap1MainAbility1.ts", - "description": "$string:Hap1MainAbility1_desc", - "icon": "$media:icon", - "label": "$string:Hap1MainAbility1_label", - "launchType": "singleton" - }, - { - "name": "Hap1MainAbility2", - "srcEntrance": "./ets/Hap1MainAbility2/Hap1MainAbility2.ts", - "description": "$string:Hap1MainAbility2_desc", - "icon": "$media:icon", - "label": "$string:Hap1MainAbility2_label", - "launchType": "standard" - }, - { - "name": "MainAbility10", - "srcEntrance": "./ets/MainAbility10/MainAbility10.ts", - "description": "$string:MainAbility10_desc", - "icon": "$media:icon", - "label": "$string:MainAbility10_label" - }, - { - "name": "MainAbility11", - "srcEntrance": "./ets/MainAbility11/MainAbility11.ts", - "description": "$string:MainAbility11_desc", - "icon": "$media:icon", - "label": "$string:MainAbility11_label", - "launchType": "standard" - }, - { - "name": "MainAbility12", - "srcEntrance": "./ets/MainAbility12/MainAbility12.ts", - "description": "$string:MainAbility12_desc", - "icon": "$media:icon", - "label": "$string:MainAbility12_label" - }], - "requestPermissions": [ - { - "name":"ohos.permission.START_ABILITIES_FROM_BACKGROUND", - "reason":"need use ohos.permission.START_ABILITIES_FROM_BACKGROUND" - }, - { - "name":"ohos.permission.START_INVISIBLE_ABILITY", - "reason":"need use ohos.permission.START_INVISIBLE_ABILITY" - } - ] - } -} + "actions": [ + "action.system.home" + ], + "entities": [ + "entity.system.home" + ] + } + ] + }, + { + "name": "MainAbility1", + "srcEntrance": "./ets/MainAbility1/MainAbility1.ts", + "description": "$string:MainAbility1_desc", + "icon": "$media:icon", + "label": "$string:MainAbility1_label" + }, + { + "name": "MainAbility2", + "srcEntrance": "./ets/MainAbility2/MainAbility2.ts", + "description": "$string:MainAbility2_desc", + "icon": "$media:icon", + "label": "$string:MainAbility2_label" + }, + { + "name": "MainAbility3", + "srcEntrance": "./ets/MainAbility3/MainAbility3.ts", + "description": "$string:MainAbility3_desc", + "icon": "$media:icon", + "label": "$string:MainAbility3_label" + }, + { + "name": "MainAbility4", + "srcEntrance": "./ets/MainAbility4/MainAbility4.ts", + "description": "$string:MainAbility4_desc", + "icon": "$media:icon", + "label": "$string:MainAbility4_label" + }, + { + "name": "MainAbility5", + "srcEntrance": "./ets/MainAbility5/MainAbility5.ts", + "description": "$string:MainAbility5_desc", + "icon": "$media:icon", + "label": "$string:MainAbility5_label" + }, + { + "name": "MainAbility6", + "srcEntrance": "./ets/MainAbility6/MainAbility6.ts", + "description": "$string:MainAbility6_desc", + "icon": "$media:icon", + "label": "$string:MainAbility6_label" + }, + { + "name": "MainAbility7", + "srcEntrance": "./ets/MainAbility7/MainAbility7.ts", + "description": "$string:MainAbility7_desc", + "launchType": "singleton", + "icon": "$media:icon", + "label": "$string:MainAbility7_label" + }, + { + "name": "MainAbility8", + "srcEntrance": "./ets/MainAbility8/MainAbility8.ts", + "description": "$string:MainAbility8_desc", + "launchType": "standard", + "icon": "$media:icon", + "label": "$string:MainAbility8_label" + }, + { + "name": "MainAbility9", + "srcEntrance": "./ets/MainAbility9/MainAbility9.ts", + "description": "$string:MainAbility9_desc", + "icon": "$media:icon", + "label": "$string:MainAbility9_label" + }, + { + "name": "Hap1MainAbility1", + "srcEntrance": "./ets/Hap1MainAbility1/Hap1MainAbility1.ts", + "description": "$string:Hap1MainAbility1_desc", + "icon": "$media:icon", + "label": "$string:Hap1MainAbility1_label", + "launchType": "singleton" + }, + { + "name": "Hap1MainAbility2", + "srcEntrance": "./ets/Hap1MainAbility2/Hap1MainAbility2.ts", + "description": "$string:Hap1MainAbility2_desc", + "icon": "$media:icon", + "label": "$string:Hap1MainAbility2_label", + "launchType": "standard" + }, + { + "name": "MainAbility10", + "srcEntrance": "./ets/MainAbility10/MainAbility10.ts", + "description": "$string:MainAbility10_desc", + "icon": "$media:icon", + "label": "$string:MainAbility10_label" + }, + { + "name": "MainAbility11", + "srcEntrance": "./ets/MainAbility11/MainAbility11.ts", + "description": "$string:MainAbility11_desc", + "icon": "$media:icon", + "label": "$string:MainAbility11_label", + "launchType": "standard" + }, + { + "name": "MainAbility12", + "srcEntrance": "./ets/MainAbility12/MainAbility12.ts", + "description": "$string:MainAbility12_desc", + "icon": "$media:icon", + "label": "$string:MainAbility12_label" + } + ], + "requestPermissions": [ + { + "name": "ohos.permission.START_ABILITIES_FROM_BACKGROUND", + "reason": "need use ohos.permission.START_ABILITIES_FROM_BACKGROUND" + }, + { + "name": "ohos.permission.START_INVISIBLE_ABILITY", + "reason": "need use ohos.permission.START_INVISIBLE_ABILITY" + } + ] + } +} \ No newline at end of file diff --git a/ability/ability_runtime/stage/actswindowstagelifecyclemultihaptest/entry/src/main/module.json b/ability/ability_runtime/stage/actswindowstagelifecyclemultihaptest/entry/src/main/module.json index 564159e9f..28dc72058 100755 --- a/ability/ability_runtime/stage/actswindowstagelifecyclemultihaptest/entry/src/main/module.json +++ b/ability/ability_runtime/stage/actswindowstagelifecyclemultihaptest/entry/src/main/module.json @@ -1,113 +1,116 @@ { - "module": { - "name": "phone", - "type": "entry", - "srcEntrance": "./ets/Application/AbilityStage.ts", - "description": "$string:phone_entry_dsc", - "mainElement": "MainAbility", - "deviceTypes": [ - "default", - "phone" - ], - "deliveryWithInstall": true, - "installationFree": false, - "uiSyntax": "ets", - "pages": "$profile:main_pages", - "abilities": [{ - "name": "com.example.lifecycletest.MainAbility", - "srcEntrance": "./ets/MainAbility/MainAbility.ts", - "description": "$string:phone_entry_main", - "icon": "$media:icon", - "label": "$string:entry_label", - "visible": true, - "orientation": "portrait", - "skills": [{ - "actions": [ - "action.system.home" - ], - "entities": [ - "entity.system.home" - ] - }] - }, - { - "name": "MainAbility1", - "srcEntrance": "./ets/MainAbility1/MainAbility1.ts", - "description": "$string:MainAbility1_desc", - "icon": "$media:icon", - "label": "$string:MainAbility1_label" - }, + "module": { + "name": "phone", + "type": "entry", + "srcEntrance": "./ets/Application/AbilityStage.ts", + "description": "$string:phone_entry_dsc", + "mainElement": "MainAbility", + "deviceTypes": [ + "default" + ], + "deliveryWithInstall": true, + "installationFree": false, + "uiSyntax": "ets", + "pages": "$profile:main_pages", + "abilities": [ + { + "name": "com.example.lifecycletest.MainAbility", + "srcEntrance": "./ets/MainAbility/MainAbility.ts", + "description": "$string:phone_entry_main", + "icon": "$media:icon", + "label": "$string:entry_label", + "visible": true, + "orientation": "portrait", + "skills": [ { - "name": "MainAbility2", - "srcEntrance": "./ets/MainAbility2/MainAbility2.ts", - "description": "$string:MainAbility2_desc", - "icon": "$media:icon", - "label": "$string:MainAbility2_label" - }, - { - "name": "MainAbility3", - "srcEntrance": "./ets/MainAbility3/MainAbility3.ts", - "description": "$string:MainAbility3_desc", - "icon": "$media:icon", - "label": "$string:MainAbility3_label" - }, - { - "name": "MainAbility4", - "srcEntrance": "./ets/MainAbility4/MainAbility4.ts", - "description": "$string:MainAbility4_desc", - "icon": "$media:icon", - "label": "$string:MainAbility4_label" - }, - { - "name": "MainAbility5", - "srcEntrance": "./ets/MainAbility5/MainAbility5.ts", - "description": "$string:MainAbility5_desc", - "icon": "$media:icon", - "label": "$string:MainAbility5_label" - }, - { - "name": "MainAbility6", - "srcEntrance": "./ets/MainAbility6/MainAbility6.ts", - "description": "$string:MainAbility6_desc", - "icon": "$media:icon", - "label": "$string:MainAbility6_label", - "launchType": "standard" - }, - { - "name": "MainAbility7", - "srcEntrance": "./ets/MainAbility7/MainAbility7.ts", - "description": "$string:MainAbility7_desc", - "icon": "$media:icon", - "label": "$string:MainAbility7_label" - }], - "requestPermissions": [ - { - "name": "ohos.permission.GET_BUNDLE_INFO" - }, - { - "name": "ohos.permission.MANAGE_MISSIONS" - }, - { - "name": "ohos.permission.INSTALL_BUNDLE" - }, - { - "name": "ohos.permission.GET_BUNDLE_INFO_PRIVILEGED" - }, - { - "name": "ohos.permission.CHANGE_ABILITY_ENABLED_STATE" - }, - { - "name": "ohos.permission.REMOVE_CACHE_FILES" - }, - { - "name": "ohos.permission.LISTEN_BUNDLE_CHANGE" - }, - { - "name":"ohos.permission.START_ABILITIES_FROM_BACKGROUND" - }, - { - "name":"ohos.permission.START_INVISIBLE_ABILITY" - } - ] - } + "actions": [ + "action.system.home" + ], + "entities": [ + "entity.system.home" + ] + } + ] + }, + { + "name": "MainAbility1", + "srcEntrance": "./ets/MainAbility1/MainAbility1.ts", + "description": "$string:MainAbility1_desc", + "icon": "$media:icon", + "label": "$string:MainAbility1_label" + }, + { + "name": "MainAbility2", + "srcEntrance": "./ets/MainAbility2/MainAbility2.ts", + "description": "$string:MainAbility2_desc", + "icon": "$media:icon", + "label": "$string:MainAbility2_label" + }, + { + "name": "MainAbility3", + "srcEntrance": "./ets/MainAbility3/MainAbility3.ts", + "description": "$string:MainAbility3_desc", + "icon": "$media:icon", + "label": "$string:MainAbility3_label" + }, + { + "name": "MainAbility4", + "srcEntrance": "./ets/MainAbility4/MainAbility4.ts", + "description": "$string:MainAbility4_desc", + "icon": "$media:icon", + "label": "$string:MainAbility4_label" + }, + { + "name": "MainAbility5", + "srcEntrance": "./ets/MainAbility5/MainAbility5.ts", + "description": "$string:MainAbility5_desc", + "icon": "$media:icon", + "label": "$string:MainAbility5_label" + }, + { + "name": "MainAbility6", + "srcEntrance": "./ets/MainAbility6/MainAbility6.ts", + "description": "$string:MainAbility6_desc", + "icon": "$media:icon", + "label": "$string:MainAbility6_label", + "launchType": "standard" + }, + { + "name": "MainAbility7", + "srcEntrance": "./ets/MainAbility7/MainAbility7.ts", + "description": "$string:MainAbility7_desc", + "icon": "$media:icon", + "label": "$string:MainAbility7_label" + } + ], + "requestPermissions": [ + { + "name": "ohos.permission.GET_BUNDLE_INFO" + }, + { + "name": "ohos.permission.MANAGE_MISSIONS" + }, + { + "name": "ohos.permission.INSTALL_BUNDLE" + }, + { + "name": "ohos.permission.GET_BUNDLE_INFO_PRIVILEGED" + }, + { + "name": "ohos.permission.CHANGE_ABILITY_ENABLED_STATE" + }, + { + "name": "ohos.permission.REMOVE_CACHE_FILES" + }, + { + "name": "ohos.permission.LISTEN_BUNDLE_CHANGE" + }, + { + "name": "ohos.permission.START_ABILITIES_FROM_BACKGROUND" + }, + { + "name": "ohos.permission.START_INVISIBLE_ABILITY" + } + ] + } } \ No newline at end of file diff --git a/ability/ability_runtime/stage/actswindowstagelifecyclemultihaptest/hap4/src/main/module.json b/ability/ability_runtime/stage/actswindowstagelifecyclemultihaptest/hap4/src/main/module.json index 3c9d185ac..a13f5e23b 100755 --- a/ability/ability_runtime/stage/actswindowstagelifecyclemultihaptest/hap4/src/main/module.json +++ b/ability/ability_runtime/stage/actswindowstagelifecyclemultihaptest/hap4/src/main/module.json @@ -6,53 +6,56 @@ "description": "$string:hap4_desc", "mainElement": "Hap4MainAbility1", "deviceTypes": [ - "default", - "phone" + "default" ], "deliveryWithInstall": true, "installationFree": false, "uiSyntax": "ets", "process": "hap4mainability", "pages": "$profile:main_pages", - "abilities": [{ - "name": "com.example.lifecycletest.hap4mainability", - "srcEntrance": "./ets/hap4mainability/hap4mainability.ts", - "description": "$string:Hap4MainAbility1_desc", - "icon": "$media:icon", - "label": "$string:Hap4MainAbility1_label", - "visible": true, - "orientation": "portrait", - "skills": [{ - "actions": [ - "action.system.home" - ], - "entities": [ - "entity.system.home" + "abilities": [ + { + "name": "com.example.lifecycletest.hap4mainability", + "srcEntrance": "./ets/hap4mainability/hap4mainability.ts", + "description": "$string:Hap4MainAbility1_desc", + "icon": "$media:icon", + "label": "$string:Hap4MainAbility1_label", + "visible": true, + "orientation": "portrait", + "skills": [ + { + "actions": [ + "action.system.home" + ], + "entities": [ + "entity.system.home" + ] + } ] - }] - }], - "requestPermissions": [ + } + ], + "requestPermissions": [ { - "name": "ohos.permission.GET_BUNDLE_INFO" + "name": "ohos.permission.GET_BUNDLE_INFO" }, { - "name": "ohos.permission.MANAGE_MISSIONS" + "name": "ohos.permission.MANAGE_MISSIONS" }, { - "name": "ohos.permission.INSTALL_BUNDLE" + "name": "ohos.permission.INSTALL_BUNDLE" }, { - "name": "ohos.permission.GET_BUNDLE_INFO_PRIVILEGED" + "name": "ohos.permission.GET_BUNDLE_INFO_PRIVILEGED" }, { - "name": "ohos.permission.CHANGE_ABILITY_ENABLED_STATE" + "name": "ohos.permission.CHANGE_ABILITY_ENABLED_STATE" }, { - "name": "ohos.permission.REMOVE_CACHE_FILES" + "name": "ohos.permission.REMOVE_CACHE_FILES" }, { - "name": "ohos.permission.LISTEN_BUNDLE_CHANGE" + "name": "ohos.permission.LISTEN_BUNDLE_CHANGE" } - ] + ] } } \ No newline at end of file diff --git a/ability/ability_runtime/stage/actswindowstagelifecyclesinglehaptest/entry/src/main/module.json b/ability/ability_runtime/stage/actswindowstagelifecyclesinglehaptest/entry/src/main/module.json index dec743967..4463d1bf8 100755 --- a/ability/ability_runtime/stage/actswindowstagelifecyclesinglehaptest/entry/src/main/module.json +++ b/ability/ability_runtime/stage/actswindowstagelifecyclesinglehaptest/entry/src/main/module.json @@ -1,148 +1,151 @@ { - "module": { - "name": "phone", - "type": "entry", - "srcEntrance": "./ets/Application/AbilityStage.ts", - "description": "$string:phone_entry_dsc", - "mainElement": "MainAbility", - "deviceTypes": [ + "module": { + "name": "phone", + "type": "entry", + "srcEntrance": "./ets/Application/AbilityStage.ts", + "description": "$string:phone_entry_dsc", + "mainElement": "MainAbility", + "deviceTypes": [ "default", - "phone", - "tablet" - ], - "deliveryWithInstall": true, - "installationFree": false, - "uiSyntax": "ets", - "pages": "$profile:main_pages", - "abilities": [{ - "name": "com.example.windowstagelifecycle_xts.MainAbility", - "srcEntrance": "./ets/MainAbility/MainAbility.ts", - "description": "$string:phone_entry_main", - "icon": "$media:icon", - "label": "$string:entry_label", - "visible": true, - "orientation": "portrait", - "skills": [{ - "actions": [ - "action.system.home" - ], - "entities": [ - "entity.system.home" - ] - }] - }, - { - "name": "MainAbility1", - "srcEntrance": "./ets/MainAbility1/MainAbility1.ts", - "description": "$string:MainAbility1_desc", - "icon": "$media:icon", - "label": "$string:MainAbility1_label" - }, + "tablet" + ], + "deliveryWithInstall": true, + "installationFree": false, + "uiSyntax": "ets", + "pages": "$profile:main_pages", + "abilities": [ + { + "name": "com.example.windowstagelifecycle_xts.MainAbility", + "srcEntrance": "./ets/MainAbility/MainAbility.ts", + "description": "$string:phone_entry_main", + "icon": "$media:icon", + "label": "$string:entry_label", + "visible": true, + "orientation": "portrait", + "skills": [ { - "name": "MainAbility2", - "srcEntrance": "./ets/MainAbility2/MainAbility2.ts", - "description": "$string:MainAbility2_desc", - "icon": "$media:icon", - "label": "$string:MainAbility2_label" - }, - { - "name": "MainAbility3", - "srcEntrance": "./ets/MainAbility3/MainAbility3.ts", - "description": "$string:MainAbility3_desc", - "icon": "$media:icon", - "label": "$string:MainAbility3_label" - }, - { - "name": "MainAbility4", - "srcEntrance": "./ets/MainAbility4/MainAbility4.ts", - "description": "$string:MainAbility4_desc", - "icon": "$media:icon", - "label": "$string:MainAbility4_label" - }, - { - "name": "MainAbility5", - "srcEntrance": "./ets/MainAbility5/MainAbility5.ts", - "description": "$string:MainAbility5_desc", - "icon": "$media:icon", - "label": "$string:MainAbility5_label" - }, - { - "name": "MainAbility6", - "srcEntrance": "./ets/MainAbility6/MainAbility6.ts", - "description": "$string:MainAbility6_desc", - "icon": "$media:icon", - "label": "$string:MainAbility6_label" - }, - { - "name": "MainAbility7", - "srcEntrance": "./ets/MainAbility7/MainAbility7.ts", - "description": "$string:MainAbility7_desc", - "launchType": "singleton", - "icon": "$media:icon", - "label": "$string:MainAbility7_label" - }, - { - "name": "MainAbility8", - "srcEntrance": "./ets/MainAbility8/MainAbility8.ts", - "description": "$string:MainAbility8_desc", - "launchType": "standard", - "icon": "$media:icon", - "label": "$string:MainAbility8_label" - }, - { - "name": "MainAbility9", - "srcEntrance": "./ets/MainAbility9/MainAbility9.ts", - "description": "$string:MainAbility9_desc", - "icon": "$media:icon", - "label": "$string:MainAbility9_label" - }, - { - "name": "Hap1MainAbility1", - "srcEntrance": "./ets/Hap1MainAbility1/Hap1MainAbility1.ts", - "description": "$string:Hap1MainAbility1_desc", - "icon": "$media:icon", - "label": "$string:Hap1MainAbility1_label", - "launchType": "singleton" - }, - { - "name": "Hap1MainAbility2", - "srcEntrance": "./ets/Hap1MainAbility2/Hap1MainAbility2.ts", - "description": "$string:Hap1MainAbility2_desc", - "icon": "$media:icon", - "label": "$string:Hap1MainAbility2_label", - "launchType": "standard" - }, - { - "name": "MainAbility10", - "srcEntrance": "./ets/MainAbility10/MainAbility10.ts", - "description": "$string:MainAbility10_desc", - "icon": "$media:icon", - "label": "$string:MainAbility10_label" - }, - { - "name": "MainAbility11", - "srcEntrance": "./ets/MainAbility11/MainAbility11.ts", - "description": "$string:MainAbility11_desc", - "icon": "$media:icon", - "label": "$string:MainAbility11_label", - "launchType": "standard" - }, - { - "name": "MainAbility12", - "srcEntrance": "./ets/MainAbility12/MainAbility12.ts", - "description": "$string:MainAbility12_desc", - "icon": "$media:icon", - "label": "$string:MainAbility12_label" - }], - "requestPermissions": [ - { - "name":"ohos.permission.START_ABILITIES_FROM_BACKGROUND", - "reason":"need use ohos.permission.START_ABILITIES_FROM_BACKGROUND" - }, - { - "name":"ohos.permission.START_INVISIBLE_ABILITY", - "reason":"need use ohos.permission.START_INVISIBLE_ABILITY" - } - ] - } -} + "actions": [ + "action.system.home" + ], + "entities": [ + "entity.system.home" + ] + } + ] + }, + { + "name": "MainAbility1", + "srcEntrance": "./ets/MainAbility1/MainAbility1.ts", + "description": "$string:MainAbility1_desc", + "icon": "$media:icon", + "label": "$string:MainAbility1_label" + }, + { + "name": "MainAbility2", + "srcEntrance": "./ets/MainAbility2/MainAbility2.ts", + "description": "$string:MainAbility2_desc", + "icon": "$media:icon", + "label": "$string:MainAbility2_label" + }, + { + "name": "MainAbility3", + "srcEntrance": "./ets/MainAbility3/MainAbility3.ts", + "description": "$string:MainAbility3_desc", + "icon": "$media:icon", + "label": "$string:MainAbility3_label" + }, + { + "name": "MainAbility4", + "srcEntrance": "./ets/MainAbility4/MainAbility4.ts", + "description": "$string:MainAbility4_desc", + "icon": "$media:icon", + "label": "$string:MainAbility4_label" + }, + { + "name": "MainAbility5", + "srcEntrance": "./ets/MainAbility5/MainAbility5.ts", + "description": "$string:MainAbility5_desc", + "icon": "$media:icon", + "label": "$string:MainAbility5_label" + }, + { + "name": "MainAbility6", + "srcEntrance": "./ets/MainAbility6/MainAbility6.ts", + "description": "$string:MainAbility6_desc", + "icon": "$media:icon", + "label": "$string:MainAbility6_label" + }, + { + "name": "MainAbility7", + "srcEntrance": "./ets/MainAbility7/MainAbility7.ts", + "description": "$string:MainAbility7_desc", + "launchType": "singleton", + "icon": "$media:icon", + "label": "$string:MainAbility7_label" + }, + { + "name": "MainAbility8", + "srcEntrance": "./ets/MainAbility8/MainAbility8.ts", + "description": "$string:MainAbility8_desc", + "launchType": "standard", + "icon": "$media:icon", + "label": "$string:MainAbility8_label" + }, + { + "name": "MainAbility9", + "srcEntrance": "./ets/MainAbility9/MainAbility9.ts", + "description": "$string:MainAbility9_desc", + "icon": "$media:icon", + "label": "$string:MainAbility9_label" + }, + { + "name": "Hap1MainAbility1", + "srcEntrance": "./ets/Hap1MainAbility1/Hap1MainAbility1.ts", + "description": "$string:Hap1MainAbility1_desc", + "icon": "$media:icon", + "label": "$string:Hap1MainAbility1_label", + "launchType": "singleton" + }, + { + "name": "Hap1MainAbility2", + "srcEntrance": "./ets/Hap1MainAbility2/Hap1MainAbility2.ts", + "description": "$string:Hap1MainAbility2_desc", + "icon": "$media:icon", + "label": "$string:Hap1MainAbility2_label", + "launchType": "standard" + }, + { + "name": "MainAbility10", + "srcEntrance": "./ets/MainAbility10/MainAbility10.ts", + "description": "$string:MainAbility10_desc", + "icon": "$media:icon", + "label": "$string:MainAbility10_label" + }, + { + "name": "MainAbility11", + "srcEntrance": "./ets/MainAbility11/MainAbility11.ts", + "description": "$string:MainAbility11_desc", + "icon": "$media:icon", + "label": "$string:MainAbility11_label", + "launchType": "standard" + }, + { + "name": "MainAbility12", + "srcEntrance": "./ets/MainAbility12/MainAbility12.ts", + "description": "$string:MainAbility12_desc", + "icon": "$media:icon", + "label": "$string:MainAbility12_label" + } + ], + "requestPermissions": [ + { + "name": "ohos.permission.START_ABILITIES_FROM_BACKGROUND", + "reason": "need use ohos.permission.START_ABILITIES_FROM_BACKGROUND" + }, + { + "name": "ohos.permission.START_INVISIBLE_ABILITY", + "reason": "need use ohos.permission.START_INVISIBLE_ABILITY" + } + ] + } +} \ No newline at end of file diff --git a/ability/ability_runtime/want/actsgetwantalltest/src/main/config.json b/ability/ability_runtime/want/actsgetwantalltest/src/main/config.json index 2f2347ebd..0303be7ed 100644 --- a/ability/ability_runtime/want/actsgetwantalltest/src/main/config.json +++ b/ability/ability_runtime/want/actsgetwantalltest/src/main/config.json @@ -17,8 +17,7 @@ "package": "com.example.actsgetwantalltest", "name": ".entry", "deviceType": [ - "default", - "phone" + "default" ], "distro": { "deliveryWithInstall": true, diff --git a/ability/ability_runtime/want/sceneProject/actsgetwantalltesthap/src/main/config.json b/ability/ability_runtime/want/sceneProject/actsgetwantalltesthap/src/main/config.json index f8546baa5..dfd9b7f02 100644 --- a/ability/ability_runtime/want/sceneProject/actsgetwantalltesthap/src/main/config.json +++ b/ability/ability_runtime/want/sceneProject/actsgetwantalltesthap/src/main/config.json @@ -17,8 +17,7 @@ "package": "com.example.actsgetwantallhap", "name": "com.example.actsgetwantalltesthap.MyApplication", "deviceType": [ - "default", - "phone" + "default" ], "distro": { "deliveryWithInstall": true, diff --git a/ability/ability_runtime/workercontextcover/workercontexttest/entry/src/main/module.json b/ability/ability_runtime/workercontextcover/workercontexttest/entry/src/main/module.json index c49dee47d..c88346eef 100644 --- a/ability/ability_runtime/workercontextcover/workercontexttest/entry/src/main/module.json +++ b/ability/ability_runtime/workercontextcover/workercontexttest/entry/src/main/module.json @@ -1,40 +1,39 @@ { - "module": { - "name": "entry", - "type": "entry", - "srcEntrance": "./ets/Application/AbilityStage.ts", - "description": "$string:entry_desc", - "mainElement": "MainAbility", - "deviceTypes": [ - "default", - "phone" - ], - "deliveryWithInstall": true, - "installationFree": false, - "pages": "$profile:main_pages", - "uiSyntax": "ets", - "abilities": [ - { - "name": "com.example.workercontexttest.MainAbility", - "srcEntrance": "./ets/MainAbility/MainAbility.ts", - "description": "$string:MainAbility_desc", - "icon": "$media:icon", - "label": "$string:MainAbility_label", - "startWindowIcon": "$media:icon", - "startWindowBackground": "$color:white", - "visible": true, - "orientation": "portrait", - "skills": [ - { - "entities": [ - "entity.system.home" - ], - "actions": [ - "action.system.home" - ] - } - ] - } - ] - } - } \ No newline at end of file + "module": { + "name": "entry", + "type": "entry", + "srcEntrance": "./ets/Application/AbilityStage.ts", + "description": "$string:entry_desc", + "mainElement": "MainAbility", + "deviceTypes": [ + "default" + ], + "deliveryWithInstall": true, + "installationFree": false, + "pages": "$profile:main_pages", + "uiSyntax": "ets", + "abilities": [ + { + "name": "com.example.workercontexttest.MainAbility", + "srcEntrance": "./ets/MainAbility/MainAbility.ts", + "description": "$string:MainAbility_desc", + "icon": "$media:icon", + "label": "$string:MainAbility_label", + "startWindowIcon": "$media:icon", + "startWindowBackground": "$color:white", + "visible": true, + "orientation": "portrait", + "skills": [ + { + "entities": [ + "entity.system.home" + ], + "actions": [ + "action.system.home" + ] + } + ] + } + ] + } +} \ No newline at end of file diff --git a/ability/ability_runtime/zidltest/actsamszidlclienttest/entry/src/main/module.json b/ability/ability_runtime/zidltest/actsamszidlclienttest/entry/src/main/module.json index a914a1a8a..fc14c3b57 100644 --- a/ability/ability_runtime/zidltest/actsamszidlclienttest/entry/src/main/module.json +++ b/ability/ability_runtime/zidltest/actsamszidlclienttest/entry/src/main/module.json @@ -1,101 +1,100 @@ { - "module": { - "name": "phone", - "type": "entry", - "srcEntrance": "./ets/Application/AbilityStage.ts", - "description": "$string:phone_entry_dsc", - "mainElement": "MainAbility", - "deviceTypes": [ - "default", - "phone" - ], - "deliveryWithInstall": true, - "installationFree": false, - "uiSyntax": "ets", - "pages": "$profile:main_pages", - "abilities": [ - { - "name": "com.example.zidlclienttest.MainAbility", - "srcEntrance": "./ets/MainAbility/MainAbility.ts", - "description": "$string:phone_entry_main", - "icon": "$media:icon", - "label": "$string:entry_label", - "visible": true, - "orientation": "portrait", - "launchType": "singleton", - "skills": [ - { - "actions": [ - "action.system.home" - ], - "entities":[ - "entity.system.home" - ] - } - ] - } - ], - "extensionAbilities": [ + "module": { + "name": "phone", + "type": "entry", + "srcEntrance": "./ets/Application/AbilityStage.ts", + "description": "$string:phone_entry_dsc", + "mainElement": "MainAbility", + "deviceTypes": [ + "default" + ], + "deliveryWithInstall": true, + "installationFree": false, + "uiSyntax": "ets", + "pages": "$profile:main_pages", + "abilities": [ + { + "name": "com.example.zidlclienttest.MainAbility", + "srcEntrance": "./ets/MainAbility/MainAbility.ts", + "description": "$string:phone_entry_main", + "icon": "$media:icon", + "label": "$string:entry_label", + "visible": true, + "orientation": "portrait", + "launchType": "singleton", + "skills": [ { - "srcEntrance": "./ets/ServiceAbility/ServiceAbility.ts", - "name": "com.example.zidlclienttest.ServiceAbility", - "icon": "$media:icon", - "srcLanguage": "ets", - "description": "$string:phone_entry_main", - "type": "service", - "visible": true - }, - { - "srcEntrance": "./ets/ServiceAbility2/ServiceAbility2.ts", - "name": "com.example.zidlclienttest.ServiceAbility2", - "icon": "$media:icon", - "srcLanguage": "ets", - "description": "$string:phone_entry_main", - "type": "service", - "visible": true + "actions": [ + "action.system.home" + ], + "entities": [ + "entity.system.home" + ] } - ], - "requestPermissions": [ - { - "name":"ohos.permission.GET_BUNDLE_INFO_PRIVILEGED", - "reason":"need use ohos.permission.GET_BUNDLE_INFO_PRIVILEGED" - }, - { - "name":"ohos.permission.GET_BUNDLE_INFO", - "reason":"need use ohos.permission.GET_BUNDLE_INFO" - }, - { - "name":"ohos.permission.CHANGE_ABILITY_ENABLED_STATE", - "reason":"need use ohos.permission.CHANGE_ABILITY_ENABLED_STATE" - }, - { - "name":"ohos.permission.REMOVE_CACHE_FILES", - "reason":"need use ohos.permission.REMOVE_CACHE_FILES" - }, - { - "name":"ohos.permission.LISTEN_BUNDLE_CHANGE", - "reason":"need use ohos.permission.LISTEN_BUNDLE_CHANGE" - }, - { - "name":"ohos.permission.INSTALL_BUNDLE", - "reason":"need use ohos.permission.INSTALL_BUNDLE" - }, - { - "name":"ohos.permission.MANAGE_MISSIONS", - "reason":"need use ohos.permission.MANAGE_MISSIONS" - }, - { - "name":"ohos.permission.GET_RUNNING_INFO", - "reason":"need use ohos.permission.GET_RUNNING_INFO" - }, - { - "name":"ohos.permission.CLEAN_BACKGROUND_PROCESSES", - "reason":"need use ohos.permission.CLEAN_BACKGROUND_PROCESSES" - }, - { - "name":"ohos.permission.CLEAN_APPLICATION_DATA", - "reason":"need use ohos.permission.CLEAN_APPLICATION_DATA" - } - ] - } -} + ] + } + ], + "extensionAbilities": [ + { + "srcEntrance": "./ets/ServiceAbility/ServiceAbility.ts", + "name": "com.example.zidlclienttest.ServiceAbility", + "icon": "$media:icon", + "srcLanguage": "ets", + "description": "$string:phone_entry_main", + "type": "service", + "visible": true + }, + { + "srcEntrance": "./ets/ServiceAbility2/ServiceAbility2.ts", + "name": "com.example.zidlclienttest.ServiceAbility2", + "icon": "$media:icon", + "srcLanguage": "ets", + "description": "$string:phone_entry_main", + "type": "service", + "visible": true + } + ], + "requestPermissions": [ + { + "name": "ohos.permission.GET_BUNDLE_INFO_PRIVILEGED", + "reason": "need use ohos.permission.GET_BUNDLE_INFO_PRIVILEGED" + }, + { + "name": "ohos.permission.GET_BUNDLE_INFO", + "reason": "need use ohos.permission.GET_BUNDLE_INFO" + }, + { + "name": "ohos.permission.CHANGE_ABILITY_ENABLED_STATE", + "reason": "need use ohos.permission.CHANGE_ABILITY_ENABLED_STATE" + }, + { + "name": "ohos.permission.REMOVE_CACHE_FILES", + "reason": "need use ohos.permission.REMOVE_CACHE_FILES" + }, + { + "name": "ohos.permission.LISTEN_BUNDLE_CHANGE", + "reason": "need use ohos.permission.LISTEN_BUNDLE_CHANGE" + }, + { + "name": "ohos.permission.INSTALL_BUNDLE", + "reason": "need use ohos.permission.INSTALL_BUNDLE" + }, + { + "name": "ohos.permission.MANAGE_MISSIONS", + "reason": "need use ohos.permission.MANAGE_MISSIONS" + }, + { + "name": "ohos.permission.GET_RUNNING_INFO", + "reason": "need use ohos.permission.GET_RUNNING_INFO" + }, + { + "name": "ohos.permission.CLEAN_BACKGROUND_PROCESSES", + "reason": "need use ohos.permission.CLEAN_BACKGROUND_PROCESSES" + }, + { + "name": "ohos.permission.CLEAN_APPLICATION_DATA", + "reason": "need use ohos.permission.CLEAN_APPLICATION_DATA" + } + ] + } +} \ No newline at end of file diff --git a/ability/ability_runtime/zidltest/actsamszidlservice/entry/src/main/module.json b/ability/ability_runtime/zidltest/actsamszidlservice/entry/src/main/module.json index 64a6a860f..e99d33162 100644 --- a/ability/ability_runtime/zidltest/actsamszidlservice/entry/src/main/module.json +++ b/ability/ability_runtime/zidltest/actsamszidlservice/entry/src/main/module.json @@ -6,8 +6,7 @@ "description": "$string:phone_entry_dsc", "mainElement": "MainAbility", "deviceTypes": [ - "default", - "phone" + "default" ], "deliveryWithInstall": true, "installationFree": false, diff --git a/ability/dmsfwk/continuationmanagertest/src/main/config.json b/ability/dmsfwk/continuationmanagertest/src/main/config.json index d8366edba..3aee55771 100644 --- a/ability/dmsfwk/continuationmanagertest/src/main/config.json +++ b/ability/dmsfwk/continuationmanagertest/src/main/config.json @@ -17,8 +17,7 @@ "name": ".entry", "mainAbility": ".MainAbility", "deviceType": [ - "default", - "phone" + "default" ], "distro": { "deliveryWithInstall": true, -- GitLab