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 4c8ac00a4cb2589f3569729ccdd9809fe9c94baa..cc7238d29b20ea84bb5de27abed4fea6c92793cf 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 9b2e7217ec0bbcee721bdee555abdfd81865b01d..7ac0abaddf4e2cfa0be1396c8b80a5c4f022174b 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 b7072fbcaba880a1c1be074a82677b0d1b9360c8..67d8175e38f1479169f73561c6b23f7f0e51c18a 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 19cd72eca96fa364da0aae5c8892e0e7eb0848d0..34441664894c5461c8ca036386e21a240b10711b 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 b7072fbcaba880a1c1be074a82677b0d1b9360c8..67d8175e38f1479169f73561c6b23f7f0e51c18a 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 b7072fbcaba880a1c1be074a82677b0d1b9360c8..67d8175e38f1479169f73561c6b23f7f0e51c18a 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 19cd72eca96fa364da0aae5c8892e0e7eb0848d0..34441664894c5461c8ca036386e21a240b10711b 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 e68dd4067e1d3d1a2d249e7ff4e48e716027a94e..573d4e35381a61e2a03f17932b8fba646c22cd49 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 98b5a3ac6a31d61a11bc69961f4a3eab3c7816e8..a2957676bb352be571197f28b1ec7352ee4b9d6c 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 c13a28be2b4c8702f3ec2ae3eeb4115104c6dd67..d57533142e5c46c9db6cf61eca6d96eabc502c2a 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 e6b6b649761ccdb21a70964c73dd6856530bccfd..be067eaf16ec880dcb31106808374102fee77537 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 75d5900a2019ef12df78165d534d13842c7e6650..926b54d3fdda2d65018c2d21770c3659374ff653 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 c2b7d9418c177863be212483c4283cdcf0eb8e00..b9c6097595c87b8499ab8cbc629a2f980c56c612 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 0ee07351d8c166702544d07a6a2d00ecda507ab5..14099860ffd27e29ea4510b7371184e9071e4018 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 78cb23d926127618280a31b2dd9f24643cae7881..5a25909c398892f1348a6d954702ad97d596bf4c 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 56d9adbc0f51e479d148a1856212c0dc66a7a8b3..d62094397b2926973d0799bf0ef513578b1e1039 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 89e35043d00c179ac285b3eb92a8441e6aeaa9e3..c42d0b329acc49b1eac74401016dda6150fdc418 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 c78ab63a3c993aaef684b3b8cf9f89e36c2300b6..2b858f2d1a83d785a90359f82d9cbd8fcd3ed451 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 e7ad9a86fb7ab3b398fb26195de20b50e290043d..7aa0318a98ad8430edd24f515bc2245b960ef37a 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 c2f3e47b6d636d1d9a06a2de0a2a8789deb79de9..a4d9b2bed786b9c506c7a3e353cb4e8a9f849504 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 8c82d1fcef030581bba3da2cd1b7e36fe053f9dd..d9776194251186bc32bb07d9d5b4891a94d76e68 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 42fc6c622a090f0ae9773463008570cd03a76446..8b95b1a5c7fb086d501e6b56856a29343bbebfe8 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 3d6e72c4cb3194bbd8746295d68afddd6e3bb1ea..3c7890f03dd6b666c190241a70c9f61d2e140f25 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 f23724b5b11b5d4ee49c433a7a835f2818ec1ce3..de781134a39890c903f2f79f2a371210485b51fe 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 eb64059ad8bb44d87ef639af6a917e76f0ada5c0..a010eb12b964ba3315318e6ea839623d11ce4758 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 1ac01030cac5fa90199bd4dff131195655ac2b25..61fb321aa064bf7ebdb79c5df8df0209eb638fe2 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 980d4d28b712f00348fb7ffa27f4e7a41c36f4dd..d92eac1351af60774d1fed1da542f125dc7ff1ec 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 9c0f79b26fe4512bea5abb961089d563a9a7f75a..35c161f14fd082e06cccb988eb4d18cef2dea067 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 0156baf35e7675c7c13e4ee3370c373bf7ee4453..4200717ed884639d2e60df10ed9096ad700535cb 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 e9c2e405452a71c68db0b60e163585b366891e0c..b3b145d06377ea8c4f89a69ee42e7817a8e37b26 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 2dc69255f983edb8593e020b6fcc73a225d1d31f..327e861b6691e5d1b3faebe53a49e9bae2610720 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 1ab7e76239d8938364fcbe5f83157302d3e00425..6acc12f62dcf81121df92d959c75260ad0c0b95f 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 ba8c50bb286d033861ce929d3ff32047aca40522..01fd1934ee1683874889c1e8658d5eb632b62666 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 14299d215f1fb8c4f9cf87a00c4915cfa2ecdb8e..cd1b2ecabd06bc88f8073a7f76ff1bf1abae3cc6 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 d17f8659db601fc0d0ede59773a66a56cd4dc1cf..67edae7e7a2d273c2b47835810b0cf8b0d5fbca3 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 af9885f310f2f6c6f2c08fee63c4f9c40aed967c..ce69e78940991db0b7a99cb4b64be274d153275c 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 1868c97065974161717a459761cb8a21bdb77f8a..04d2ae8ed563ad88b2e385c38df60ce00127503b 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 cce709b00ba46b3b1948e9d8968061b5f334c10f..752370949910be3d59202cbcad8657df1400aad7 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 c2fa25973e1c4a0759314d89c05ddab989fd2033..85363cca9e40f3fceaab835dc0903ea017bed1a3 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 ddc5a77fe4142cce29b00266ab032da4aa910cba..65be6e3dca5231cdb68411322020e9ba9b15b989 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 d4759b77fa44488ac09e4ce59469ef7f0367c8f9..3b55239d095be39f47ef27bcbc8dc3145954a422 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 d4759b77fa44488ac09e4ce59469ef7f0367c8f9..3b55239d095be39f47ef27bcbc8dc3145954a422 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 63433eb8d6b9487794cb12a568e2b0f733abdad3..7c3003b37be4f151c8e616c413817c51edb34251 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 9f0588e2b01de5e7be32dfad152eee0c3097c594..b493f7e0d4837b9d246396de27712a954ba5f8b4 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 cdf0c7dd43e3f837aa98eef7aaca99a153efe00f..a75f20ffb8b8e8761d09c62c75e40a41db688121 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 d4759b77fa44488ac09e4ce59469ef7f0367c8f9..3b55239d095be39f47ef27bcbc8dc3145954a422 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 9c5991c31d2ebedc37f3df222ee647e4e17ce60f..dd9393a8c59f683985acdfd3ae382b658195ff1f 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 9f0588e2b01de5e7be32dfad152eee0c3097c594..b493f7e0d4837b9d246396de27712a954ba5f8b4 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 9c5991c31d2ebedc37f3df222ee647e4e17ce60f..dd9393a8c59f683985acdfd3ae382b658195ff1f 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 813610967ecfbd698d1bbf0bc8b4d29c18904262..cc03b3fb1dc5030dfa8558682d15edace451c521 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 08f74bf6254b16c01eeee6416d6958022d828e1c..994ab39b0c9449c68b56af5644feebe5caf2742f 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 8c94ac7bfb74af1d6c878b86df1bd7be99b49992..190998d643a781ee579e62dcd35e7ae83b0402ed 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 9f0588e2b01de5e7be32dfad152eee0c3097c594..b493f7e0d4837b9d246396de27712a954ba5f8b4 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 9f0588e2b01de5e7be32dfad152eee0c3097c594..b493f7e0d4837b9d246396de27712a954ba5f8b4 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 9f0588e2b01de5e7be32dfad152eee0c3097c594..b493f7e0d4837b9d246396de27712a954ba5f8b4 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 d6d2ca5d59ade7344363c49384aeda2e12280916..e178e288652f4a0d05ffd5449877ffed7da65282 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 d4759b77fa44488ac09e4ce59469ef7f0367c8f9..3b55239d095be39f47ef27bcbc8dc3145954a422 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 d5ff071453789a78c54e1b90a1d323294996502b..de09c071c271d094bb234b14ea63c53fb6b625dd 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 96165322cba1e22a7cff03ceee3c96d83099f0c4..464a9ee62e9551c840c0dafe3d00b3feae770d29 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 66926bfc494ab0189e6b0454ff3cd8ef72c4ae5b..927023c0d71464616612bf5c16d81dfeeb6ed8ff 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 3ebcb6f57be19a4c62316c673c38d5dea29854e8..9eeb3cc4098efb3b4a865db3cdc791267faa6b74 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 36ef410d47779a929811b346e1577e79ca9bf391..f4bae31f49e70b15e6540934459d8b6199272881 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 a498525b79d1143cae6ff154b57786b740851f3a..2027127689c605fd23219d0e88e4bcc739f500f6 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 0972283a3ac4c14935f38555fd8c0790f42d20c6..0b339f39472ab27756cefcaacb9f76cee8551fb7 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 189a522070726cce363635438b6d7bbd05613b5a..daf8c9b0f25dba715098cc6e8256c50eaf71ef7f 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 d0dafedf8ddd0cd680f92767f23668249b0dc3f3..9ae752a4263c47912f939683649c2177568649eb 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 aa060703b712204544fbc467b9c83e6226a2a961..45204e311af976b6569063a918679d12106c7317 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 7dfa59339f0cb0128e1bae3b688a537058a568a6..5590c5e06de2a43a993faea939402c0eefe7950d 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 b68cd0930f90833c134f1247167afa69f3d0eca1..f0e4f3b23c6d18b1d182c51ac9e3b41e640ad1f0 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 57885f72d00f6cd1f32f49f8b694cd21a80bd10e..3486fced43497ec114da7a63653f355fb1ccb653 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 08d39cbe20e884c67e8ce274a2c5cf78d115c8bd..eae7242c780bd33842f85e5e8c9a29c79facaed2 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 7c2ee6b7d60e5e3fb3866148b32b423afca79702..9cd2e9a045953fe7e3021ddd8b9c2c84da537015 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 fcdb1221b07ed6e22ff8c52c3220b63805b4f190..76b362d7dbe98f2aa7fcf752fc9906028e654668 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 b27d0f0d803b0e5f89a5aeb3509aefbd19d0c8f7..0f2d00e49308a9c6c2c3be0d290aa7f24d688552 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 5bb1810f319a58f65b650a2236fac45b5cf25d25..f504a14de226df2114f6fed5fd9f496e0c327ae4 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 c93183b1bbb8a523964513703307259da2aaf564..9e4df76ed4a63de25c58dac5989b5c6d379b22bc 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 afbf5b68756a617f65fdf70fc750f1add2fcd3a7..7f740702ed07b65822f2270183cd46e1221b5bfd 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 9d72e996bfc19073ff977c0c333f3a238995136c..efe2bfd26222f5b9eb67c0eae8a9aef0630b2000 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 1a8073b9a927759a51af1784dfa5e6f5238eec30..4288f361ca8698205f756206e3d4bbca067a3782 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 51f1b4e73aa66b3efe133332d0e00db4aca68aa3..5eb38123a93ae218aa808d62aa0fc1caa6c282fb 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 2021dc4739be0667797d6fa59b0c89ac16363bc9..64bcb1c5e211bbd90abe41c1fc5ec30331d3d475 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 ef30793d100bdfe17f02713a68a762aa0ff15bab..729da1714ed48c5e97df799de6be0174eaa55982 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 0dbcd3cba07228d4a8b161c954c9f0ed6974ac46..6a920661b545ada1870a716bd904911b646634b4 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 0dbcd3cba07228d4a8b161c954c9f0ed6974ac46..6a920661b545ada1870a716bd904911b646634b4 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 0dbcd3cba07228d4a8b161c954c9f0ed6974ac46..6a920661b545ada1870a716bd904911b646634b4 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 1a6fa9151a78d2690410cbb3c15ddb9caddd1917..98903f29d92c381aecaf9aee4707acf1ac047c20 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 1a6fa9151a78d2690410cbb3c15ddb9caddd1917..98903f29d92c381aecaf9aee4707acf1ac047c20 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 15d5a27d063781a24281822e9a2bcdca1ba2da1a..2adb8db12ed1e318b54a9001b48983f46aa78dc6 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 ce58f0c8c4605b7644eace1d94ef9fbe02b71638..d99b9aa81185b27dd0836bc1e73d623a54185856 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 103ef286afb1ac1b5d44fed56dc7ac3ca2eb7948..88465c8e7cf445834a5446ffae7523a574aee69d 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 62daa989b086556ef166f17c87ebb9d02b57088d..7c3003b37be4f151c8e616c413817c51edb34251 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 62daa989b086556ef166f17c87ebb9d02b57088d..7c3003b37be4f151c8e616c413817c51edb34251 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 3070d410d79ffd3623bce2879540478b1b42269b..f372f33aec78f44d77053856ff772172f5d4db54 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 7ecb659cc6bd1dda0bfd612eee911b2ae26ec030..9b14d2bc88c57ad47e1d99e8586ca1c9591c03b3 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 f58264028b00b053dced5fa14bcf435b9c934236..b9f82977ad4f5655113f12363fe0f9860f87cd1c 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 a25d6741261be58fdf4dd69cb7085b8bb0b1e4ad..c63e1beab47b8614f28d121846c34920fb88cdb0 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 2667a2663c320009e816f58f79ad11f39b0f6821..e3569275a562a9aa044d50b532383a9a402d386e 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 20441856b1163dccb1e1c356bce377be7649feff..16b6b4b9523b85b1eb84d2507ccd2893bbb10f9e 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 f1b8fbc4b8503c5085bc966fd15ad4a666a54c12..c87da7251c9700dfaa7e05adfacffc579394fccd 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 b2dd441e0deb273add546bb54880f01674e21dbb..72c41ec8345bdd3bfd8bf36479043d9388232dfc 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 d175d82d88ac117f43df614189c36eba99dc41dd..3af1504bae6af5c9bc602cb776cb7d9834bb592b 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 f1b8fbc4b8503c5085bc966fd15ad4a666a54c12..c87da7251c9700dfaa7e05adfacffc579394fccd 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 3444d07508fe691d97451dd39ee065c596aa7a58..fcb7c967de326e2002ed9a648120c2a557a7b4c3 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 bc07e686424a107b30f7b48f3ec821473d6c387d..7f45b04c7ef1978f460ca003853ec0843d7b5161 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 ed63ca5f9543347f74ed7c56c60da0f2c6d0d97a..c42db2b7358de607cf0872a350b6eaf868d90144 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 c86441a370f0a31bbf882f1f41f5ea9e41fb7eed..9088a7916011e92c38568c7ab55bd6686039c7b2 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 d696da01d2dc26dd53a3e35928f0f006d2d867d1..5499a25b78f2c643cdb3ccd5d4532f2acdd3bdcc 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 e46f18f55aac32044f42aa4bdc87c77983f62156..135a854658c026ca2fd9f169c78abac742aa00ad 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 602b2fa7a5833ea34edd155d8776b6c68f4fbab3..fdc50c71f7879adcb8cf8172c53f2444b084a27f 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 41c02d9810a6cb929b4a42b8fe01a9bb7f5ce079..7cbf262b7c812f7eb0c21c7000b55678fc545113 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 6129f1e4800965c7b4daf9737ec8e7e6efd90129..c0886534bbc4e2a1a3fe91c99266e6a13bec49f7 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 71c0841a4ac0515f24eb48d53ebd62f36c95557e..1c4879667f1853793a677d17ec6e2c9a2eb81aa8 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 16241c857e2be6bac54b6f15e00a77ea67ff13f5..dccf91435bd1f2d746caeef8148fe6addf20365b 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 c10f2ae7a8a5dcf58cb660bcfba9fb568fb95ac2..3f565f3588e0578dbf54b53cf2e7acd4480782d9 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 f13b93ae748b8f52a5f14f12d6508d1554ded902..ee8c0312acdf35d60c123cc91c1d9f2dce04b800 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 5df3640ec6a96b7de079b8b50127bd2c2c840952..000a47683d9b5c030c6c309c299a2c4ea3d4b75a 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 59162e0bc1fde99862af7396a69d7eaf77482e8d..70940ac507e3f7d675fc51a1816a849ed32c63af 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 628fdcbca8d16feaf0c4f7390573077da0a4c36c..a6e6fea2aa1875fdd25a78da9cd7eee283ef5ee3 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 7839de72adab3d3bdd961cefebd008b67790e59c..1c00cd88a8a6e2c1037c9d456fb9be58b6c9f655 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 3fe950e9b1ebd17bd036c168914acb514a33e23e..4e7565a37700c99fb7fb7278f1c03fb749d5f111 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 a3f14cd5b9ca7aba9e5d3c65c30f9e93687edd8b..8126130202c6847bc96e73ce43ac6ef62249c253 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 0199106a56cb36899900f7a88bec678653b7565d..35835b1cade66fc78fb0b6d87a846c8f856ceebd 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 03a9f1596b8a127a6361f2da442924c551ab1edc..940b0615fe076dccd52cc9c6da9645f708351c34 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 0199106a56cb36899900f7a88bec678653b7565d..35835b1cade66fc78fb0b6d87a846c8f856ceebd 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 f4ceb1a2582fdb5403bb91be4eb8a52e933df412..dc40de3614fd3c3ef1a887fb1c9b6951eeaf6302 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 5fc9c11391f98c496c86e71cf6a09dc49c31942f..605ef98c2767284c3c554b2859b2067eadf9141c 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 c7a107d402dbcd334f8b833de6b1f4eeb553e96b..ccacab64b2662820661a56814f45c9f23ab804ff 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 9b7734d2ec2ee177de90b8e2d1c51c88a35f562d..a627a5adaae08ac2e18985b047debdf7f245a73b 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 da661082bbd8cd7c7e0055af8cc73fbfdea9fc3b..89325b3b4fd7d4adefe05850a37dffc0b3989cc5 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 f99e1263411f8b35fd0c56dad06f5c7a151937d4..a3c35c30e8c0c9b055de2255e442bc16048a158d 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 429266544e72add5d313e11aaa04d856eba95e0f..bb9b484b74ac5610424240c8fa534ca112c8c2f9 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 be8af7585da85bc779d10f3fe26c56a37236a9a4..55b322b0505cfbf76bbc03fd721745faf05aa680 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 e428f5e935d5085c5ad9149a157ad737504601e7..8edc575cde18372126624465616ab483349aa52d 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 44fb329d102294cbc0c065ed70a99d2a454bb082..10f133efe6e870d7c90b1698070b401f9cd91423 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 188aba9605ab4b513f7ede8a61352b027b0f44cc..3863039da8db2a8f9fa42ccf19aadc7f8d10b96e 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 0708ef68311b7a5cd563f9fcd008298b8aff8962..d7c1610024f050263a17b0dbc7ab37dea2929e5d 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 57dd4170d26022f09453024b8562412d4b9093ba..d9dbc04c013374f5163aa25f867c3f1c575a02ec 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 67a16160585a8717a86fefb797ef8a32e0fd6b12..5b69f5ad500600fcda421c8062deb82ebdcbe99f 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 c532c04c7d9322a2dd1f04af9eabc89285e0571b..f259dc2ac56d413dc3a97179e644975e774cb51f 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 91307c774d4ef37fb65e8664e8cb7abcd919b3d8..f6501c9534d6194810162aa7006948371047b0c1 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 c4fab1c1ec4aa0ad8e37219d1bba692d788d9111..6247a74d37316b7323ab31900b2abf9ec1644f4c 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 486c0cf0f18ffae6f0c18d6a68e00a2813d42047..8e5fb7848c10524d20cccfa25a1fcf2418d3fe09 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 081771c25885e6801e4b0e7c1b3056054363eb8e..8ec9736d505a2bbea571f406647266cc75e9dc32 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 c0ea26177cbd32c7bb33eacda520677fdc1ceb98..5d31ed446ec31eff9a40d9730c26c50778011c9e 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 aef55dcd6d1f77c947d84970332366b75bd565ca..7443b13e70a6967e11d14315bf001ea9b841af3f 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 4a7e8aec7292460fb269b36d0cc607c2e540b391..e953071927b93fd9eecabbdc5edd30f8ccc71d04 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 ba61d981c74230179f42dddf1f052249ad33d4cb..9ab4ab38a6399003ce9c1adbe8c173c85b89b2af 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 fddd62c18ce956f23b5ab449aa22d2136f8d2d3f..b4bfab1581bda4bce3fb6edc5ee6e74a0041e6d7 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 36fa006e12125f5f90e48d1314409b48a8a64bc6..f8f0d203616504b0cfdb8f8ede3f611a149523e8 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 dc941e9c361802fdce346514c6cc3348d090b1fc..366fc38a6006cff7595670a0d8b366cc93da173b 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 f149ec893a65903b70233b26ad323b82f8ea721f..f2fb9a78001b1d3ee6f061538a5e69b6c6dd9d28 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 8d9e234346592d846f7ac087e631eed737af93de..3635eb47a104c2ede4459486b32e5d45eaa24481 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 b9efba8332df03de1983000d0aa7ab6e703e00b3..063b75b2c89e2b64ca72c5b6360dbdf7c1f05ab8 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 3049f74f498315ed78c6d19346adf77be1edcf92..93d5f8a631a42636e742e57dda8c8d5a8162df63 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 879ce108400f6dd391bda1fceebba31a45b965ea..e1f9897dc057552223c719491b9bfc63603a0163 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 e2379153ad01d1b90f7ed3ff46d1300e7477de86..4448888d81687120b6bbc64c8ff95e278e7fa265 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 04102ca091d759d76738a4e5fbddc13a57702f9c..7e80a0da1ccf4bb0fa7bc14261ea76eecf7a7970 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 bbc0605a6981989ccc9d0adbe999b17843503b63..f6a7341964a4ab9bcc0ff6a4b6eb173e1b63f0a5 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 dcdfe4b665ce0596f6c487d33828c64d1640029a..845c0ddc1fbc182ffd10fae92f72bec1dfc0226e 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 3d001509c85b17818a56915a49c688690ee4c31d..178f83b85b551c77e64981d032ab43c8145ed264 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 7540e051abee7d3339f98f92750c5edf75d805a8..f350b7c8cfbf16413c8b9a0fc2500c4286999e0e 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 74bec329ee1b7e0fe6d3462197056b2cbc60ffe0..10544038c75625cf9c198ff218785ae2eeecd233 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 3c1ef301afbc0ab5b790a861d83edf8801ebdee4..2e086ab4a4b4f67b0a3caa36798a23c209c89b23 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 98ba6b8eb10b4ea9727b5f3c149020a5ac00c19e..818876697fcd9406e8e26ef8e536c4abf458d1c1 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 33a1c2ad616740876b7974505655df1f993e8106..add9ed425e3b4afef122c08e5d9d6f169aae951f 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 71ed0df91b00fe3610e97bccdc50a0502eceb360..a232bdff778d95c8db92d803e4a18dfcda089159 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 a73bebfec0cc42174e20c62d1ac6609d19f3bb17..a549d200a4c0c1a23ffba845edd19e94c4db6aae 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 60910719a2b1c50de5de954bbd271351aa480476..9d7df297d2572c8e06210fd94b85eb4e5c392efa 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 8fbe3749cea0210d4a57f947762c85e178b9d5af..9c3abbeda22303798faa7a742a71b9b8b475722d 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 bf04793757bacffca561c517bc3fb7cd56c8d628..061b933246f5f7860797eeab386cec878436c174 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 4cf1d5c2386db1b13131232f1cb58e87a83ac01f..e5642d1eff72e9f29357d10f88497e49e77ee87f 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 95e1457d4fe3581d6061986bb18322d9884e053d..38120a8e141951a133e6cc5dc1ce02d2c65decd1 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 39b19be80835156388491ee336f13eab40facbad..f6d3a6ae6ebef67379352f1e34ff3bed0de09e2a 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 9e2475886573b77c339f00b3f05117e5219a5142..fdbdc0e8c6990f0d3ef1ba439c9267d404847576 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 8e835a50d0efd712d04722f5be2338991df70518..89e3baeede1695560fd4d2810b6efe5aa6912420 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 ec09e45c5cdccae19caaa08734958dac57cc2a75..b29ac689a38ac5e72ecadbf69a03f5b63ffb9210 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 86d4a969a41025e84b08be14c1cf6296af9213cf..c11e9aea396e3da9fdc8a712b9a196a83401e8dc 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 46f6b42787ae26ec132afd4f3bc27cdc04805ed2..378a138d5e422f7d931eac414e418db8a4aab215 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 793985417879ac6042b70a25589582aea5d1701b..ee0129cff641bbfdcefeb1a24b80061bfc421311 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 f90fa76aa4db5609959884ac1d19638e9b6d2c66..7855c62d83ed768c0e81eb13784b61a57673cc00 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 ff10f1ef588983dafe785d47cd395353a43b0f1f..c07068a52394ce1c0770d68e9044859e21087d22 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 fcaed56ed5ddeb1e230a9c4f952ca3590bedd406..ec4a1a646eec8fe42819f8769c7a3195f6f30ef5 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 8ade1e80b3bcd41f34f07ed9d3ff9734f600f4b1..63f2c740bc698ec39aa5fb9673c0bab2044897fb 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 d72c688f659b47780acf9ed2e7d2da79b1f85e02..903c26eb69390dad28cf5842637a6231b2a5aa4d 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 3fd7272e146996db21b823c7af13f1a2996eaab7..370b65c79d82ea2c3c404c5bee41800b844120cc 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 6ae9094cd4bb5e764423f8e48f61e813987cc318..743cbed82c36baca7a3b7825686d6ed9a284f19c 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 d542b37ff0826ba7fffc57666c6d14f9a6905dff..3ceb3b97dd91006acf42837821a4abcb93d3e1d4 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 d7622a4aba3b3784343f982a9c11367b7418fbc5..973ecd40db81465eb96ac62ad3dd584a065fe3cd 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 ed27d691ebff0ceee75d40ecaafc43ccc32649bf..b71dc3859c09518b5f478b59e9a5c4b6981261b9 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 0c1e0afe32e77f52c8925418d9ed95ec73ed592e..3be4bd52ca941402fb1ce185cd87161e9b9c269e 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 2acd7863a3011f9ba30d317eeab3003c983687da..84b8216fbbfeb5ada96e7917c7daec6852ac0405 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 112c1d49b2e258097f023c9fe449a2de6fe21db6..7202578aade5496fffb91e4e6c0b69c3ddf13e49 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 2ac6615f091099c073f2459045a4ceaa80f34caa..4c3b111b05e96bc5b80ad6df6e438b99a66ac9d6 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 075b857bc3ce01abfb203f728632dfca3b7977d9..0a861304bed9efb8450262f5e1936f778b3962ac 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 fb7f83992e333b62dbaa4d18e5731361f8061361..dfd5a6cec4465656e6b2ee7aea831adb43174d11 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 945f15352d6d7bbc935d07d3ad38cd77ea6de6cd..c455593e1c3ed4ffde937bbc463570924d54e01b 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 b8a4957ba773ee72cafcec39d7240e0583b5b0ac..97492d50d6eebeeec7b85d636e29427c9cc6f939 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 11155c1bda766d7a5c58561ed68b6233355fbea6..ccc69822b7dcbc216f6e1c580015ba0e1403179c 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 530cf66d86a52d66e5db063389f52a305c66fb39..a6559bb005dd6b60ce3e4f2a8568e4368c714ffd 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 478ab8725d557e950c94eaa66b693d81c0f52292..e3102c1acd272126ad3ac74c48b0be51a7f09473 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 df6ad4771b801cb25c7b62b3cc1bbdda847e17c7..464d586b8f314c0905641c03a6001c71f135ff06 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 83186cf50073fa929ab6fb40e8f361182fb6cc46..1fa263dd510b2528530b44e3eb2a1aa8d8572919 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 0165ca2b9f479636e522e332ce625cec9858407e..44b6a9384cb7066ccc21c4d88fcfd659ac9b2b39 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 15274d76cfbdc5aab09f10f8ca8127e90648a3ec..bf181235e5e77d86b605197b8d86827411162ddd 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 a27710a2f3126ba1eb0ac2cd2d65133e38ddc8b9..9f9e22496e4f31c0cf8972e8d88a5f4df90948ec 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 8e0e5e408fbf46ba9b0743617129bb2693ab3b29..69df69ee7652f3406a8c23b4cec97039a83f89f8 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 a27710a2f3126ba1eb0ac2cd2d65133e38ddc8b9..9f9e22496e4f31c0cf8972e8d88a5f4df90948ec 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 5900f22d84887f42c02ca46ddbb8f3561cf43589..564ac4e681a7f92f8a432e000c312cc0a95dae5b 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 a27710a2f3126ba1eb0ac2cd2d65133e38ddc8b9..9f9e22496e4f31c0cf8972e8d88a5f4df90948ec 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 4d878c851bd25547093c49f7081517854211c434..6850e953fc1bbdb96b74ffc07717e08fb7bd2cbb 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 a27710a2f3126ba1eb0ac2cd2d65133e38ddc8b9..9f9e22496e4f31c0cf8972e8d88a5f4df90948ec 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 d4eb21880410b2473eed4fcdae139c63d830c346..d9c0ac6ffb1ce35dbf22b98711a4e70d678a9e83 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 a27710a2f3126ba1eb0ac2cd2d65133e38ddc8b9..9f9e22496e4f31c0cf8972e8d88a5f4df90948ec 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 d7b259e3caf61d774c2b531b5482be82707ac3f0..4acb32593d923126151b533a5195606d5f4992db 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 a27710a2f3126ba1eb0ac2cd2d65133e38ddc8b9..9f9e22496e4f31c0cf8972e8d88a5f4df90948ec 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 62979bb7e8634e26ca13dc6b29b18b135a9d0eb8..b9335aa88f5069f32cf3faf41614b2aa7a34dce0 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 a27710a2f3126ba1eb0ac2cd2d65133e38ddc8b9..9f9e22496e4f31c0cf8972e8d88a5f4df90948ec 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 eb22f83f954362f3250378038a61bbe547101a1a..905faf9cbc8e7d5c4e90b19d43717afa0a513bb1 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 e8097cca484cbea6e51c8c8ce9ca1fc33a5a9e3d..2c7e2f033233b8dce471258e2081bfee89428028 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 95f8b8d4b063be1ce46d2d8ad09605fcfe73622a..580bd6ba8a783cd3261a3d3e41a7baa6dc00c742 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 b8b993c94b427ff2e912d3c1ac096e7080e9175a..33895996e74ccc5695461b8227fa20193d185eb6 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 6d42150787b0b7abece298186c66ea07b75253d4..896b1f00057d5db1138f3c5397dc46448d9a6047 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 867c551289372768f10196c8a96166552afa5531..51c25667ff9f28c1c4b95c171d54e8fabf38518c 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 cca586d2916f698c588c8af26de4a952efe78d25..8f39d65941bc0cf4c2838d356f801c019160f751 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 491be01687d3dbd71eb189b95099bc6d8d67d609..c9d587f0171426641ce497cdddec1c8096cbf1f4 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 7867a43beef8d98d8850ac59aedb5bf24ec6e485..1c91d9b8f789e4cfad97b38fcb68874bd801d6e8 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 fcc584b7d290f58a4de45b58a5a5b9bb8b12f4d8..391f66c5a79cd8b2905f53025923189a8dfeb983 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 7e0badee1c023ed8004e11df0a1076279b1b8d45..d1b3b45f6ea2e4b485cea37149e540e76324dca1 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 87b9f7db29c94e09c38376f63144b3cc5e519843..7e41352fe9543307ec24153dbef656625a9a746b 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 5f7a98a6bdc9b0a1cf9c90ff139e442058f1d85e..1d2fb9f02b74ea0792d92dc14302f877fc0fb333 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 aaec29db555a13bffffa983760de7df6adec8838..8c18ebe92fc29408d451b235cdf5a7a69477b231 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 75396a3a28f777be8e26f77ed3da9de15bcf2511..c2bb1ac8d99a05dc4b3992b265db9db97fe7f621 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 84313c183f489a061a6021b5abdca1ca3332530f..81e8ccc06e3a48a0aa2d6949cd27a32db68f9471 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 60458105ad97daf58c59edb64806240fc15db534..973c113e2fc01fda0929a3b96385c3438ca3605a 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 467b44dc360e34a76b73a04b6337247177b3e4ab..6f728ad92d5085a37c33297b27255ddafedb2dfb 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 8040926bfc6d554edff883a1d3d3030caecd1916..086d7f09bb8d6fe3ed3dea3ee06b1aff6321af2b 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 1ee904b08db0a4a415df445fd7f98540db0a7555..1d583e1114df85c6ee18bc11fcc317438f839c88 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 58d83feef3a5f366f4155a97279c706c193d2e70..df314f34cd96cbf5f775e2f65b318cae2d91c01a 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 c8e3a5b4e2a07439983ddd879b13df584ddd2c97..1c5d428333fd57c5bbe28f7f5ae50660cd2a9425 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 8101fc1eff78e87796c5aaf1027b8df58db52c7b..7ffade9cedf0ad6de6fb6e94874609470fedeede 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 4c72406e07c399c63113fb886d6ac8d03622dfa7..481eaf1f8bff2fbb88e0ce2fe85696e00e564bf1 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 4598051105ae30aacc3b746e148d09d6611a61cf..cdb483bd0edb43f8674757a5b3dcaf94ced7f692 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 a8de7e0415412832a0f557038c0f5d73d5b5a667..22df173f25cffebef55f7f7f038adb977ea1ce52 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 a44ae73f28adf7a47dbf4173dbf6f558b3894485..870d4728383d4073511ce8e775eca28f85482307 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 72d22a6dabe6a140ff5c3ff7f5ab8ff8efa89002..ecdbbf50b7196f3a5fe51c1234cdb6bf49052391 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 7142d1ac2e1f44d85e03e785afad711cd71ca9f8..27def2da9eff3641a229f4fd7cb4fc2722469d4f 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 08da3726530de9713e7b7af3735b84668c5e4a1e..e5e132bc0795cbc80ddd4274f24424172acaff13 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 0aa213f4efd9f8cf1d47e7c8b160b462ddd66345..3db489dccd9eef98b3338c3ea0f7b9591eacca00 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 62552e6ef1d8daa4c186ddbf35456d8fd1a659a4..d027cc1177624fba1e9005d600884efa486d7107 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 b4aff27cf1b30a96ffeb662468bbc3492b802cc0..dbbf53d38f9169ec00e50606eb9f98a1a6704712 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 c8d4f645ff73d94728bd8a11165cdfcabc5260da..46e17f51228b1b988c0ee6a0bf7220e02a77be67 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 911a5f7486df757bcc1cefe02860b7f3fe0e4b19..36ea92d4ad5093a862d4677e1d0fcef17b106192 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 6e36e87bfaf0459c8503e4c9f3ff84ac72506fa7..a34f57d6296b78e170c01f116a4f0fc287709bda 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 842927fc82bb3043c919bd46a311c2d8fa6da9e7..3f16542963f61121a8398e2a273a20d095b1ae1e 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 119d4f70cb81bbf3d0a5d160f753ea5ea9238a33..d853356e6f046303eadac4e0362674b733d7f42c 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 75fe4e0258090ac2a915c927b612300a8354577f..b5dd8f0af8a195362ac279a045d4dc84b4d298db 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 609fcefb22c536b15b2d806d36c270fbd590a095..7bc35e32ab815268224f75190f70bc80d9d3733f 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 0753984bb59be5c95cae46bdb14d7601ab8cd1db..af8a46b64fd30bb15ca6f21adaec970d06e72187 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 cafff6f8341b79e912473480a3d6a0ec69a438fb..77b01e1caafa8e0be2e38f4d1c43040aa7c5d14b 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 e0844712b1be4a9c4a5cd01bc4ffb9e82065eb75..e1ea42011c1545d8e903f920950624cbe1fd7c22 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 232318e7dc97ac97f5735f84f848b49b7fb1e2a9..ff364d6601054b4c6b8a76523e165bb27323ac62 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 7e0b93abd1c4c8791949554dbb5ce90f66284538..c1efed96ef05d9afb5225dc5a67cedded6c693dd 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 6744f7fc629030589a367c33dc39dcbc15977298..a06383e72751494cda58cb55fed4f074b75b6a53 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 478e6066b8bb697d139d09f01e67e0960643ba5b..6a7f18aff876ed750b07a42bebacb426941072b3 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 cd3297539c7ca54522e1ff0772576beee51e0a5d..ea0f21c8bb0bcba06eadbe634bb4c998f6c2aa0a 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 cd3297539c7ca54522e1ff0772576beee51e0a5d..ea0f21c8bb0bcba06eadbe634bb4c998f6c2aa0a 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 22e9f23d20f69da208b361df93a323035c33fe65..2a76818c4585245f7983dfa180ee831990387e88 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 e2a3d25c2b71227c182bf28786b744189281b29e..b616bf8f9eb3f8bdfdf6bac8b40e69b77a699e6e 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 f82162213ed91525c777e48f0a32b9a3ab7085c9..9f46d2668182f47a89cc862d4b4baa8df92bef92 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 73338153dad2dd3c3ca4bc4b88c1658981e32e58..28d4358ad561a15b635ba95be696747b9e92d6f6 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 3e52e38ff495c675067f1f285016766991187f55..08ad0ff9ff6bff47f0b7f7877db001f3f5b11502 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 88c725016b67225f518daa2507c351507818a68a..d553dea6718f4fc3f05a879bdf6d5f61186d246b 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 35447c5a7b873d87c7d03928a753ef4dc5298b05..ea117659f53d6cb472ffe333f6328132fdc9df89 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 74248c803da3dee50446036a300692ee35ed62f2..477a331589c3213a11f02cb7d96005ea7048af03 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 410ec6177992754ac6b30b665fc42479f0459ec0..b76422435b5345c62757ddf19e12eaf5861d098c 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 bf2c4bdd8f7d0e761f94bf37154811d60b3d89ba..71c232d68ec9348bbb9a7281f01ca7633d1ccbd9 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 98cb3fa6087f83a95df813a4a4b452390c4354eb..4b0e8589ad45cbd3a9f60b8171be514267c9e5b5 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 ba68362c3ee51da950503666fa32b179f0e1f96c..6497716b6db753a45c3e01bb7f0328443a4eda7e 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 72cb78a7a42902feb2f17d95420be6901851f930..5a75be1f6e1c77b65ee263d68db9d73cf14c8048 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 af04d14f6f4ac6b6ef5ff0526733d6bd42f8625b..5772ab67c68ab5c6b0942eb4f8f8165e550546d0 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 af04d14f6f4ac6b6ef5ff0526733d6bd42f8625b..5772ab67c68ab5c6b0942eb4f8f8165e550546d0 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 3ecd447eccee6a2fc1419efb3f4394e1f052c5e3..91476a305a95c733df2381d2f97004f25a000361 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 f22c3e8febec8666b3e7c77773acf18c0609d52e..75cca782494ff3c689b337e963cfc4667759a1d2 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 1569ee82ba65465e72c4b6e7102713e8757b726d..b7ab4cd759d0ad1f0994338260931a14a405a78f 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 88c6c58c2f8e6a8dbb3d1fa4dd81d6312f34580d..20f9f942e37df49bcb3ff0e41d41222803818daf 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 e4c26cd0c21c7104f549af8582039ef54ae0f101..a4f6dcd2acac0b72ffda7398dd17fb5d38164a4c 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 2050df38be0c0c93f3e9ea30375fc817d9db3b17..56ad2c95b627be7d959f50769ff4765e9b6cd3ad 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 a9bc619bd0130884826a3c9eb4b6ec5617957936..3e1063d9dd551afe5581570b310221b0d65f0b12 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 ae8721b06bcf0c38e5f048dfe92baa1f1770c864..71879587c36fd42db5a5c7bfac23c3e302ce56b6 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 9321c9b2513d0e06576920ef6e742d21c7a00e04..dbbcce16c62d5d5bcf28b3f23cfbe364e3f214c4 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 973365f5d3512e35b86b60c807395d69af2f3229..581880d0fcf6dc86a577ab08c1297b57a4e1d2fe 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 d64acbeb232bb9ca36d3d886fcb714dec6f2b040..ee022dba96005c5c017782190d93be7705e17bb8 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 ee7c929a84a5d0a5fceff42e847b912698042cd0..f6541c5d8d5399c21b19e4694f2a6d8db6e5eb2d 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 8f852119ca050d04352c54a134ac0db9c1ef3ee8..02cdbd7af61232ab5c93c18d3e41868c1b37400c 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 90b1bea00b96035d87d8f967804c26e8349f3173..1fa9958ea6e03fb2e4216877294e321e0b4a215c 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 053048272a8840737cae5c7b6d99bd39321cb9b1..a795df6f83b090fca240901b5a9d6b7b191ff57e 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 f226b824474f572604ee4622cf19e7388f5ad0bf..48557c9de0691a940bc3db8858cd78befa8f0925 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 fad375b738d49b02aba8f87ad8346ad8a5cf7d86..9d32568b01bf916898ee2bf4c853101cde73d401 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 7d0bbbc30d0798a2cd4c0c01a4e091b13668cf3f..ba5a3ae4f06f56abfbaf9776bc10e9ff26433fed 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 d6e32dc293ce5b3b316c745983a7df9c467e4c4e..36d9b5d90ae9874e1dd14e31afdd832f4eb480a1 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 5ef03ebb1451b33f1dc6537e357896766d8b3d06..22cbe512b90f2d351b5727a411d0f282e3b6b246 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 d9dd4cd50d73188c6e80a72d740819cf3d1ea277..f06041ba3fe5783144cd5f8584a54f984555ab2e 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 05b2fb1fd043de0022f35a02a50c6364d1f772e3..76dea9891d80507e17d05e4cbe5014d122f78701 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 d72dfee719aea74a6915acca4a0c61976109633d..6ab227a69b7921c60802d045eb813d27d9926c62 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 7cf6ec52373110f66bd8d3aaaaec9fb69aea0a9a..32ac12a1cf399900b802245c43e635f556cdfccb 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 ac8458c673a70377beab2b2d912cf955dca9b8e6..81f489d775c2187c8d284eae6fdd64bd7bbf2868 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 815f276fbff0db6c968e5496f9e51bae8ee2a9f4..3ee7f7d1643ae91aac5b8de115281978dfbde06c 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 2e6a60ec78e4e703aeaa81568c924b8a7468b5bc..4da00c32f2d2449f14393ad66932421d67ee5f20 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 0ed216baf25de7d793ef17bb73be2577779d83c9..8af9c2d1ba81c90856844dabeac494e32e6e62aa 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 405388a616a8be18f7ad0b088407e08d9977bb21..63c94d0a5717e1f6b66fa4af6342bfc22e4ceb1d 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 ec10420819e7778998bd2d1615ba15490e38381f..030b958d1e47e183f90bcd54c5274a972676d185 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 f2c1d762c17fed734dab46759222bfd5348d3fd6..bf250d20a5cdd0dc6fbf7a61024eedc0b2421a18 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 5165038ad82fcb5326ae499150a04f62c8ef3eda..250d552db889651b3d8f6f82e9d2d3172014c378 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 564159e9f0a917ad1c614f8037333a87d52dedd6..28dc7205876b1daa9421b663b9067415f1dee38b 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 3c9d185aca7a80a84837ee82da4f4bf711e8be91..a13f5e23b06928f971968e8fb15a94f406b961c7 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 0e9c03ada5357df552a006ee37a6aeb3e67b3264..7e935fc6f69aef1d40f733f1abd1763435f89a06 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 564159e9f0a917ad1c614f8037333a87d52dedd6..28dc7205876b1daa9421b663b9067415f1dee38b 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 3c9d185aca7a80a84837ee82da4f4bf711e8be91..a13f5e23b06928f971968e8fb15a94f406b961c7 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 dec743967831396c2c80db96b9ad9b95211f9a38..4463d1bf8ff747baa35845cb434c834f3ac5dee3 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 2f2347ebd9415044f3b42d1720d7fb36f7dbf918..0303be7ed1edee5615168f817a7aaf2649d446a8 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 f8546baa5a399f59a14089f26580b2f7438490de..dfd9b7f02786756289a8df26c392dd9e902671ba 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 c49dee47dee5b74a9f7a10e2370cdb3bc467475a..c88346eef59a3928c0a24048a22a9418ff0f3ab9 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 a914a1a8a94f1e8c9113311eb067961fc9f96cf4..fc14c3b577a5324c60ba6a7c9b30e7919217dd02 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 64a6a860fa96bae7530531b40e450c6eb2af64d9..e99d3316209ad4046ad25401d440890527097ff6 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 d8366edba49748e546a6d4c52903a3a710c316b4..3aee55771a36ce4ed771e2c5760b954a2820a905 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,