diff --git a/README_zh.md b/README_zh.md index a9aba80ad096c69ed2d8046a69d2f603697a928a..074dc77a82e1dd3491ef37b0a2cd1611079c333d 100755 --- a/README_zh.md +++ b/README_zh.md @@ -876,7 +876,7 @@ FA_TS 模式适配指导请参考 ``` //加载测试用例 - import Ability from '@ohos.application.Ability' + import Ability from '@ohos.app.ability.UIAbility' import AbilityDelegatorRegistry from '@ohos.application.abilityDelegatorRegistry' import { Hypium } from '@ohos/hypium' import testsuite from '../test/List.test' diff --git a/ability/ability_runtime/aacommand/AACommand07/entry/src/main/ets/Application/AbilityStage.ts b/ability/ability_runtime/aacommand/AACommand07/entry/src/main/ets/Application/AbilityStage.ts index 6ceb0c290ae831a45143a5e2b42d4351f2fc3d7e..3745b4557c4d87274ed1fd9e5efef51b63d4ceca 100644 --- a/ability/ability_runtime/aacommand/AACommand07/entry/src/main/ets/Application/AbilityStage.ts +++ b/ability/ability_runtime/aacommand/AACommand07/entry/src/main/ets/Application/AbilityStage.ts @@ -12,7 +12,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -import AbilityStage from "@ohos.application.AbilityStage" +import AbilityStage from "@ohos.app.ability.AbilityStage" export default class MyAbilityStage extends AbilityStage { onCreate() { diff --git a/ability/ability_runtime/aacommand/AACommand07/entry/src/main/ets/MainAbility/MainAbility.ts b/ability/ability_runtime/aacommand/AACommand07/entry/src/main/ets/MainAbility/MainAbility.ts index e7e16a3bb9038acf57bcb62cb075936dd52751b3..74bcd626283f39c5fe2ddf4883f2dc5944c2caf4 100644 --- a/ability/ability_runtime/aacommand/AACommand07/entry/src/main/ets/MainAbility/MainAbility.ts +++ b/ability/ability_runtime/aacommand/AACommand07/entry/src/main/ets/MainAbility/MainAbility.ts @@ -12,7 +12,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -import Ability from '@ohos.application.Ability' +import Ability from '@ohos.app.ability.UIAbility' export default class MainAbility extends Ability { onCreate(want, launchParam) { diff --git a/ability/ability_runtime/aacommand/AACommand07/entry/src/main/ets/MainAbility2/MainAbility2.ts b/ability/ability_runtime/aacommand/AACommand07/entry/src/main/ets/MainAbility2/MainAbility2.ts index 21fb01472026b6d3a5a7bda99fc186dcb81f2ce4..ffab0864c425a3539cab1b24f97101673b93c436 100644 --- a/ability/ability_runtime/aacommand/AACommand07/entry/src/main/ets/MainAbility2/MainAbility2.ts +++ b/ability/ability_runtime/aacommand/AACommand07/entry/src/main/ets/MainAbility2/MainAbility2.ts @@ -12,7 +12,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -import Ability from '@ohos.application.Ability' +import Ability from '@ohos.app.ability.UIAbility' import commonEvent from "@ohos.commonEvent" function PublishCallBackOne() { console.debug("====>Publish CallBack AACommand_Debugapp====>"); diff --git a/ability/ability_runtime/aacommand/AACommand07/entry/src/main/ets/MainAbility3/MainAbility3.ts b/ability/ability_runtime/aacommand/AACommand07/entry/src/main/ets/MainAbility3/MainAbility3.ts index 80bd7e7d76e7503cc70d16fa699f7e2839144bc7..c4c4f3a235152431958223ecd35159e7a0aa5824 100644 --- a/ability/ability_runtime/aacommand/AACommand07/entry/src/main/ets/MainAbility3/MainAbility3.ts +++ b/ability/ability_runtime/aacommand/AACommand07/entry/src/main/ets/MainAbility3/MainAbility3.ts @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -import Ability from '@ohos.application.Ability' +import Ability from '@ohos.app.ability.UIAbility' import AbilityDelegatorRegistry from '@ohos.application.abilityDelegatorRegistry' export default class MainAbility extends Ability { diff --git a/ability/ability_runtime/aacommand/AACommand08/entry/src/main/ets/Application/AbilityStage.ts b/ability/ability_runtime/aacommand/AACommand08/entry/src/main/ets/Application/AbilityStage.ts index 5073f074333769e258d7b97d27aa750302f91fbe..a31d98d3a92d876ad5db3ea4ebdd51b8629c07a3 100644 --- a/ability/ability_runtime/aacommand/AACommand08/entry/src/main/ets/Application/AbilityStage.ts +++ b/ability/ability_runtime/aacommand/AACommand08/entry/src/main/ets/Application/AbilityStage.ts @@ -13,7 +13,7 @@ * limitations under the License. */ -import AbilityStage from "@ohos.application.AbilityStage" +import AbilityStage from "@ohos.app.ability.AbilityStage" export default class MyAbilityStage extends AbilityStage { onCreate() { diff --git a/ability/ability_runtime/aacommand/AACommand08/entry/src/main/ets/MainAbility/MainAbility.ts b/ability/ability_runtime/aacommand/AACommand08/entry/src/main/ets/MainAbility/MainAbility.ts index 48e2332d00a46d6f719d7e7c1df0c48ab05ed1e2..f30966b58db9e143e272afddb7600ef2fc5161a0 100644 --- a/ability/ability_runtime/aacommand/AACommand08/entry/src/main/ets/MainAbility/MainAbility.ts +++ b/ability/ability_runtime/aacommand/AACommand08/entry/src/main/ets/MainAbility/MainAbility.ts @@ -13,7 +13,7 @@ * limitations under the License. */ -import Ability from '@ohos.application.Ability' +import Ability from '@ohos.app.ability.UIAbility' export default class MainAbility extends Ability { onCreate(want, launchParam) { diff --git a/ability/ability_runtime/aacommand/AACommand08/entry/src/main/ets/MainAbility2/MainAbility2.ts b/ability/ability_runtime/aacommand/AACommand08/entry/src/main/ets/MainAbility2/MainAbility2.ts index 6d7fb9f2e93c18c30f9ffec1998d8c42e04d420d..a95e0442515059af58387bae407b9a4b148b2feb 100644 --- a/ability/ability_runtime/aacommand/AACommand08/entry/src/main/ets/MainAbility2/MainAbility2.ts +++ b/ability/ability_runtime/aacommand/AACommand08/entry/src/main/ets/MainAbility2/MainAbility2.ts @@ -13,7 +13,7 @@ * limitations under the License. */ -import Ability from '@ohos.application.Ability' +import Ability from '@ohos.app.ability.UIAbility' import commonEvent from "@ohos.commonEvent" function PublishCallBackOne() { console.debug("====>Publish CallBack AACommand_Debugapp====>"); diff --git a/ability/ability_runtime/aacommand/AACommand08/entry/src/main/ets/MainAbility3/MainAbility3.ts b/ability/ability_runtime/aacommand/AACommand08/entry/src/main/ets/MainAbility3/MainAbility3.ts index 94d27f27ba4cac4e1d98d5428bb2cbd202b970a2..09af07a624838929634f38483d18434788728bf3 100644 --- a/ability/ability_runtime/aacommand/AACommand08/entry/src/main/ets/MainAbility3/MainAbility3.ts +++ b/ability/ability_runtime/aacommand/AACommand08/entry/src/main/ets/MainAbility3/MainAbility3.ts @@ -14,7 +14,7 @@ * limitations under the License. */ -import Ability from '@ohos.application.Ability' +import Ability from '@ohos.app.ability.UIAbility' import AbilityDelegatorRegistry from '@ohos.application.abilityDelegatorRegistry' export default class MainAbility extends Ability { diff --git a/ability/ability_runtime/aacommand/AACommandPrintOneTest/entry/src/main/ets/Application/AbilityStage.ts b/ability/ability_runtime/aacommand/AACommandPrintOneTest/entry/src/main/ets/Application/AbilityStage.ts index 5073f074333769e258d7b97d27aa750302f91fbe..a31d98d3a92d876ad5db3ea4ebdd51b8629c07a3 100644 --- a/ability/ability_runtime/aacommand/AACommandPrintOneTest/entry/src/main/ets/Application/AbilityStage.ts +++ b/ability/ability_runtime/aacommand/AACommandPrintOneTest/entry/src/main/ets/Application/AbilityStage.ts @@ -13,7 +13,7 @@ * limitations under the License. */ -import AbilityStage from "@ohos.application.AbilityStage" +import AbilityStage from "@ohos.app.ability.AbilityStage" export default class MyAbilityStage extends AbilityStage { onCreate() { diff --git a/ability/ability_runtime/aacommand/AACommandPrintOneTest/entry/src/main/ets/MainAbility/MainAbility.ts b/ability/ability_runtime/aacommand/AACommandPrintOneTest/entry/src/main/ets/MainAbility/MainAbility.ts index f984de4cd352193528ee63eefff89588c94877c9..aede5690b284e16a40b1d90357b7c0feca305999 100644 --- a/ability/ability_runtime/aacommand/AACommandPrintOneTest/entry/src/main/ets/MainAbility/MainAbility.ts +++ b/ability/ability_runtime/aacommand/AACommandPrintOneTest/entry/src/main/ets/MainAbility/MainAbility.ts @@ -13,7 +13,7 @@ * limitations under the License. */ -import Ability from '@ohos.application.Ability' +import Ability from '@ohos.app.ability.UIAbility' import AbilityDelegatorRegistry from '@ohos.application.abilityDelegatorRegistry' import { Hypium } from '@ohos/hypium' import testsuite from '../test/List.test' diff --git a/ability/ability_runtime/aacommand/AACommandPrintSync/entry/src/main/ets/Application/AbilityStage.ts b/ability/ability_runtime/aacommand/AACommandPrintSync/entry/src/main/ets/Application/AbilityStage.ts index 5073f074333769e258d7b97d27aa750302f91fbe..a31d98d3a92d876ad5db3ea4ebdd51b8629c07a3 100644 --- a/ability/ability_runtime/aacommand/AACommandPrintSync/entry/src/main/ets/Application/AbilityStage.ts +++ b/ability/ability_runtime/aacommand/AACommandPrintSync/entry/src/main/ets/Application/AbilityStage.ts @@ -13,7 +13,7 @@ * limitations under the License. */ -import AbilityStage from "@ohos.application.AbilityStage" +import AbilityStage from "@ohos.app.ability.AbilityStage" export default class MyAbilityStage extends AbilityStage { onCreate() { diff --git a/ability/ability_runtime/aacommand/AACommandPrintSync/entry/src/main/ets/MainAbility/MainAbility.ts b/ability/ability_runtime/aacommand/AACommandPrintSync/entry/src/main/ets/MainAbility/MainAbility.ts index 13f0e00fbd3bcc02a9280ec5c4c7b5902cefde18..5f598413d491d1d2f25cc291580a763c2dc356e9 100644 --- a/ability/ability_runtime/aacommand/AACommandPrintSync/entry/src/main/ets/MainAbility/MainAbility.ts +++ b/ability/ability_runtime/aacommand/AACommandPrintSync/entry/src/main/ets/MainAbility/MainAbility.ts @@ -13,7 +13,7 @@ * limitations under the License. */ -import Ability from '@ohos.application.Ability' +import Ability from '@ohos.app.ability.UIAbility' import AbilityDelegatorRegistry from '@ohos.application.abilityDelegatorRegistry' import { Hypium } from '@ohos/hypium' import testsuite from '../test/List.test' diff --git a/ability/ability_runtime/aacommand/AACommandPrintSyncTest/entry/src/main/ets/Application/AbilityStage.ts b/ability/ability_runtime/aacommand/AACommandPrintSyncTest/entry/src/main/ets/Application/AbilityStage.ts index 5073f074333769e258d7b97d27aa750302f91fbe..a31d98d3a92d876ad5db3ea4ebdd51b8629c07a3 100644 --- a/ability/ability_runtime/aacommand/AACommandPrintSyncTest/entry/src/main/ets/Application/AbilityStage.ts +++ b/ability/ability_runtime/aacommand/AACommandPrintSyncTest/entry/src/main/ets/Application/AbilityStage.ts @@ -13,7 +13,7 @@ * limitations under the License. */ -import AbilityStage from "@ohos.application.AbilityStage" +import AbilityStage from "@ohos.app.ability.AbilityStage" export default class MyAbilityStage extends AbilityStage { onCreate() { diff --git a/ability/ability_runtime/aacommand/AACommandPrintSyncTest/entry/src/main/ets/MainAbility/MainAbility.ts b/ability/ability_runtime/aacommand/AACommandPrintSyncTest/entry/src/main/ets/MainAbility/MainAbility.ts index 7ee38c331cb6e4d9b9a1c8fc4b95d49369760da2..a3e14aa817ef61e3f5c7f45ecc70e53339a7c85c 100644 --- a/ability/ability_runtime/aacommand/AACommandPrintSyncTest/entry/src/main/ets/MainAbility/MainAbility.ts +++ b/ability/ability_runtime/aacommand/AACommandPrintSyncTest/entry/src/main/ets/MainAbility/MainAbility.ts @@ -13,7 +13,7 @@ * limitations under the License. */ -import Ability from '@ohos.application.Ability' +import Ability from '@ohos.app.ability.UIAbility' import AbilityDelegatorRegistry from '@ohos.application.abilityDelegatorRegistry' import { Hypium } from '@ohos/hypium' import testsuite from '../test/List.test' diff --git a/ability/ability_runtime/aacommand/AACommandRelyHap/entry/src/main/ets/Application/AbilityStage.ts b/ability/ability_runtime/aacommand/AACommandRelyHap/entry/src/main/ets/Application/AbilityStage.ts index 5073f074333769e258d7b97d27aa750302f91fbe..a31d98d3a92d876ad5db3ea4ebdd51b8629c07a3 100644 --- a/ability/ability_runtime/aacommand/AACommandRelyHap/entry/src/main/ets/Application/AbilityStage.ts +++ b/ability/ability_runtime/aacommand/AACommandRelyHap/entry/src/main/ets/Application/AbilityStage.ts @@ -13,7 +13,7 @@ * limitations under the License. */ -import AbilityStage from "@ohos.application.AbilityStage" +import AbilityStage from "@ohos.app.ability.AbilityStage" export default class MyAbilityStage extends AbilityStage { onCreate() { diff --git a/ability/ability_runtime/aacommand/AACommandRelyHap/entry/src/main/ets/MainAbility/MainAbility.ts b/ability/ability_runtime/aacommand/AACommandRelyHap/entry/src/main/ets/MainAbility/MainAbility.ts index 880ca3fa4d033a8cd47c260912eebe0c467c6941..6e7dd0e7de17cbcf1dda2876193dde56621ff541 100644 --- a/ability/ability_runtime/aacommand/AACommandRelyHap/entry/src/main/ets/MainAbility/MainAbility.ts +++ b/ability/ability_runtime/aacommand/AACommandRelyHap/entry/src/main/ets/MainAbility/MainAbility.ts @@ -13,7 +13,7 @@ * limitations under the License. */ -import Ability from '@ohos.application.Ability' +import Ability from '@ohos.app.ability.UIAbility' import AbilityDelegatorRegistry from '@ohos.application.abilityDelegatorRegistry' import { Hypium } from '@ohos/hypium' import testsuite from '../test/List.test' diff --git a/ability/ability_runtime/aacommand/AACommandpackage/entry/src/main/ets/Application/AbilityStage.ts b/ability/ability_runtime/aacommand/AACommandpackage/entry/src/main/ets/Application/AbilityStage.ts index 5073f074333769e258d7b97d27aa750302f91fbe..a31d98d3a92d876ad5db3ea4ebdd51b8629c07a3 100644 --- a/ability/ability_runtime/aacommand/AACommandpackage/entry/src/main/ets/Application/AbilityStage.ts +++ b/ability/ability_runtime/aacommand/AACommandpackage/entry/src/main/ets/Application/AbilityStage.ts @@ -13,7 +13,7 @@ * limitations under the License. */ -import AbilityStage from "@ohos.application.AbilityStage" +import AbilityStage from "@ohos.app.ability.AbilityStage" export default class MyAbilityStage extends AbilityStage { onCreate() { diff --git a/ability/ability_runtime/aacommand/AACommandpackage/entry/src/main/ets/MainAbility/MainAbility.ts b/ability/ability_runtime/aacommand/AACommandpackage/entry/src/main/ets/MainAbility/MainAbility.ts index 880ca3fa4d033a8cd47c260912eebe0c467c6941..6e7dd0e7de17cbcf1dda2876193dde56621ff541 100644 --- a/ability/ability_runtime/aacommand/AACommandpackage/entry/src/main/ets/MainAbility/MainAbility.ts +++ b/ability/ability_runtime/aacommand/AACommandpackage/entry/src/main/ets/MainAbility/MainAbility.ts @@ -13,7 +13,7 @@ * limitations under the License. */ -import Ability from '@ohos.application.Ability' +import Ability from '@ohos.app.ability.UIAbility' import AbilityDelegatorRegistry from '@ohos.application.abilityDelegatorRegistry' import { Hypium } from '@ohos/hypium' import testsuite from '../test/List.test' diff --git a/ability/ability_runtime/aacommand/AACommandtest/entry/src/main/ets/Application/AbilityStage.ts b/ability/ability_runtime/aacommand/AACommandtest/entry/src/main/ets/Application/AbilityStage.ts index 5073f074333769e258d7b97d27aa750302f91fbe..a31d98d3a92d876ad5db3ea4ebdd51b8629c07a3 100644 --- a/ability/ability_runtime/aacommand/AACommandtest/entry/src/main/ets/Application/AbilityStage.ts +++ b/ability/ability_runtime/aacommand/AACommandtest/entry/src/main/ets/Application/AbilityStage.ts @@ -13,7 +13,7 @@ * limitations under the License. */ -import AbilityStage from "@ohos.application.AbilityStage" +import AbilityStage from "@ohos.app.ability.AbilityStage" export default class MyAbilityStage extends AbilityStage { onCreate() { diff --git a/ability/ability_runtime/aacommand/AACommandtest/entry/src/main/ets/MainAbility/MainAbility.ts b/ability/ability_runtime/aacommand/AACommandtest/entry/src/main/ets/MainAbility/MainAbility.ts index 013e66287e4486bd815cac40b838728abad1a6ee..6364fa021dd94202aa1898283c80fd90f1a468c2 100644 --- a/ability/ability_runtime/aacommand/AACommandtest/entry/src/main/ets/MainAbility/MainAbility.ts +++ b/ability/ability_runtime/aacommand/AACommandtest/entry/src/main/ets/MainAbility/MainAbility.ts @@ -13,7 +13,7 @@ * limitations under the License. */ -import Ability from '@ohos.application.Ability' +import Ability from '@ohos.app.ability.UIAbility' import AbilityDelegatorRegistry from '@ohos.application.abilityDelegatorRegistry' import { Hypium } from '@ohos/hypium' import testsuite from '../test/List.test' diff --git a/ability/ability_runtime/abilitymontior/entry/src/main/ets/Application/AbilityStage.ts b/ability/ability_runtime/abilitymontior/entry/src/main/ets/Application/AbilityStage.ts index 2ae1bf3ce4d07b5d5a4e8bc485d994849d55de70..f851e3de00d0ec2a83e3c03e57ccd2845c27ac7f 100644 --- a/ability/ability_runtime/abilitymontior/entry/src/main/ets/Application/AbilityStage.ts +++ b/ability/ability_runtime/abilitymontior/entry/src/main/ets/Application/AbilityStage.ts @@ -12,7 +12,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -import AbilityStage from "@ohos.application.AbilityStage" +import AbilityStage from "@ohos.app.ability.AbilityStage" export default class MyAbilityStage extends AbilityStage { onCreate() { diff --git a/ability/ability_runtime/abilitymontior/entry/src/main/ets/MainAbility/MainAbility.ts b/ability/ability_runtime/abilitymontior/entry/src/main/ets/MainAbility/MainAbility.ts index f0f00647887eee2a1093ffd95ac125314cb9e902..e3e7c0ce469b75ca789f5d9d6ffc5ee5213de03f 100644 --- a/ability/ability_runtime/abilitymontior/entry/src/main/ets/MainAbility/MainAbility.ts +++ b/ability/ability_runtime/abilitymontior/entry/src/main/ets/MainAbility/MainAbility.ts @@ -12,7 +12,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -import Ability from '@ohos.application.Ability' +import Ability from '@ohos.app.ability.UIAbility' import AbilityDelegatorRegistry from '@ohos.application.abilityDelegatorRegistry' import { Hypium } from '@ohos/hypium' import testsuite from '../test/List.test' diff --git a/ability/ability_runtime/abilitymontior/entry/src/main/ets/MainAbility2/MainAbility2.ts b/ability/ability_runtime/abilitymontior/entry/src/main/ets/MainAbility2/MainAbility2.ts index f2ddb735e77f9e54a6bc0e517aaec89cf917d246..490f66fd2f7730dcfe7a537a91f97ff7e86637a5 100644 --- a/ability/ability_runtime/abilitymontior/entry/src/main/ets/MainAbility2/MainAbility2.ts +++ b/ability/ability_runtime/abilitymontior/entry/src/main/ets/MainAbility2/MainAbility2.ts @@ -12,7 +12,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -import Ability from '@ohos.application.Ability' +import Ability from '@ohos.app.ability.UIAbility' export default class MainAbility2 extends Ability { onCreate(want, launchParam) { diff --git a/ability/ability_runtime/abilitymontior/entry/src/main/ets/MainAbility3/MainAbility3.ts b/ability/ability_runtime/abilitymontior/entry/src/main/ets/MainAbility3/MainAbility3.ts index 8951a5ee4dcf041104d4e302d28afc3810abb1f2..95f0598fb71d202430dac6d33fea6e4290712599 100644 --- a/ability/ability_runtime/abilitymontior/entry/src/main/ets/MainAbility3/MainAbility3.ts +++ b/ability/ability_runtime/abilitymontior/entry/src/main/ets/MainAbility3/MainAbility3.ts @@ -12,7 +12,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -import Ability from '@ohos.application.Ability' +import Ability from '@ohos.app.ability.UIAbility' import commonEvent from '@ohos.commonEvent' function PublishCallBack() { diff --git a/ability/ability_runtime/abilitymontior/entry/src/main/ets/MainAbility4/MainAbility4.ts b/ability/ability_runtime/abilitymontior/entry/src/main/ets/MainAbility4/MainAbility4.ts index cd3a47d657b78d181e97370cd51b527d229c3f01..6589226bbc6e2a12faf511783e90202ee9db7886 100644 --- a/ability/ability_runtime/abilitymontior/entry/src/main/ets/MainAbility4/MainAbility4.ts +++ b/ability/ability_runtime/abilitymontior/entry/src/main/ets/MainAbility4/MainAbility4.ts @@ -12,7 +12,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -import Ability from '@ohos.application.Ability' +import Ability from '@ohos.app.ability.UIAbility' export default class MainAbility4 extends Ability { onCreate(want, launchParam) { diff --git a/ability/ability_runtime/abilitymultiinstance/amsabilitymultiinstanceappa/entry/src/main/ets/Application/AbilityStage.ts b/ability/ability_runtime/abilitymultiinstance/amsabilitymultiinstanceappa/entry/src/main/ets/Application/AbilityStage.ts index 2bd862c5000206a39c7b0950be968df15c807ff1..a1432b767c98c1686a4d05cf5c0a5477a850ee50 100644 --- a/ability/ability_runtime/abilitymultiinstance/amsabilitymultiinstanceappa/entry/src/main/ets/Application/AbilityStage.ts +++ b/ability/ability_runtime/abilitymultiinstance/amsabilitymultiinstanceappa/entry/src/main/ets/Application/AbilityStage.ts @@ -12,7 +12,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -import AbilityStage from "@ohos.application.AbilityStage" +import AbilityStage from "@ohos.app.ability.AbilityStage" const ONACCEPTWANT_KEY_NOTSET_ID = -1; const ONACCEPTWANT_KEY_UNDEFINED_ID = -2; diff --git a/ability/ability_runtime/abilitymultiinstance/amsabilitymultiinstanceappa/entry/src/main/ets/MainAbility/MainAbility.ts b/ability/ability_runtime/abilitymultiinstance/amsabilitymultiinstanceappa/entry/src/main/ets/MainAbility/MainAbility.ts index 6b6bf1feb2841f48d623cce0c8f0b74bea5a123c..c37109ee5a17a92a787c1fea8b85ca77d370f7ed 100644 --- a/ability/ability_runtime/abilitymultiinstance/amsabilitymultiinstanceappa/entry/src/main/ets/MainAbility/MainAbility.ts +++ b/ability/ability_runtime/abilitymultiinstance/amsabilitymultiinstanceappa/entry/src/main/ets/MainAbility/MainAbility.ts @@ -12,7 +12,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -import Ability from '@ohos.application.Ability' +import Ability from '@ohos.app.ability.UIAbility' import commonEvent from '@ohos.commonEvent' var callBackSeq = ""; diff --git a/ability/ability_runtime/abilitymultiinstance/amsabilitymultiinstanceappb/entry/src/main/ets/Application/AbilityStage.ts b/ability/ability_runtime/abilitymultiinstance/amsabilitymultiinstanceappb/entry/src/main/ets/Application/AbilityStage.ts index 08dee12306de669ae4e52f53c5234d98461148f4..8a81cf4b34ecd6513ab3dd28a8549acb0a245a72 100644 --- a/ability/ability_runtime/abilitymultiinstance/amsabilitymultiinstanceappb/entry/src/main/ets/Application/AbilityStage.ts +++ b/ability/ability_runtime/abilitymultiinstance/amsabilitymultiinstanceappb/entry/src/main/ets/Application/AbilityStage.ts @@ -12,7 +12,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -import AbilityStage from "@ohos.application.AbilityStage" +import AbilityStage from "@ohos.app.ability.AbilityStage" export default class MyAbilityStage extends AbilityStage { onCreate() { diff --git a/ability/ability_runtime/abilitymultiinstance/amsabilitymultiinstanceappb/entry/src/main/ets/MainAbility/MainAbility.ts b/ability/ability_runtime/abilitymultiinstance/amsabilitymultiinstanceappb/entry/src/main/ets/MainAbility/MainAbility.ts index ddc665609975d98314ada687c1500495a87cd860..7d0aec329bcff69411e36a3faab36014fb760422 100644 --- a/ability/ability_runtime/abilitymultiinstance/amsabilitymultiinstanceappb/entry/src/main/ets/MainAbility/MainAbility.ts +++ b/ability/ability_runtime/abilitymultiinstance/amsabilitymultiinstanceappb/entry/src/main/ets/MainAbility/MainAbility.ts @@ -12,7 +12,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -import Ability from '@ohos.application.Ability' +import Ability from '@ohos.app.ability.UIAbility' import commonEvent from '@ohos.commonEvent' var callBackSeq = ""; diff --git a/ability/ability_runtime/abilitymultiinstance/amsabilitymultiinstanceappc/entry/src/main/ets/Application/AbilityStage.ts b/ability/ability_runtime/abilitymultiinstance/amsabilitymultiinstanceappc/entry/src/main/ets/Application/AbilityStage.ts index 08dee12306de669ae4e52f53c5234d98461148f4..8a81cf4b34ecd6513ab3dd28a8549acb0a245a72 100644 --- a/ability/ability_runtime/abilitymultiinstance/amsabilitymultiinstanceappc/entry/src/main/ets/Application/AbilityStage.ts +++ b/ability/ability_runtime/abilitymultiinstance/amsabilitymultiinstanceappc/entry/src/main/ets/Application/AbilityStage.ts @@ -12,7 +12,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -import AbilityStage from "@ohos.application.AbilityStage" +import AbilityStage from "@ohos.app.ability.AbilityStage" export default class MyAbilityStage extends AbilityStage { onCreate() { diff --git a/ability/ability_runtime/abilitymultiinstance/amsabilitymultiinstanceappc/entry/src/main/ets/MainAbility/MainAbility.ts b/ability/ability_runtime/abilitymultiinstance/amsabilitymultiinstanceappc/entry/src/main/ets/MainAbility/MainAbility.ts index 7df7ebd16cef32818d0574edf0e21b324041afcc..64b71689d5bc2dc3583136732b3682d1a2cb3157 100644 --- a/ability/ability_runtime/abilitymultiinstance/amsabilitymultiinstanceappc/entry/src/main/ets/MainAbility/MainAbility.ts +++ b/ability/ability_runtime/abilitymultiinstance/amsabilitymultiinstanceappc/entry/src/main/ets/MainAbility/MainAbility.ts @@ -12,7 +12,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -import Ability from '@ohos.application.Ability' +import Ability from '@ohos.app.ability.UIAbility' import commonEvent from '@ohos.commonEvent' var callBackSeq = ""; diff --git a/ability/ability_runtime/abilitymultiinstance/amsabilitymultiinstanceappd/entry/src/main/ets/Application/AbilityStage.ts b/ability/ability_runtime/abilitymultiinstance/amsabilitymultiinstanceappd/entry/src/main/ets/Application/AbilityStage.ts index c7e4a876d9b814236f19936f6a6053b32959b289..bb453afb16d2845eaffff1e15923394936ae5e79 100644 --- a/ability/ability_runtime/abilitymultiinstance/amsabilitymultiinstanceappd/entry/src/main/ets/Application/AbilityStage.ts +++ b/ability/ability_runtime/abilitymultiinstance/amsabilitymultiinstanceappd/entry/src/main/ets/Application/AbilityStage.ts @@ -12,7 +12,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -import AbilityStage from "@ohos.application.AbilityStage" +import AbilityStage from "@ohos.app.ability.AbilityStage" var onAcceptWantCalledSeq; diff --git a/ability/ability_runtime/abilitymultiinstance/amsabilitymultiinstanceappd/entry/src/main/ets/MainAbility/MainAbility.ts b/ability/ability_runtime/abilitymultiinstance/amsabilitymultiinstanceappd/entry/src/main/ets/MainAbility/MainAbility.ts index f95a8942109b81fee665259986b17a050ab37e96..9b93f421e473c7a27d8d5b12b6a48801c01ee32d 100644 --- a/ability/ability_runtime/abilitymultiinstance/amsabilitymultiinstanceappd/entry/src/main/ets/MainAbility/MainAbility.ts +++ b/ability/ability_runtime/abilitymultiinstance/amsabilitymultiinstanceappd/entry/src/main/ets/MainAbility/MainAbility.ts @@ -12,7 +12,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -import Ability from '@ohos.application.Ability' +import Ability from '@ohos.app.ability.UIAbility' import commonEvent from '@ohos.commonEvent' var callBackSeq = ""; diff --git a/ability/ability_runtime/abilitymultiinstance/amsabilitymultiinstanceappd/entry/src/main/ets/SecondAbility/SecondAbility.ts b/ability/ability_runtime/abilitymultiinstance/amsabilitymultiinstanceappd/entry/src/main/ets/SecondAbility/SecondAbility.ts index 297ab54825e044bbfd9cc009128801db0a537456..015a64945899c1f4f44a5e490276eed2ffd54306 100644 --- a/ability/ability_runtime/abilitymultiinstance/amsabilitymultiinstanceappd/entry/src/main/ets/SecondAbility/SecondAbility.ts +++ b/ability/ability_runtime/abilitymultiinstance/amsabilitymultiinstanceappd/entry/src/main/ets/SecondAbility/SecondAbility.ts @@ -12,7 +12,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -import Ability from '@ohos.application.Ability' +import Ability from '@ohos.app.ability.UIAbility' import commonEvent from '@ohos.commonEvent' var callBackSeq = ""; diff --git a/ability/ability_runtime/abilitymultiinstance/amsabilitymultiinstanceappd/entry/src/main/ets/ThirdAbility/ThirdAbility.ts b/ability/ability_runtime/abilitymultiinstance/amsabilitymultiinstanceappd/entry/src/main/ets/ThirdAbility/ThirdAbility.ts index 2b5c594f7121e780e71e51a92ba74a38a200e872..fcea4946e6d3a259c87d2d3ec0fe3b570eb52f25 100644 --- a/ability/ability_runtime/abilitymultiinstance/amsabilitymultiinstanceappd/entry/src/main/ets/ThirdAbility/ThirdAbility.ts +++ b/ability/ability_runtime/abilitymultiinstance/amsabilitymultiinstanceappd/entry/src/main/ets/ThirdAbility/ThirdAbility.ts @@ -12,7 +12,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -import Ability from '@ohos.application.Ability' +import Ability from '@ohos.app.ability.UIAbility' import commonEvent from '@ohos.commonEvent' var callBackSeq = ""; diff --git a/ability/ability_runtime/abilitymultiinstance/amsabilitymultiinstancetest/entry/src/main/ets/Application/AbilityStage.ts b/ability/ability_runtime/abilitymultiinstance/amsabilitymultiinstancetest/entry/src/main/ets/Application/AbilityStage.ts index 5e2915fe4fc033cd5c9bd579dc08fe7369e51016..953114c1b479f368cb6c6bd456f0a171a358d148 100644 --- a/ability/ability_runtime/abilitymultiinstance/amsabilitymultiinstancetest/entry/src/main/ets/Application/AbilityStage.ts +++ b/ability/ability_runtime/abilitymultiinstance/amsabilitymultiinstancetest/entry/src/main/ets/Application/AbilityStage.ts @@ -12,7 +12,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -import AbilityStage from "@ohos.application.AbilityStage" +import AbilityStage from "@ohos.app.ability.AbilityStage" export default class MyAbilityStage extends AbilityStage { onCreate() { diff --git a/ability/ability_runtime/abilitymultiinstance/amsabilitymultiinstancetest/entry/src/main/ets/MainAbility/MainAbility.ts b/ability/ability_runtime/abilitymultiinstance/amsabilitymultiinstancetest/entry/src/main/ets/MainAbility/MainAbility.ts index a7588ad77f5f08bc17b9b26c76461798cca2d735..4f2222fe10b9e9e74f4422680f3a8db3a134c1fd 100644 --- a/ability/ability_runtime/abilitymultiinstance/amsabilitymultiinstancetest/entry/src/main/ets/MainAbility/MainAbility.ts +++ b/ability/ability_runtime/abilitymultiinstance/amsabilitymultiinstancetest/entry/src/main/ets/MainAbility/MainAbility.ts @@ -12,7 +12,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -import Ability from '@ohos.application.Ability' +import Ability from '@ohos.app.ability.UIAbility' import AbilityDelegatorRegistry from '@ohos.application.abilityDelegatorRegistry' import { Hypium } from '@ohos/hypium' import testsuite from '../test/List.test' diff --git a/ability/ability_runtime/abilitystagemonitor/abilitystagemonitorassista/entry/src/main/ets/Application/MyAbilityStage.ts b/ability/ability_runtime/abilitystagemonitor/abilitystagemonitorassista/entry/src/main/ets/Application/MyAbilityStage.ts index e51ff9632d6371ef35f5b56c7af455e3b8687949..85d57c8764988f765b78a4fdd2e62cdf97bb348b 100644 --- a/ability/ability_runtime/abilitystagemonitor/abilitystagemonitorassista/entry/src/main/ets/Application/MyAbilityStage.ts +++ b/ability/ability_runtime/abilitystagemonitor/abilitystagemonitorassista/entry/src/main/ets/Application/MyAbilityStage.ts @@ -13,7 +13,7 @@ * limitations under the License. */ -import AbilityStage from "@ohos.application.AbilityStage" +import AbilityStage from "@ohos.app.ability.AbilityStage" export default class MyAbilityStage extends AbilityStage { onCreate() { diff --git a/ability/ability_runtime/abilitystagemonitor/abilitystagemonitorassista/entry/src/main/ets/MainAbility/MainAbility.ts b/ability/ability_runtime/abilitystagemonitor/abilitystagemonitorassista/entry/src/main/ets/MainAbility/MainAbility.ts index 1c0b9c74e71d497764f791d25187cd511ca8d64a..0572bdb85cab05980222b85569b07e82b2bea255 100644 --- a/ability/ability_runtime/abilitystagemonitor/abilitystagemonitorassista/entry/src/main/ets/MainAbility/MainAbility.ts +++ b/ability/ability_runtime/abilitystagemonitor/abilitystagemonitorassista/entry/src/main/ets/MainAbility/MainAbility.ts @@ -13,7 +13,7 @@ * limitations under the License. */ -import Ability from '@ohos.application.Ability' +import Ability from '@ohos.app.ability.UIAbility' export default class MainAbility extends Ability { onCreate(want, launchParam) { diff --git a/ability/ability_runtime/abilitystagemonitor/abilitystagemonitorassistc/entry/src/main/ets/Application/MyAbilityStage.ts b/ability/ability_runtime/abilitystagemonitor/abilitystagemonitorassistc/entry/src/main/ets/Application/MyAbilityStage.ts index e51ff9632d6371ef35f5b56c7af455e3b8687949..85d57c8764988f765b78a4fdd2e62cdf97bb348b 100644 --- a/ability/ability_runtime/abilitystagemonitor/abilitystagemonitorassistc/entry/src/main/ets/Application/MyAbilityStage.ts +++ b/ability/ability_runtime/abilitystagemonitor/abilitystagemonitorassistc/entry/src/main/ets/Application/MyAbilityStage.ts @@ -13,7 +13,7 @@ * limitations under the License. */ -import AbilityStage from "@ohos.application.AbilityStage" +import AbilityStage from "@ohos.app.ability.AbilityStage" export default class MyAbilityStage extends AbilityStage { onCreate() { diff --git a/ability/ability_runtime/abilitystagemonitor/abilitystagemonitorassistc/entry/src/main/ets/MainAbility/MainAbility.ts b/ability/ability_runtime/abilitystagemonitor/abilitystagemonitorassistc/entry/src/main/ets/MainAbility/MainAbility.ts index 54fb016cfb5876920e658414ee16d35ba6869df9..8e80db4338f334f4bd062fa0064edc70663ee91e 100644 --- a/ability/ability_runtime/abilitystagemonitor/abilitystagemonitorassistc/entry/src/main/ets/MainAbility/MainAbility.ts +++ b/ability/ability_runtime/abilitystagemonitor/abilitystagemonitorassistc/entry/src/main/ets/MainAbility/MainAbility.ts @@ -13,7 +13,7 @@ * limitations under the License. */ -import Ability from '@ohos.application.Ability' +import Ability from '@ohos.app.ability.UIAbility' export default class MainAbility extends Ability { onCreate(want, launchParam) { diff --git a/ability/ability_runtime/abilitystagemonitor/abilitystagemonitorassistd/entry/src/main/ets/Application/MyAbilityStage.ts b/ability/ability_runtime/abilitystagemonitor/abilitystagemonitorassistd/entry/src/main/ets/Application/MyAbilityStage.ts index e51ff9632d6371ef35f5b56c7af455e3b8687949..85d57c8764988f765b78a4fdd2e62cdf97bb348b 100644 --- a/ability/ability_runtime/abilitystagemonitor/abilitystagemonitorassistd/entry/src/main/ets/Application/MyAbilityStage.ts +++ b/ability/ability_runtime/abilitystagemonitor/abilitystagemonitorassistd/entry/src/main/ets/Application/MyAbilityStage.ts @@ -13,7 +13,7 @@ * limitations under the License. */ -import AbilityStage from "@ohos.application.AbilityStage" +import AbilityStage from "@ohos.app.ability.AbilityStage" export default class MyAbilityStage extends AbilityStage { onCreate() { diff --git a/ability/ability_runtime/abilitystagemonitor/abilitystagemonitorassistd/entry/src/main/ets/MainAbility/MainAbility.ts b/ability/ability_runtime/abilitystagemonitor/abilitystagemonitorassistd/entry/src/main/ets/MainAbility/MainAbility.ts index 54fb016cfb5876920e658414ee16d35ba6869df9..8e80db4338f334f4bd062fa0064edc70663ee91e 100644 --- a/ability/ability_runtime/abilitystagemonitor/abilitystagemonitorassistd/entry/src/main/ets/MainAbility/MainAbility.ts +++ b/ability/ability_runtime/abilitystagemonitor/abilitystagemonitorassistd/entry/src/main/ets/MainAbility/MainAbility.ts @@ -13,7 +13,7 @@ * limitations under the License. */ -import Ability from '@ohos.application.Ability' +import Ability from '@ohos.app.ability.UIAbility' export default class MainAbility extends Ability { onCreate(want, launchParam) { diff --git a/ability/ability_runtime/abilitystagemonitor/abilitystagemonitorassiste/entry/src/main/ets/Application/MyAbilityStage.ts b/ability/ability_runtime/abilitystagemonitor/abilitystagemonitorassiste/entry/src/main/ets/Application/MyAbilityStage.ts index e51ff9632d6371ef35f5b56c7af455e3b8687949..85d57c8764988f765b78a4fdd2e62cdf97bb348b 100644 --- a/ability/ability_runtime/abilitystagemonitor/abilitystagemonitorassiste/entry/src/main/ets/Application/MyAbilityStage.ts +++ b/ability/ability_runtime/abilitystagemonitor/abilitystagemonitorassiste/entry/src/main/ets/Application/MyAbilityStage.ts @@ -13,7 +13,7 @@ * limitations under the License. */ -import AbilityStage from "@ohos.application.AbilityStage" +import AbilityStage from "@ohos.app.ability.AbilityStage" export default class MyAbilityStage extends AbilityStage { onCreate() { diff --git a/ability/ability_runtime/abilitystagemonitor/abilitystagemonitorassiste/entry/src/main/ets/MainAbility/MainAbility.ts b/ability/ability_runtime/abilitystagemonitor/abilitystagemonitorassiste/entry/src/main/ets/MainAbility/MainAbility.ts index 54fb016cfb5876920e658414ee16d35ba6869df9..8e80db4338f334f4bd062fa0064edc70663ee91e 100644 --- a/ability/ability_runtime/abilitystagemonitor/abilitystagemonitorassiste/entry/src/main/ets/MainAbility/MainAbility.ts +++ b/ability/ability_runtime/abilitystagemonitor/abilitystagemonitorassiste/entry/src/main/ets/MainAbility/MainAbility.ts @@ -13,7 +13,7 @@ * limitations under the License. */ -import Ability from '@ohos.application.Ability' +import Ability from '@ohos.app.ability.UIAbility' export default class MainAbility extends Ability { onCreate(want, launchParam) { diff --git a/ability/ability_runtime/abilitystagemonitor/abilitystagemonitorassistf/entry/src/main/ets/Application/MyAbilityStage.ts b/ability/ability_runtime/abilitystagemonitor/abilitystagemonitorassistf/entry/src/main/ets/Application/MyAbilityStage.ts index e51ff9632d6371ef35f5b56c7af455e3b8687949..85d57c8764988f765b78a4fdd2e62cdf97bb348b 100644 --- a/ability/ability_runtime/abilitystagemonitor/abilitystagemonitorassistf/entry/src/main/ets/Application/MyAbilityStage.ts +++ b/ability/ability_runtime/abilitystagemonitor/abilitystagemonitorassistf/entry/src/main/ets/Application/MyAbilityStage.ts @@ -13,7 +13,7 @@ * limitations under the License. */ -import AbilityStage from "@ohos.application.AbilityStage" +import AbilityStage from "@ohos.app.ability.AbilityStage" export default class MyAbilityStage extends AbilityStage { onCreate() { diff --git a/ability/ability_runtime/abilitystagemonitor/abilitystagemonitorassistf/entry/src/main/ets/MainAbility/MainAbility.ts b/ability/ability_runtime/abilitystagemonitor/abilitystagemonitorassistf/entry/src/main/ets/MainAbility/MainAbility.ts index 54fb016cfb5876920e658414ee16d35ba6869df9..8e80db4338f334f4bd062fa0064edc70663ee91e 100644 --- a/ability/ability_runtime/abilitystagemonitor/abilitystagemonitorassistf/entry/src/main/ets/MainAbility/MainAbility.ts +++ b/ability/ability_runtime/abilitystagemonitor/abilitystagemonitorassistf/entry/src/main/ets/MainAbility/MainAbility.ts @@ -13,7 +13,7 @@ * limitations under the License. */ -import Ability from '@ohos.application.Ability' +import Ability from '@ohos.app.ability.UIAbility' export default class MainAbility extends Ability { onCreate(want, launchParam) { diff --git a/ability/ability_runtime/abilitystagemonitor/abilitystagemonitorassistg/entry/src/main/ets/Application/MyAbilityStage.ts b/ability/ability_runtime/abilitystagemonitor/abilitystagemonitorassistg/entry/src/main/ets/Application/MyAbilityStage.ts index e51ff9632d6371ef35f5b56c7af455e3b8687949..85d57c8764988f765b78a4fdd2e62cdf97bb348b 100644 --- a/ability/ability_runtime/abilitystagemonitor/abilitystagemonitorassistg/entry/src/main/ets/Application/MyAbilityStage.ts +++ b/ability/ability_runtime/abilitystagemonitor/abilitystagemonitorassistg/entry/src/main/ets/Application/MyAbilityStage.ts @@ -13,7 +13,7 @@ * limitations under the License. */ -import AbilityStage from "@ohos.application.AbilityStage" +import AbilityStage from "@ohos.app.ability.AbilityStage" export default class MyAbilityStage extends AbilityStage { onCreate() { diff --git a/ability/ability_runtime/abilitystagemonitor/abilitystagemonitorassistg/entry/src/main/ets/MainAbility/MainAbility.ts b/ability/ability_runtime/abilitystagemonitor/abilitystagemonitorassistg/entry/src/main/ets/MainAbility/MainAbility.ts index 54fb016cfb5876920e658414ee16d35ba6869df9..8e80db4338f334f4bd062fa0064edc70663ee91e 100644 --- a/ability/ability_runtime/abilitystagemonitor/abilitystagemonitorassistg/entry/src/main/ets/MainAbility/MainAbility.ts +++ b/ability/ability_runtime/abilitystagemonitor/abilitystagemonitorassistg/entry/src/main/ets/MainAbility/MainAbility.ts @@ -13,7 +13,7 @@ * limitations under the License. */ -import Ability from '@ohos.application.Ability' +import Ability from '@ohos.app.ability.UIAbility' export default class MainAbility extends Ability { onCreate(want, launchParam) { diff --git a/ability/ability_runtime/abilitystagemonitor/abilitystagemonitorassisth/entry/src/main/ets/Application/MyAbilityStage.ts b/ability/ability_runtime/abilitystagemonitor/abilitystagemonitorassisth/entry/src/main/ets/Application/MyAbilityStage.ts index e51ff9632d6371ef35f5b56c7af455e3b8687949..85d57c8764988f765b78a4fdd2e62cdf97bb348b 100644 --- a/ability/ability_runtime/abilitystagemonitor/abilitystagemonitorassisth/entry/src/main/ets/Application/MyAbilityStage.ts +++ b/ability/ability_runtime/abilitystagemonitor/abilitystagemonitorassisth/entry/src/main/ets/Application/MyAbilityStage.ts @@ -13,7 +13,7 @@ * limitations under the License. */ -import AbilityStage from "@ohos.application.AbilityStage" +import AbilityStage from "@ohos.app.ability.AbilityStage" export default class MyAbilityStage extends AbilityStage { onCreate() { diff --git a/ability/ability_runtime/abilitystagemonitor/abilitystagemonitorassisth/entry/src/main/ets/MainAbility/MainAbility.ts b/ability/ability_runtime/abilitystagemonitor/abilitystagemonitorassisth/entry/src/main/ets/MainAbility/MainAbility.ts index 54fb016cfb5876920e658414ee16d35ba6869df9..8e80db4338f334f4bd062fa0064edc70663ee91e 100644 --- a/ability/ability_runtime/abilitystagemonitor/abilitystagemonitorassisth/entry/src/main/ets/MainAbility/MainAbility.ts +++ b/ability/ability_runtime/abilitystagemonitor/abilitystagemonitorassisth/entry/src/main/ets/MainAbility/MainAbility.ts @@ -13,7 +13,7 @@ * limitations under the License. */ -import Ability from '@ohos.application.Ability' +import Ability from '@ohos.app.ability.UIAbility' export default class MainAbility extends Ability { onCreate(want, launchParam) { diff --git a/ability/ability_runtime/abilitystagemonitor/abilitystagemonitortest/entry/src/main/ets/Application/TestAbilityStage.ts b/ability/ability_runtime/abilitystagemonitor/abilitystagemonitortest/entry/src/main/ets/Application/TestAbilityStage.ts index e51ff9632d6371ef35f5b56c7af455e3b8687949..85d57c8764988f765b78a4fdd2e62cdf97bb348b 100644 --- a/ability/ability_runtime/abilitystagemonitor/abilitystagemonitortest/entry/src/main/ets/Application/TestAbilityStage.ts +++ b/ability/ability_runtime/abilitystagemonitor/abilitystagemonitortest/entry/src/main/ets/Application/TestAbilityStage.ts @@ -13,7 +13,7 @@ * limitations under the License. */ -import AbilityStage from "@ohos.application.AbilityStage" +import AbilityStage from "@ohos.app.ability.AbilityStage" export default class MyAbilityStage extends AbilityStage { onCreate() { diff --git a/ability/ability_runtime/abilitystagemonitor/abilitystagemonitortest/entry/src/main/ets/TestAbility/TestAbility.ts b/ability/ability_runtime/abilitystagemonitor/abilitystagemonitortest/entry/src/main/ets/TestAbility/TestAbility.ts index d1317f99b914d3bc27274c9ade6bc4a8b62a47fd..aaeed2f56a154797f34867f55fa3ce345fa96e03 100644 --- a/ability/ability_runtime/abilitystagemonitor/abilitystagemonitortest/entry/src/main/ets/TestAbility/TestAbility.ts +++ b/ability/ability_runtime/abilitystagemonitor/abilitystagemonitortest/entry/src/main/ets/TestAbility/TestAbility.ts @@ -12,7 +12,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -import Ability from '@ohos.application.Ability' +import Ability from '@ohos.app.ability.UIAbility' import AbilityDelegatorRegistry from '@ohos.application.abilityDelegatorRegistry' import { Hypium } from '@ohos/hypium' import testsuite from '../test/List.test' diff --git a/ability/ability_runtime/actsabilityusertest/entry/src/main/ets/Application/AbilityStage.ts b/ability/ability_runtime/actsabilityusertest/entry/src/main/ets/Application/AbilityStage.ts index 32dfe93ccff0375201857794de902cec4d239442..11200f672cfa3a981668dbdee5a700935bf7be99 100644 --- a/ability/ability_runtime/actsabilityusertest/entry/src/main/ets/Application/AbilityStage.ts +++ b/ability/ability_runtime/actsabilityusertest/entry/src/main/ets/Application/AbilityStage.ts @@ -1,4 +1,4 @@ -import AbilityStage from "@ohos.application.AbilityStage" +import AbilityStage from "@ohos.app.ability.AbilityStage" export default class MyAbilityStage extends AbilityStage { onCreate() { diff --git a/ability/ability_runtime/actsabilityusertest/entry/src/main/ets/MainAbility/MainAbility.ts b/ability/ability_runtime/actsabilityusertest/entry/src/main/ets/MainAbility/MainAbility.ts index 22217570e5c6f379f58b234b3e3833f98beffc07..a9df916833fd057b1ace5ecc9b3ece468e000bb1 100644 --- a/ability/ability_runtime/actsabilityusertest/entry/src/main/ets/MainAbility/MainAbility.ts +++ b/ability/ability_runtime/actsabilityusertest/entry/src/main/ets/MainAbility/MainAbility.ts @@ -1,4 +1,4 @@ -import Ability from '@ohos.application.Ability' +import Ability from '@ohos.app.ability.UIAbility' import AbilityDelegatorRegistry from '@ohos.application.abilityDelegatorRegistry' import { Hypium } from '@ohos/hypium' import testsuite from '../test/List.test' diff --git a/ability/ability_runtime/actsabilityusertest/entry/src/main/ets/MainAbility2/MainAbility2.ts b/ability/ability_runtime/actsabilityusertest/entry/src/main/ets/MainAbility2/MainAbility2.ts index 6674afce3e1c07610b5fc4890035f53d5ccc9b3b..a1c74b25c7d7428ca8bcbae5ca4ee40bd250ead7 100644 --- a/ability/ability_runtime/actsabilityusertest/entry/src/main/ets/MainAbility2/MainAbility2.ts +++ b/ability/ability_runtime/actsabilityusertest/entry/src/main/ets/MainAbility2/MainAbility2.ts @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -import Ability from '@ohos.application.Ability' +import Ability from '@ohos.app.ability.UIAbility' import commonEvent from '@ohos.commonEvent' function PublishCallBackOne() { console.debug("====>Publish CallBack ACTS_Start_CommonEvent====>"); diff --git a/ability/ability_runtime/actsabilityusertest/entry/src/main/ets/MainAbility3/MainAbility3.ts b/ability/ability_runtime/actsabilityusertest/entry/src/main/ets/MainAbility3/MainAbility3.ts index b58a1d2e21fe2eee185a9310e122c472af3f50eb..5ae9adf9daa741ea4bfc4dce553533321075db86 100644 --- a/ability/ability_runtime/actsabilityusertest/entry/src/main/ets/MainAbility3/MainAbility3.ts +++ b/ability/ability_runtime/actsabilityusertest/entry/src/main/ets/MainAbility3/MainAbility3.ts @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -import Ability from '@ohos.application.Ability' +import Ability from '@ohos.app.ability.UIAbility' import commonEvent from '@ohos.commonEvent' function PublishCallBackOne() { console.debug("====>Publish CallBack ACTS_Start_CommonEvent====>"); diff --git a/ability/ability_runtime/actsdataabilityaccessdatasharetest/datashareserverhap/entry/src/main/ets/Application/MyAbilityStage.ts b/ability/ability_runtime/actsdataabilityaccessdatasharetest/datashareserverhap/entry/src/main/ets/Application/MyAbilityStage.ts index 94c3b4421a762baeaafe7333ec76e8255d31896e..71c4a3fe1c5feede792802fa1e147972d718b430 100644 --- a/ability/ability_runtime/actsdataabilityaccessdatasharetest/datashareserverhap/entry/src/main/ets/Application/MyAbilityStage.ts +++ b/ability/ability_runtime/actsdataabilityaccessdatasharetest/datashareserverhap/entry/src/main/ets/Application/MyAbilityStage.ts @@ -13,7 +13,7 @@ * limitations under the License. */ -import AbilityStage from "@ohos.application.AbilityStage" +import AbilityStage from "@ohos.app.ability.AbilityStage" export default class MyAbilityStage extends AbilityStage { onCreate() { diff --git a/ability/ability_runtime/actsdataabilityaccessdatasharetest/datashareserverhap/entry/src/main/ets/MainAbility/MainAbility.ts b/ability/ability_runtime/actsdataabilityaccessdatasharetest/datashareserverhap/entry/src/main/ets/MainAbility/MainAbility.ts index 618bcd06d8ce579fd5cc66bbf8303dcc6a404e49..7c0e1c8cf92d83791e9abe2045fa50dfe6a52bb8 100644 --- a/ability/ability_runtime/actsdataabilityaccessdatasharetest/datashareserverhap/entry/src/main/ets/MainAbility/MainAbility.ts +++ b/ability/ability_runtime/actsdataabilityaccessdatasharetest/datashareserverhap/entry/src/main/ets/MainAbility/MainAbility.ts @@ -13,7 +13,7 @@ * limitations under the License. */ -import Ability from '@ohos.application.Ability' +import Ability from '@ohos.app.ability.UIAbility' export default class MainAbility extends Ability { onCreate(want, launchParam) { diff --git a/ability/ability_runtime/actsfwkdataaccessortest/actsdataabilityrelyhap/entry/src/main/ets/AbilityStage.ts b/ability/ability_runtime/actsfwkdataaccessortest/actsdataabilityrelyhap/entry/src/main/ets/AbilityStage.ts index 07ad14f5f75a15d1a7cce6eaee825e65d58e5752..397f53c990f5dc467c1dfc84b531bf653b9bf6be 100644 --- a/ability/ability_runtime/actsfwkdataaccessortest/actsdataabilityrelyhap/entry/src/main/ets/AbilityStage.ts +++ b/ability/ability_runtime/actsfwkdataaccessortest/actsdataabilityrelyhap/entry/src/main/ets/AbilityStage.ts @@ -12,7 +12,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -import AbilityStage from "@ohos.application.AbilityStage" +import AbilityStage from "@ohos.app.ability.AbilityStage" export default class MyAbilityStage extends AbilityStage { onCreate() { diff --git a/ability/ability_runtime/actsfwkdataaccessortest/actsdataabilityrelyhap/entry/src/main/ets/MainAbility/MainAbility.ts b/ability/ability_runtime/actsfwkdataaccessortest/actsdataabilityrelyhap/entry/src/main/ets/MainAbility/MainAbility.ts index 5f8551ea9c615a693294aa3fc84136a333c3b859..0aa7fed2f5a64f08bfc670f8ed7c7aaa37793097 100644 --- a/ability/ability_runtime/actsfwkdataaccessortest/actsdataabilityrelyhap/entry/src/main/ets/MainAbility/MainAbility.ts +++ b/ability/ability_runtime/actsfwkdataaccessortest/actsdataabilityrelyhap/entry/src/main/ets/MainAbility/MainAbility.ts @@ -12,7 +12,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -import Ability from '@ohos.application.Ability' +import Ability from '@ohos.app.ability.UIAbility' export default class MainAbility extends Ability { onCreate(want, launchParam) { console.log("jws onCreate"); diff --git a/ability/ability_runtime/actsqueryfunctiontest/actsgetabilitystatestagetest/entry/src/main/ets/Application/AbilityStage.ts b/ability/ability_runtime/actsqueryfunctiontest/actsgetabilitystatestagetest/entry/src/main/ets/Application/AbilityStage.ts index 5073f074333769e258d7b97d27aa750302f91fbe..a31d98d3a92d876ad5db3ea4ebdd51b8629c07a3 100644 --- a/ability/ability_runtime/actsqueryfunctiontest/actsgetabilitystatestagetest/entry/src/main/ets/Application/AbilityStage.ts +++ b/ability/ability_runtime/actsqueryfunctiontest/actsgetabilitystatestagetest/entry/src/main/ets/Application/AbilityStage.ts @@ -13,7 +13,7 @@ * limitations under the License. */ -import AbilityStage from "@ohos.application.AbilityStage" +import AbilityStage from "@ohos.app.ability.AbilityStage" export default class MyAbilityStage extends AbilityStage { onCreate() { diff --git a/ability/ability_runtime/actsqueryfunctiontest/actsgetabilitystatestagetest/entry/src/main/ets/MainAbility/MainAbility.ts b/ability/ability_runtime/actsqueryfunctiontest/actsgetabilitystatestagetest/entry/src/main/ets/MainAbility/MainAbility.ts index 4a255b15ab9c83d7ba170564a4e7d44646439851..db161789555d4177a79b2a14fdab750a07ba43ba 100644 --- a/ability/ability_runtime/actsqueryfunctiontest/actsgetabilitystatestagetest/entry/src/main/ets/MainAbility/MainAbility.ts +++ b/ability/ability_runtime/actsqueryfunctiontest/actsgetabilitystatestagetest/entry/src/main/ets/MainAbility/MainAbility.ts @@ -13,7 +13,7 @@ * limitations under the License. */ -import Ability from '@ohos.application.Ability' +import Ability from '@ohos.app.ability.UIAbility' import AbilityDelegatorRegistry from '@ohos.application.abilityDelegatorRegistry' import { Hypium } from '@ohos/hypium' import testsuite from '../test/List.test' diff --git a/ability/ability_runtime/actsqueryfunctiontest/actsgetabilitystatestagetest/entry/src/main/ets/MainAbility2/MainAbility2.ts b/ability/ability_runtime/actsqueryfunctiontest/actsgetabilitystatestagetest/entry/src/main/ets/MainAbility2/MainAbility2.ts index 48e2332d00a46d6f719d7e7c1df0c48ab05ed1e2..f30966b58db9e143e272afddb7600ef2fc5161a0 100644 --- a/ability/ability_runtime/actsqueryfunctiontest/actsgetabilitystatestagetest/entry/src/main/ets/MainAbility2/MainAbility2.ts +++ b/ability/ability_runtime/actsqueryfunctiontest/actsgetabilitystatestagetest/entry/src/main/ets/MainAbility2/MainAbility2.ts @@ -13,7 +13,7 @@ * limitations under the License. */ -import Ability from '@ohos.application.Ability' +import Ability from '@ohos.app.ability.UIAbility' export default class MainAbility extends Ability { onCreate(want, launchParam) { diff --git a/ability/ability_runtime/actsqueryfunctiontest/actsgetabilitystatestagetest/entry/src/main/ets/MainAbility3/MainAbility3.ts b/ability/ability_runtime/actsqueryfunctiontest/actsgetabilitystatestagetest/entry/src/main/ets/MainAbility3/MainAbility3.ts index cce40226d96f5c3deca26c145d8fa83bedf825a9..7eb526f21a61fbcf351f6bb79eb32cdcbd85aea0 100644 --- a/ability/ability_runtime/actsqueryfunctiontest/actsgetabilitystatestagetest/entry/src/main/ets/MainAbility3/MainAbility3.ts +++ b/ability/ability_runtime/actsqueryfunctiontest/actsgetabilitystatestagetest/entry/src/main/ets/MainAbility3/MainAbility3.ts @@ -14,7 +14,7 @@ * limitations under the License. */ -import Ability from '@ohos.application.Ability' +import Ability from '@ohos.app.ability.UIAbility' export default class MainAbility3 extends Ability { onCreate(want, launchParam) { diff --git a/ability/ability_runtime/actsqueryfunctiontest/actsgetabilitystatestagetest/entry/src/main/ets/MainAbility4/MainAbility4.ts b/ability/ability_runtime/actsqueryfunctiontest/actsgetabilitystatestagetest/entry/src/main/ets/MainAbility4/MainAbility4.ts index 5ea48b09b1b6a68f52861173e2838ea777cfa1a0..2ea13cbbab52179529c3fb2c5dde097dc1da4524 100644 --- a/ability/ability_runtime/actsqueryfunctiontest/actsgetabilitystatestagetest/entry/src/main/ets/MainAbility4/MainAbility4.ts +++ b/ability/ability_runtime/actsqueryfunctiontest/actsgetabilitystatestagetest/entry/src/main/ets/MainAbility4/MainAbility4.ts @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -import Ability from '@ohos.application.Ability' +import Ability from '@ohos.app.ability.UIAbility' export default class MainAbility4 extends Ability { diff --git a/ability/ability_runtime/actsqueryfunctiontest/actsgetappcontextstageatest/entry/src/main/ets/Application/AbilityStage.ts b/ability/ability_runtime/actsqueryfunctiontest/actsgetappcontextstageatest/entry/src/main/ets/Application/AbilityStage.ts index 32dfe93ccff0375201857794de902cec4d239442..11200f672cfa3a981668dbdee5a700935bf7be99 100644 --- a/ability/ability_runtime/actsqueryfunctiontest/actsgetappcontextstageatest/entry/src/main/ets/Application/AbilityStage.ts +++ b/ability/ability_runtime/actsqueryfunctiontest/actsgetappcontextstageatest/entry/src/main/ets/Application/AbilityStage.ts @@ -1,4 +1,4 @@ -import AbilityStage from "@ohos.application.AbilityStage" +import AbilityStage from "@ohos.app.ability.AbilityStage" export default class MyAbilityStage extends AbilityStage { onCreate() { diff --git a/ability/ability_runtime/actsqueryfunctiontest/actsgetappcontextstageatest/entry/src/main/ets/MainAbility/MainAbility.ts b/ability/ability_runtime/actsqueryfunctiontest/actsgetappcontextstageatest/entry/src/main/ets/MainAbility/MainAbility.ts index 880ca3fa4d033a8cd47c260912eebe0c467c6941..6e7dd0e7de17cbcf1dda2876193dde56621ff541 100644 --- a/ability/ability_runtime/actsqueryfunctiontest/actsgetappcontextstageatest/entry/src/main/ets/MainAbility/MainAbility.ts +++ b/ability/ability_runtime/actsqueryfunctiontest/actsgetappcontextstageatest/entry/src/main/ets/MainAbility/MainAbility.ts @@ -13,7 +13,7 @@ * limitations under the License. */ -import Ability from '@ohos.application.Ability' +import Ability from '@ohos.app.ability.UIAbility' import AbilityDelegatorRegistry from '@ohos.application.abilityDelegatorRegistry' import { Hypium } from '@ohos/hypium' import testsuite from '../test/List.test' diff --git a/ability/ability_runtime/actsqueryfunctiontest/actsgetappcontextstageatest/entry/src/main/ets/MainAbility1/MainAbility1.ts b/ability/ability_runtime/actsqueryfunctiontest/actsgetappcontextstageatest/entry/src/main/ets/MainAbility1/MainAbility1.ts index 7212a06e9a5622150ad7206b9afae4fd37e3ca67..98873061099b061d5cce28cd41ab37ab94348d41 100644 --- a/ability/ability_runtime/actsqueryfunctiontest/actsgetappcontextstageatest/entry/src/main/ets/MainAbility1/MainAbility1.ts +++ b/ability/ability_runtime/actsqueryfunctiontest/actsgetappcontextstageatest/entry/src/main/ets/MainAbility1/MainAbility1.ts @@ -13,7 +13,7 @@ * limitations under the License. */ -import Ability from '@ohos.application.Ability' +import Ability from '@ohos.app.ability.UIAbility' import commonEvent from '@ohos.commonEvent' function PublishCallBackOne2() { console.debug("====>Publish CallBack ACTS_StartAbility2_CommonEvent====>"); diff --git a/ability/ability_runtime/actsqueryfunctiontest/actsgetappcontextstagebtest/entry/src/main/ets/Application/AbilityStage.ts b/ability/ability_runtime/actsqueryfunctiontest/actsgetappcontextstagebtest/entry/src/main/ets/Application/AbilityStage.ts index 5073f074333769e258d7b97d27aa750302f91fbe..a31d98d3a92d876ad5db3ea4ebdd51b8629c07a3 100644 --- a/ability/ability_runtime/actsqueryfunctiontest/actsgetappcontextstagebtest/entry/src/main/ets/Application/AbilityStage.ts +++ b/ability/ability_runtime/actsqueryfunctiontest/actsgetappcontextstagebtest/entry/src/main/ets/Application/AbilityStage.ts @@ -13,7 +13,7 @@ * limitations under the License. */ -import AbilityStage from "@ohos.application.AbilityStage" +import AbilityStage from "@ohos.app.ability.AbilityStage" export default class MyAbilityStage extends AbilityStage { onCreate() { diff --git a/ability/ability_runtime/actsqueryfunctiontest/actsgetappcontextstagebtest/entry/src/main/ets/MainAbility/MainAbility.ts b/ability/ability_runtime/actsqueryfunctiontest/actsgetappcontextstagebtest/entry/src/main/ets/MainAbility/MainAbility.ts index 880ca3fa4d033a8cd47c260912eebe0c467c6941..6e7dd0e7de17cbcf1dda2876193dde56621ff541 100644 --- a/ability/ability_runtime/actsqueryfunctiontest/actsgetappcontextstagebtest/entry/src/main/ets/MainAbility/MainAbility.ts +++ b/ability/ability_runtime/actsqueryfunctiontest/actsgetappcontextstagebtest/entry/src/main/ets/MainAbility/MainAbility.ts @@ -13,7 +13,7 @@ * limitations under the License. */ -import Ability from '@ohos.application.Ability' +import Ability from '@ohos.app.ability.UIAbility' import AbilityDelegatorRegistry from '@ohos.application.abilityDelegatorRegistry' import { Hypium } from '@ohos/hypium' import testsuite from '../test/List.test' diff --git a/ability/ability_runtime/actsqueryfunctiontest/actsgetappcontextstagebtest/entry/src/main/ets/MainAbility1/MainAbility1.ts b/ability/ability_runtime/actsqueryfunctiontest/actsgetappcontextstagebtest/entry/src/main/ets/MainAbility1/MainAbility1.ts index 7212a06e9a5622150ad7206b9afae4fd37e3ca67..98873061099b061d5cce28cd41ab37ab94348d41 100644 --- a/ability/ability_runtime/actsqueryfunctiontest/actsgetappcontextstagebtest/entry/src/main/ets/MainAbility1/MainAbility1.ts +++ b/ability/ability_runtime/actsqueryfunctiontest/actsgetappcontextstagebtest/entry/src/main/ets/MainAbility1/MainAbility1.ts @@ -13,7 +13,7 @@ * limitations under the License. */ -import Ability from '@ohos.application.Ability' +import Ability from '@ohos.app.ability.UIAbility' import commonEvent from '@ohos.commonEvent' function PublishCallBackOne2() { console.debug("====>Publish CallBack ACTS_StartAbility2_CommonEvent====>"); diff --git a/ability/ability_runtime/actsqueryfunctiontest/actsgetappcontexttest/entry/src/main/ets/Application/AbilityStage.ts b/ability/ability_runtime/actsqueryfunctiontest/actsgetappcontexttest/entry/src/main/ets/Application/AbilityStage.ts index 5073f074333769e258d7b97d27aa750302f91fbe..a31d98d3a92d876ad5db3ea4ebdd51b8629c07a3 100644 --- a/ability/ability_runtime/actsqueryfunctiontest/actsgetappcontexttest/entry/src/main/ets/Application/AbilityStage.ts +++ b/ability/ability_runtime/actsqueryfunctiontest/actsgetappcontexttest/entry/src/main/ets/Application/AbilityStage.ts @@ -13,7 +13,7 @@ * limitations under the License. */ -import AbilityStage from "@ohos.application.AbilityStage" +import AbilityStage from "@ohos.app.ability.AbilityStage" export default class MyAbilityStage extends AbilityStage { onCreate() { diff --git a/ability/ability_runtime/actsqueryfunctiontest/actsgetappcontexttest/entry/src/main/ets/MainAbility/MainAbility.ts b/ability/ability_runtime/actsqueryfunctiontest/actsgetappcontexttest/entry/src/main/ets/MainAbility/MainAbility.ts index 880ca3fa4d033a8cd47c260912eebe0c467c6941..6e7dd0e7de17cbcf1dda2876193dde56621ff541 100644 --- a/ability/ability_runtime/actsqueryfunctiontest/actsgetappcontexttest/entry/src/main/ets/MainAbility/MainAbility.ts +++ b/ability/ability_runtime/actsqueryfunctiontest/actsgetappcontexttest/entry/src/main/ets/MainAbility/MainAbility.ts @@ -13,7 +13,7 @@ * limitations under the License. */ -import Ability from '@ohos.application.Ability' +import Ability from '@ohos.app.ability.UIAbility' import AbilityDelegatorRegistry from '@ohos.application.abilityDelegatorRegistry' import { Hypium } from '@ohos/hypium' import testsuite from '../test/List.test' diff --git a/ability/ability_runtime/actsqueryfunctiontest/actsgetappcontexttest/entry/src/main/ets/MainAbility1/MainAbility1.ts b/ability/ability_runtime/actsqueryfunctiontest/actsgetappcontexttest/entry/src/main/ets/MainAbility1/MainAbility1.ts index 7212a06e9a5622150ad7206b9afae4fd37e3ca67..98873061099b061d5cce28cd41ab37ab94348d41 100644 --- a/ability/ability_runtime/actsqueryfunctiontest/actsgetappcontexttest/entry/src/main/ets/MainAbility1/MainAbility1.ts +++ b/ability/ability_runtime/actsqueryfunctiontest/actsgetappcontexttest/entry/src/main/ets/MainAbility1/MainAbility1.ts @@ -13,7 +13,7 @@ * limitations under the License. */ -import Ability from '@ohos.application.Ability' +import Ability from '@ohos.app.ability.UIAbility' import commonEvent from '@ohos.commonEvent' function PublishCallBackOne2() { console.debug("====>Publish CallBack ACTS_StartAbility2_CommonEvent====>"); diff --git a/ability/ability_runtime/actsqueryfunctiontest/actsgetcurrenttopabilitystageatest/entry/src/main/ets/Ability1/Ability1.ts b/ability/ability_runtime/actsqueryfunctiontest/actsgetcurrenttopabilitystageatest/entry/src/main/ets/Ability1/Ability1.ts index 99cabae59cdcf6180a44439728a7853e3274cd49..5273ef86f79504079eab4e8afc2cfbf5ed994fe8 100644 --- a/ability/ability_runtime/actsqueryfunctiontest/actsgetcurrenttopabilitystageatest/entry/src/main/ets/Ability1/Ability1.ts +++ b/ability/ability_runtime/actsqueryfunctiontest/actsgetcurrenttopabilitystageatest/entry/src/main/ets/Ability1/Ability1.ts @@ -12,7 +12,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -import Ability from '@ohos.application.Ability' +import Ability from '@ohos.app.ability.UIAbility' export default class Ability1 extends Ability { onCreate(want, launchParam) { console.log("Ability1 onCreate"); diff --git a/ability/ability_runtime/actsqueryfunctiontest/actsgetcurrenttopabilitystageatest/entry/src/main/ets/Ability2/Ability2.ts b/ability/ability_runtime/actsqueryfunctiontest/actsgetcurrenttopabilitystageatest/entry/src/main/ets/Ability2/Ability2.ts index c3309b102d22d3a67f3b500a023763e44433fb9e..b756a6eb515484c74ae40c5abb5febdbbdc878d1 100644 --- a/ability/ability_runtime/actsqueryfunctiontest/actsgetcurrenttopabilitystageatest/entry/src/main/ets/Ability2/Ability2.ts +++ b/ability/ability_runtime/actsqueryfunctiontest/actsgetcurrenttopabilitystageatest/entry/src/main/ets/Ability2/Ability2.ts @@ -12,7 +12,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -import Ability from '@ohos.application.Ability' +import Ability from '@ohos.app.ability.UIAbility' import commonEvent from '@ohos.commonEvent' function PublishCallBackOne() { console.debug("====>Publish CallBack GetCurrentTopAbility2====>"); diff --git a/ability/ability_runtime/actsqueryfunctiontest/actsgetcurrenttopabilitystageatest/entry/src/main/ets/Application/AbilityStage.ts b/ability/ability_runtime/actsqueryfunctiontest/actsgetcurrenttopabilitystageatest/entry/src/main/ets/Application/AbilityStage.ts index 5073f074333769e258d7b97d27aa750302f91fbe..a31d98d3a92d876ad5db3ea4ebdd51b8629c07a3 100644 --- a/ability/ability_runtime/actsqueryfunctiontest/actsgetcurrenttopabilitystageatest/entry/src/main/ets/Application/AbilityStage.ts +++ b/ability/ability_runtime/actsqueryfunctiontest/actsgetcurrenttopabilitystageatest/entry/src/main/ets/Application/AbilityStage.ts @@ -13,7 +13,7 @@ * limitations under the License. */ -import AbilityStage from "@ohos.application.AbilityStage" +import AbilityStage from "@ohos.app.ability.AbilityStage" export default class MyAbilityStage extends AbilityStage { onCreate() { diff --git a/ability/ability_runtime/actsqueryfunctiontest/actsgetcurrenttopabilitystageatest/entry/src/main/ets/MainAbility/MainAbility.ts b/ability/ability_runtime/actsqueryfunctiontest/actsgetcurrenttopabilitystageatest/entry/src/main/ets/MainAbility/MainAbility.ts index 09c6f0bfaa068c67864324a71b69d4c99cafb558..674e179eb63ddc2146da3e6028d5cfd7a45cbed4 100644 --- a/ability/ability_runtime/actsqueryfunctiontest/actsgetcurrenttopabilitystageatest/entry/src/main/ets/MainAbility/MainAbility.ts +++ b/ability/ability_runtime/actsqueryfunctiontest/actsgetcurrenttopabilitystageatest/entry/src/main/ets/MainAbility/MainAbility.ts @@ -13,7 +13,7 @@ * limitations under the License. */ -import Ability from '@ohos.application.Ability' +import Ability from '@ohos.app.ability.UIAbility' import AbilityDelegatorRegistry from '@ohos.application.abilityDelegatorRegistry' import { Hypium } from '@ohos/hypium' import testsuite from '../test/List.test' diff --git a/ability/ability_runtime/actsqueryfunctiontest/actsgetcurrenttopabilitystagebtest/entry/src/main/ets/Ability1/Ability1.ts b/ability/ability_runtime/actsqueryfunctiontest/actsgetcurrenttopabilitystagebtest/entry/src/main/ets/Ability1/Ability1.ts index 23999d3bc010b4c4c4c37ed2f46ec8edf92e4833..bb7ab237930ac0e040e63c455d5041b312ddda2b 100644 --- a/ability/ability_runtime/actsqueryfunctiontest/actsgetcurrenttopabilitystagebtest/entry/src/main/ets/Ability1/Ability1.ts +++ b/ability/ability_runtime/actsqueryfunctiontest/actsgetcurrenttopabilitystagebtest/entry/src/main/ets/Ability1/Ability1.ts @@ -12,7 +12,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -import Ability from '@ohos.application.Ability' +import Ability from '@ohos.app.ability.UIAbility' import commonEvent from '@ohos.commonEvent' function publishCallBackOne() { console.debug("====>Publish CallBack GetCurrentTopAbility"); diff --git a/ability/ability_runtime/actsqueryfunctiontest/actsgetcurrenttopabilitystagebtest/entry/src/main/ets/Ability2/Ability2.ts b/ability/ability_runtime/actsqueryfunctiontest/actsgetcurrenttopabilitystagebtest/entry/src/main/ets/Ability2/Ability2.ts index 5b20afc40051826e22964ab456df2dd249adf460..a7a001f4bb87015204d0c6e5868afa2cf52ee242 100644 --- a/ability/ability_runtime/actsqueryfunctiontest/actsgetcurrenttopabilitystagebtest/entry/src/main/ets/Ability2/Ability2.ts +++ b/ability/ability_runtime/actsqueryfunctiontest/actsgetcurrenttopabilitystagebtest/entry/src/main/ets/Ability2/Ability2.ts @@ -12,7 +12,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -import Ability from '@ohos.application.Ability' +import Ability from '@ohos.app.ability.UIAbility' export default class MainAbility extends Ability { onCreate(want, launchParam) { // Ability is creating, initialize resources for this ability diff --git a/ability/ability_runtime/actsqueryfunctiontest/actsgetcurrenttopabilitystagebtest/entry/src/main/ets/Application/AbilityStage.ts b/ability/ability_runtime/actsqueryfunctiontest/actsgetcurrenttopabilitystagebtest/entry/src/main/ets/Application/AbilityStage.ts index 5073f074333769e258d7b97d27aa750302f91fbe..a31d98d3a92d876ad5db3ea4ebdd51b8629c07a3 100644 --- a/ability/ability_runtime/actsqueryfunctiontest/actsgetcurrenttopabilitystagebtest/entry/src/main/ets/Application/AbilityStage.ts +++ b/ability/ability_runtime/actsqueryfunctiontest/actsgetcurrenttopabilitystagebtest/entry/src/main/ets/Application/AbilityStage.ts @@ -13,7 +13,7 @@ * limitations under the License. */ -import AbilityStage from "@ohos.application.AbilityStage" +import AbilityStage from "@ohos.app.ability.AbilityStage" export default class MyAbilityStage extends AbilityStage { onCreate() { diff --git a/ability/ability_runtime/actsqueryfunctiontest/actsgetcurrenttopabilitystagebtest/entry/src/main/ets/MainAbility/MainAbility.ts b/ability/ability_runtime/actsqueryfunctiontest/actsgetcurrenttopabilitystagebtest/entry/src/main/ets/MainAbility/MainAbility.ts index 880ca3fa4d033a8cd47c260912eebe0c467c6941..6e7dd0e7de17cbcf1dda2876193dde56621ff541 100644 --- a/ability/ability_runtime/actsqueryfunctiontest/actsgetcurrenttopabilitystagebtest/entry/src/main/ets/MainAbility/MainAbility.ts +++ b/ability/ability_runtime/actsqueryfunctiontest/actsgetcurrenttopabilitystagebtest/entry/src/main/ets/MainAbility/MainAbility.ts @@ -13,7 +13,7 @@ * limitations under the License. */ -import Ability from '@ohos.application.Ability' +import Ability from '@ohos.app.ability.UIAbility' import AbilityDelegatorRegistry from '@ohos.application.abilityDelegatorRegistry' import { Hypium } from '@ohos/hypium' import testsuite from '../test/List.test' diff --git a/ability/ability_runtime/actsserviceabilityclienttest/actsserviceabilityserverrelyhap/entry/src/main/ets/AbilityStage.ts b/ability/ability_runtime/actsserviceabilityclienttest/actsserviceabilityserverrelyhap/entry/src/main/ets/AbilityStage.ts index 07ad14f5f75a15d1a7cce6eaee825e65d58e5752..397f53c990f5dc467c1dfc84b531bf653b9bf6be 100644 --- a/ability/ability_runtime/actsserviceabilityclienttest/actsserviceabilityserverrelyhap/entry/src/main/ets/AbilityStage.ts +++ b/ability/ability_runtime/actsserviceabilityclienttest/actsserviceabilityserverrelyhap/entry/src/main/ets/AbilityStage.ts @@ -12,7 +12,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -import AbilityStage from "@ohos.application.AbilityStage" +import AbilityStage from "@ohos.app.ability.AbilityStage" export default class MyAbilityStage extends AbilityStage { onCreate() { diff --git a/ability/ability_runtime/actsserviceabilityclienttest/actsserviceabilityserverrelyhap/entry/src/main/ets/MainAbility/MainAbility.ts b/ability/ability_runtime/actsserviceabilityclienttest/actsserviceabilityserverrelyhap/entry/src/main/ets/MainAbility/MainAbility.ts index 5f8551ea9c615a693294aa3fc84136a333c3b859..0aa7fed2f5a64f08bfc670f8ed7c7aaa37793097 100644 --- a/ability/ability_runtime/actsserviceabilityclienttest/actsserviceabilityserverrelyhap/entry/src/main/ets/MainAbility/MainAbility.ts +++ b/ability/ability_runtime/actsserviceabilityclienttest/actsserviceabilityserverrelyhap/entry/src/main/ets/MainAbility/MainAbility.ts @@ -12,7 +12,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -import Ability from '@ohos.application.Ability' +import Ability from '@ohos.app.ability.UIAbility' export default class MainAbility extends Ability { onCreate(want, launchParam) { console.log("jws onCreate"); diff --git a/ability/ability_runtime/actsserviceabilityclienttest/actsserviceabilityserversecondrelyhap/entry/src/main/ets/AbilityStage.ts b/ability/ability_runtime/actsserviceabilityclienttest/actsserviceabilityserversecondrelyhap/entry/src/main/ets/AbilityStage.ts index 07ad14f5f75a15d1a7cce6eaee825e65d58e5752..397f53c990f5dc467c1dfc84b531bf653b9bf6be 100644 --- a/ability/ability_runtime/actsserviceabilityclienttest/actsserviceabilityserversecondrelyhap/entry/src/main/ets/AbilityStage.ts +++ b/ability/ability_runtime/actsserviceabilityclienttest/actsserviceabilityserversecondrelyhap/entry/src/main/ets/AbilityStage.ts @@ -12,7 +12,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -import AbilityStage from "@ohos.application.AbilityStage" +import AbilityStage from "@ohos.app.ability.AbilityStage" export default class MyAbilityStage extends AbilityStage { onCreate() { diff --git a/ability/ability_runtime/actsserviceabilityclienttest/actsserviceabilityserversecondrelyhap/entry/src/main/ets/MainAbility/MainAbility.ts b/ability/ability_runtime/actsserviceabilityclienttest/actsserviceabilityserversecondrelyhap/entry/src/main/ets/MainAbility/MainAbility.ts index 1dbbb8be4fa3479ff255de59bc442ee1c79bcfd6..0457c24cdee41b8ba8242d7f6275653b81efe442 100644 --- a/ability/ability_runtime/actsserviceabilityclienttest/actsserviceabilityserversecondrelyhap/entry/src/main/ets/MainAbility/MainAbility.ts +++ b/ability/ability_runtime/actsserviceabilityclienttest/actsserviceabilityserversecondrelyhap/entry/src/main/ets/MainAbility/MainAbility.ts @@ -1,4 +1,4 @@ -import Ability from '@ohos.application.Ability' +import Ability from '@ohos.app.ability.UIAbility' export default class MainAbility extends Ability { onCreate(want, launchParam) { console.log("jws onCreate"); diff --git a/ability/ability_runtime/actsshellcommandfunctionalitytest/ActskillProcessWithAccountCloseTest/entry/src/main/ets/Application/AbilityStage.ts b/ability/ability_runtime/actsshellcommandfunctionalitytest/ActskillProcessWithAccountCloseTest/entry/src/main/ets/Application/AbilityStage.ts index 2ae1bf3ce4d07b5d5a4e8bc485d994849d55de70..f851e3de00d0ec2a83e3c03e57ccd2845c27ac7f 100644 --- a/ability/ability_runtime/actsshellcommandfunctionalitytest/ActskillProcessWithAccountCloseTest/entry/src/main/ets/Application/AbilityStage.ts +++ b/ability/ability_runtime/actsshellcommandfunctionalitytest/ActskillProcessWithAccountCloseTest/entry/src/main/ets/Application/AbilityStage.ts @@ -12,7 +12,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -import AbilityStage from "@ohos.application.AbilityStage" +import AbilityStage from "@ohos.app.ability.AbilityStage" export default class MyAbilityStage extends AbilityStage { onCreate() { diff --git a/ability/ability_runtime/actsshellcommandfunctionalitytest/ActskillProcessWithAccountCloseTest/entry/src/main/ets/MainAbility/MainAbility.ts b/ability/ability_runtime/actsshellcommandfunctionalitytest/ActskillProcessWithAccountCloseTest/entry/src/main/ets/MainAbility/MainAbility.ts index bdb5195c592b1d4ea8f2be35e0628c8d1e3cc263..244f70b578d6baa20a5962152d38b6f4ea23e64c 100644 --- a/ability/ability_runtime/actsshellcommandfunctionalitytest/ActskillProcessWithAccountCloseTest/entry/src/main/ets/MainAbility/MainAbility.ts +++ b/ability/ability_runtime/actsshellcommandfunctionalitytest/ActskillProcessWithAccountCloseTest/entry/src/main/ets/MainAbility/MainAbility.ts @@ -12,7 +12,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -import Ability from '@ohos.application.Ability' +import Ability from '@ohos.app.ability.UIAbility' import AbilityDelegatorRegistry from '@ohos.application.abilityDelegatorRegistry' import { Hypium } from '@ohos/hypium' import testsuite from '../test/List.test' diff --git a/ability/ability_runtime/actsshellcommandfunctionalitytest/ExecuteShellCommand/entry/src/main/ets/Application/AbilityStage.ts b/ability/ability_runtime/actsshellcommandfunctionalitytest/ExecuteShellCommand/entry/src/main/ets/Application/AbilityStage.ts index 2ae1bf3ce4d07b5d5a4e8bc485d994849d55de70..f851e3de00d0ec2a83e3c03e57ccd2845c27ac7f 100644 --- a/ability/ability_runtime/actsshellcommandfunctionalitytest/ExecuteShellCommand/entry/src/main/ets/Application/AbilityStage.ts +++ b/ability/ability_runtime/actsshellcommandfunctionalitytest/ExecuteShellCommand/entry/src/main/ets/Application/AbilityStage.ts @@ -12,7 +12,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -import AbilityStage from "@ohos.application.AbilityStage" +import AbilityStage from "@ohos.app.ability.AbilityStage" export default class MyAbilityStage extends AbilityStage { onCreate() { diff --git a/ability/ability_runtime/actsshellcommandfunctionalitytest/ExecuteShellCommand/entry/src/main/ets/MainAbility/MainAbility.ts b/ability/ability_runtime/actsshellcommandfunctionalitytest/ExecuteShellCommand/entry/src/main/ets/MainAbility/MainAbility.ts index 68728e971b786aff2b8ea9288a66e9be15a0002c..4f0da52d7eac59d6aaff7c5d635e95b5340bc267 100644 --- a/ability/ability_runtime/actsshellcommandfunctionalitytest/ExecuteShellCommand/entry/src/main/ets/MainAbility/MainAbility.ts +++ b/ability/ability_runtime/actsshellcommandfunctionalitytest/ExecuteShellCommand/entry/src/main/ets/MainAbility/MainAbility.ts @@ -12,7 +12,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -import Ability from '@ohos.application.Ability' +import Ability from '@ohos.app.ability.UIAbility' import AbilityDelegatorRegistry from '@ohos.application.abilityDelegatorRegistry' import { Hypium } from '@ohos/hypium' import testsuite from '../test/List.test' diff --git a/ability/ability_runtime/actssingleton/SystemSingleton/entry/src/main/ets/Application/AbilityStage.ts b/ability/ability_runtime/actssingleton/SystemSingleton/entry/src/main/ets/Application/AbilityStage.ts index 8479029702ef6b01d61daabe3c7474d76863df2f..75e6a5aae2108da3f7d3c1a077d2bbafec2454a0 100644 --- a/ability/ability_runtime/actssingleton/SystemSingleton/entry/src/main/ets/Application/AbilityStage.ts +++ b/ability/ability_runtime/actssingleton/SystemSingleton/entry/src/main/ets/Application/AbilityStage.ts @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -import AbilityStage from "@ohos.application.AbilityStage" +import AbilityStage from "@ohos.app.ability.AbilityStage" export default class MyAbilityStage extends AbilityStage { onCreate() { diff --git a/ability/ability_runtime/actssingleton/SystemSingleton/entry/src/main/ets/MainAbility/MainAbility.ts b/ability/ability_runtime/actssingleton/SystemSingleton/entry/src/main/ets/MainAbility/MainAbility.ts index 3a7ebee7c3bde9049588830e439f15af4a5cd358..7fc7b9e5504e51fded694caf4325b74d51ebaf45 100644 --- a/ability/ability_runtime/actssingleton/SystemSingleton/entry/src/main/ets/MainAbility/MainAbility.ts +++ b/ability/ability_runtime/actssingleton/SystemSingleton/entry/src/main/ets/MainAbility/MainAbility.ts @@ -12,7 +12,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -import Ability from '@ohos.application.Ability' +import Ability from '@ohos.app.ability.UIAbility' import AbilityDelegatorRegistry from '@ohos.application.abilityDelegatorRegistry' import { Hypium } from '@ohos/hypium' import testsuite from '../test/List.test' diff --git a/ability/ability_runtime/actssingleton/SystemSingleton/entry/src/main/ets/SingleUserModel1400/SingleUserModel1400.ts b/ability/ability_runtime/actssingleton/SystemSingleton/entry/src/main/ets/SingleUserModel1400/SingleUserModel1400.ts index 2361d1ecc0cbc1d861c4d430dd88ace73a0a3158..3f5157fb0a9094727462c6eef8dd417c57a5f7e1 100644 --- a/ability/ability_runtime/actssingleton/SystemSingleton/entry/src/main/ets/SingleUserModel1400/SingleUserModel1400.ts +++ b/ability/ability_runtime/actssingleton/SystemSingleton/entry/src/main/ets/SingleUserModel1400/SingleUserModel1400.ts @@ -12,7 +12,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -import Ability from '@ohos.application.Ability' +import Ability from '@ohos.app.ability.UIAbility' export default class SingleUserModel1400 extends Ability { onCreate(want, launchParam) { diff --git a/ability/ability_runtime/actssingleton/SystemSingleton/entry/src/main/ets/SingleUserModel1500/SingleUserModel1500.ts b/ability/ability_runtime/actssingleton/SystemSingleton/entry/src/main/ets/SingleUserModel1500/SingleUserModel1500.ts index ed3d1f68ce9f5442682b672556ee03962156438e..5c52b5472ea1a959264a91e6fe2c7e2c982c0d64 100644 --- a/ability/ability_runtime/actssingleton/SystemSingleton/entry/src/main/ets/SingleUserModel1500/SingleUserModel1500.ts +++ b/ability/ability_runtime/actssingleton/SystemSingleton/entry/src/main/ets/SingleUserModel1500/SingleUserModel1500.ts @@ -12,7 +12,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -import Ability from '@ohos.application.Ability' +import Ability from '@ohos.app.ability.UIAbility' export default class SingleUserModel1500 extends Ability { onCreate(want, launchParam) { diff --git a/ability/ability_runtime/actssingleton/SystemSingleton/entry/src/main/ets/SingleUserModel1600/SingleUserModel1600.ts b/ability/ability_runtime/actssingleton/SystemSingleton/entry/src/main/ets/SingleUserModel1600/SingleUserModel1600.ts index 02ec46b736d6cae617323649ccf5b154003db121..cb7062fce669f655a12e820221baa48d8079f53f 100644 --- a/ability/ability_runtime/actssingleton/SystemSingleton/entry/src/main/ets/SingleUserModel1600/SingleUserModel1600.ts +++ b/ability/ability_runtime/actssingleton/SystemSingleton/entry/src/main/ets/SingleUserModel1600/SingleUserModel1600.ts @@ -12,7 +12,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -import Ability from '@ohos.application.Ability' +import Ability from '@ohos.app.ability.UIAbility' export default class SingleUserModel1600 extends Ability { onCreate(want, launchParam) { diff --git a/ability/ability_runtime/actssingleton/SystemSingleton/entry/src/main/ets/SingleUserModel1700/SingleUserModel1700.ts b/ability/ability_runtime/actssingleton/SystemSingleton/entry/src/main/ets/SingleUserModel1700/SingleUserModel1700.ts index b3e19ce164f58a10febf700811449b150537af48..076bdcd85bd00c0fbd9b6f1cb39f1ef24118bd2e 100644 --- a/ability/ability_runtime/actssingleton/SystemSingleton/entry/src/main/ets/SingleUserModel1700/SingleUserModel1700.ts +++ b/ability/ability_runtime/actssingleton/SystemSingleton/entry/src/main/ets/SingleUserModel1700/SingleUserModel1700.ts @@ -12,7 +12,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -import Ability from '@ohos.application.Ability' +import Ability from '@ohos.app.ability.UIAbility' export default class SingleUserModel1700 extends Ability { onCreate(want, launchParam) { diff --git a/ability/ability_runtime/actssingleton/SystemSingleton/entry/src/main/ets/SingleUserModel1800/SingleUserModel1800.ts b/ability/ability_runtime/actssingleton/SystemSingleton/entry/src/main/ets/SingleUserModel1800/SingleUserModel1800.ts index 43ec23b009846b9f5d5c274e98a44fc9cf08ab2b..b58935bcf92bb078f54c350bfa895d661f11b573 100644 --- a/ability/ability_runtime/actssingleton/SystemSingleton/entry/src/main/ets/SingleUserModel1800/SingleUserModel1800.ts +++ b/ability/ability_runtime/actssingleton/SystemSingleton/entry/src/main/ets/SingleUserModel1800/SingleUserModel1800.ts @@ -12,7 +12,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -import Ability from '@ohos.application.Ability' +import Ability from '@ohos.app.ability.UIAbility' export default class SingleUserModel1800 extends Ability { onCreate(want, launchParam) { diff --git a/ability/ability_runtime/actssingleton/SystemSingletonFalse/entry/src/main/ets/Application/AbilityStage.ts b/ability/ability_runtime/actssingleton/SystemSingletonFalse/entry/src/main/ets/Application/AbilityStage.ts index 6ceb0c290ae831a45143a5e2b42d4351f2fc3d7e..3745b4557c4d87274ed1fd9e5efef51b63d4ceca 100644 --- a/ability/ability_runtime/actssingleton/SystemSingletonFalse/entry/src/main/ets/Application/AbilityStage.ts +++ b/ability/ability_runtime/actssingleton/SystemSingletonFalse/entry/src/main/ets/Application/AbilityStage.ts @@ -12,7 +12,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -import AbilityStage from "@ohos.application.AbilityStage" +import AbilityStage from "@ohos.app.ability.AbilityStage" export default class MyAbilityStage extends AbilityStage { onCreate() { diff --git a/ability/ability_runtime/actssingleton/SystemSingletonFalse/entry/src/main/ets/MainAbility/MainAbility.ts b/ability/ability_runtime/actssingleton/SystemSingletonFalse/entry/src/main/ets/MainAbility/MainAbility.ts index d1de680e6a8f7294d2442de5804f055a38c6c443..1684b31c74fd79c1d2f9780393701bf6cdc41665 100644 --- a/ability/ability_runtime/actssingleton/SystemSingletonFalse/entry/src/main/ets/MainAbility/MainAbility.ts +++ b/ability/ability_runtime/actssingleton/SystemSingletonFalse/entry/src/main/ets/MainAbility/MainAbility.ts @@ -12,7 +12,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -import Ability from '@ohos.application.Ability' +import Ability from '@ohos.app.ability.UIAbility' import AbilityDelegatorRegistry from '@ohos.application.abilityDelegatorRegistry' import { Hypium } from '@ohos/hypium' import testsuite from '../test/List.test' diff --git a/ability/ability_runtime/actssingleton/SystemSingletonFalse/entry/src/main/ets/SingleUserModel0500/SingleUserModel0500.ts b/ability/ability_runtime/actssingleton/SystemSingletonFalse/entry/src/main/ets/SingleUserModel0500/SingleUserModel0500.ts index 0d4836e5373bc10932787d560796baf5818cb654..1ff77fe0e17ef6abe729d6976fe2ea6bbc52b8a4 100644 --- a/ability/ability_runtime/actssingleton/SystemSingletonFalse/entry/src/main/ets/SingleUserModel0500/SingleUserModel0500.ts +++ b/ability/ability_runtime/actssingleton/SystemSingletonFalse/entry/src/main/ets/SingleUserModel0500/SingleUserModel0500.ts @@ -12,7 +12,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -import Ability from '@ohos.application.Ability' +import Ability from '@ohos.app.ability.UIAbility' export default class SingleUserModel0500 extends Ability { diff --git a/ability/ability_runtime/actssingleton/SystemSingletonFalse/entry/src/main/ets/SingleUserModel0600/SingleUserModel0600.ts b/ability/ability_runtime/actssingleton/SystemSingletonFalse/entry/src/main/ets/SingleUserModel0600/SingleUserModel0600.ts index a9da8df29c4fcf528e43e543589ba31ada733659..2dbbc3b495101f5bc4befc0d43c679044dec1942 100644 --- a/ability/ability_runtime/actssingleton/SystemSingletonFalse/entry/src/main/ets/SingleUserModel0600/SingleUserModel0600.ts +++ b/ability/ability_runtime/actssingleton/SystemSingletonFalse/entry/src/main/ets/SingleUserModel0600/SingleUserModel0600.ts @@ -12,7 +12,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -import Ability from '@ohos.application.Ability' +import Ability from '@ohos.app.ability.UIAbility' export default class SingleUserModel0600 extends Ability { diff --git a/ability/ability_runtime/actssingleton/SystemSingletonFalse/entry/src/main/ets/SingleUserModel0700/SingleUserModel0700.ts b/ability/ability_runtime/actssingleton/SystemSingletonFalse/entry/src/main/ets/SingleUserModel0700/SingleUserModel0700.ts index 85af6aa0a6c7b3c54ff89fb288efa1f94d182572..d72e5d94c57be74921a4c623f3824153764d774a 100644 --- a/ability/ability_runtime/actssingleton/SystemSingletonFalse/entry/src/main/ets/SingleUserModel0700/SingleUserModel0700.ts +++ b/ability/ability_runtime/actssingleton/SystemSingletonFalse/entry/src/main/ets/SingleUserModel0700/SingleUserModel0700.ts @@ -12,7 +12,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -import Ability from '@ohos.application.Ability' +import Ability from '@ohos.app.ability.UIAbility' export default class SingleUserModel0700 extends Ability { onCreate(want, launchParam) { diff --git a/ability/ability_runtime/actssingleton/SystemSingletonFalse/entry/src/main/ets/SingleUserModel0800/SingleUserModel0800.ts b/ability/ability_runtime/actssingleton/SystemSingletonFalse/entry/src/main/ets/SingleUserModel0800/SingleUserModel0800.ts index 29f84effeec997755754f20b1a52b1afaab191b9..7518a3a9d006dc80777ff6d67c832c0fa0ba3be8 100644 --- a/ability/ability_runtime/actssingleton/SystemSingletonFalse/entry/src/main/ets/SingleUserModel0800/SingleUserModel0800.ts +++ b/ability/ability_runtime/actssingleton/SystemSingletonFalse/entry/src/main/ets/SingleUserModel0800/SingleUserModel0800.ts @@ -12,7 +12,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -import Ability from '@ohos.application.Ability' +import Ability from '@ohos.app.ability.UIAbility' export default class SingleUserModel0800 extends Ability { onCreate(want, launchParam) { diff --git a/ability/ability_runtime/actssingleton/SystemSingletonFalse/entry/src/main/ets/SingleUserModel1300/SingleUserModel1300.ts b/ability/ability_runtime/actssingleton/SystemSingletonFalse/entry/src/main/ets/SingleUserModel1300/SingleUserModel1300.ts index bc2187afc07a75ffce8beb101159767f4e5d7d3d..7ab4b8ea2cf88dd42169b0b9bf4d0c07b7e7ef31 100644 --- a/ability/ability_runtime/actssingleton/SystemSingletonFalse/entry/src/main/ets/SingleUserModel1300/SingleUserModel1300.ts +++ b/ability/ability_runtime/actssingleton/SystemSingletonFalse/entry/src/main/ets/SingleUserModel1300/SingleUserModel1300.ts @@ -12,7 +12,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -import Ability from '@ohos.application.Ability' +import Ability from '@ohos.app.ability.UIAbility' export default class SingleUserModel1300 extends Ability { onCreate(want, launchParam) { diff --git a/ability/ability_runtime/actssingleton/ThirdSingleton/entry/src/main/ets/Application/AbilityStage.ts b/ability/ability_runtime/actssingleton/ThirdSingleton/entry/src/main/ets/Application/AbilityStage.ts index 6ceb0c290ae831a45143a5e2b42d4351f2fc3d7e..3745b4557c4d87274ed1fd9e5efef51b63d4ceca 100644 --- a/ability/ability_runtime/actssingleton/ThirdSingleton/entry/src/main/ets/Application/AbilityStage.ts +++ b/ability/ability_runtime/actssingleton/ThirdSingleton/entry/src/main/ets/Application/AbilityStage.ts @@ -12,7 +12,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -import AbilityStage from "@ohos.application.AbilityStage" +import AbilityStage from "@ohos.app.ability.AbilityStage" export default class MyAbilityStage extends AbilityStage { onCreate() { diff --git a/ability/ability_runtime/actssingleton/ThirdSingleton/entry/src/main/ets/MainAbility/MainAbility.ts b/ability/ability_runtime/actssingleton/ThirdSingleton/entry/src/main/ets/MainAbility/MainAbility.ts index f1204f2430315288162fffa355abf6a46bd152ba..cd7ca616066ea7672997c60892936fa74d443ecb 100644 --- a/ability/ability_runtime/actssingleton/ThirdSingleton/entry/src/main/ets/MainAbility/MainAbility.ts +++ b/ability/ability_runtime/actssingleton/ThirdSingleton/entry/src/main/ets/MainAbility/MainAbility.ts @@ -12,7 +12,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -import Ability from '@ohos.application.Ability' +import Ability from '@ohos.app.ability.UIAbility' import AbilityDelegatorRegistry from '@ohos.application.abilityDelegatorRegistry' import { Hypium } from '@ohos/hypium' import testsuite from '../test/List.test' diff --git a/ability/ability_runtime/actssingleton/ThirdSingleton/entry/src/main/ets/SingleUserModel1900/SingleUserModel1900.ts b/ability/ability_runtime/actssingleton/ThirdSingleton/entry/src/main/ets/SingleUserModel1900/SingleUserModel1900.ts index 5266152f1b3806acf020265c2adfa586e930b1fa..0b1d456938f87995b65f7c6024ead5ae5b3d485e 100644 --- a/ability/ability_runtime/actssingleton/ThirdSingleton/entry/src/main/ets/SingleUserModel1900/SingleUserModel1900.ts +++ b/ability/ability_runtime/actssingleton/ThirdSingleton/entry/src/main/ets/SingleUserModel1900/SingleUserModel1900.ts @@ -12,7 +12,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -import Ability from '@ohos.application.Ability' +import Ability from '@ohos.app.ability.UIAbility' function PublishCallBackOne4() { console.debug("====>Publish CallBack ACTS_StartAbility_1900_CommonEvent====>"); console.debug("====>close this context====>1900====>") diff --git a/ability/ability_runtime/actssingleton/ThirdSingletonFalse/entry/src/main/ets/Application/AbilityStage.ts b/ability/ability_runtime/actssingleton/ThirdSingletonFalse/entry/src/main/ets/Application/AbilityStage.ts index 6ceb0c290ae831a45143a5e2b42d4351f2fc3d7e..3745b4557c4d87274ed1fd9e5efef51b63d4ceca 100644 --- a/ability/ability_runtime/actssingleton/ThirdSingletonFalse/entry/src/main/ets/Application/AbilityStage.ts +++ b/ability/ability_runtime/actssingleton/ThirdSingletonFalse/entry/src/main/ets/Application/AbilityStage.ts @@ -12,7 +12,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -import AbilityStage from "@ohos.application.AbilityStage" +import AbilityStage from "@ohos.app.ability.AbilityStage" export default class MyAbilityStage extends AbilityStage { onCreate() { diff --git a/ability/ability_runtime/actssingleton/ThirdSingletonFalse/entry/src/main/ets/MainAbility/MainAbility.ts b/ability/ability_runtime/actssingleton/ThirdSingletonFalse/entry/src/main/ets/MainAbility/MainAbility.ts index f1204f2430315288162fffa355abf6a46bd152ba..cd7ca616066ea7672997c60892936fa74d443ecb 100644 --- a/ability/ability_runtime/actssingleton/ThirdSingletonFalse/entry/src/main/ets/MainAbility/MainAbility.ts +++ b/ability/ability_runtime/actssingleton/ThirdSingletonFalse/entry/src/main/ets/MainAbility/MainAbility.ts @@ -12,7 +12,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -import Ability from '@ohos.application.Ability' +import Ability from '@ohos.app.ability.UIAbility' import AbilityDelegatorRegistry from '@ohos.application.abilityDelegatorRegistry' import { Hypium } from '@ohos/hypium' import testsuite from '../test/List.test' diff --git a/ability/ability_runtime/actssingleton/ThirdSingletonFalse/entry/src/main/ets/SingleUserModel1000/SingleUserModel1000.ts b/ability/ability_runtime/actssingleton/ThirdSingletonFalse/entry/src/main/ets/SingleUserModel1000/SingleUserModel1000.ts index 08dd1f18f309dfd54a691fe5c477a81a7c7b1b09..af5003ee1bf481dafad1ce9b35252a4402c2d41d 100644 --- a/ability/ability_runtime/actssingleton/ThirdSingletonFalse/entry/src/main/ets/SingleUserModel1000/SingleUserModel1000.ts +++ b/ability/ability_runtime/actssingleton/ThirdSingletonFalse/entry/src/main/ets/SingleUserModel1000/SingleUserModel1000.ts @@ -12,7 +12,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -import Ability from '@ohos.application.Ability' +import Ability from '@ohos.app.ability.UIAbility' export default class SingleUserModel1000 extends Ability { onCreate(want, launchParam) { diff --git a/ability/ability_runtime/actsstartrunnertest/entry/src/main/ets/Application/AbilityStage.ts b/ability/ability_runtime/actsstartrunnertest/entry/src/main/ets/Application/AbilityStage.ts index 32dfe93ccff0375201857794de902cec4d239442..11200f672cfa3a981668dbdee5a700935bf7be99 100644 --- a/ability/ability_runtime/actsstartrunnertest/entry/src/main/ets/Application/AbilityStage.ts +++ b/ability/ability_runtime/actsstartrunnertest/entry/src/main/ets/Application/AbilityStage.ts @@ -1,4 +1,4 @@ -import AbilityStage from "@ohos.application.AbilityStage" +import AbilityStage from "@ohos.app.ability.AbilityStage" export default class MyAbilityStage extends AbilityStage { onCreate() { diff --git a/ability/ability_runtime/actsstartrunnertest/entry/src/main/ets/MainAbility/MainAbility.ts b/ability/ability_runtime/actsstartrunnertest/entry/src/main/ets/MainAbility/MainAbility.ts index b69c8389d42ad2d41a4596b0e93a69522e8d44b6..e24c00d13a209f660744e6f7975e5836858cbffc 100644 --- a/ability/ability_runtime/actsstartrunnertest/entry/src/main/ets/MainAbility/MainAbility.ts +++ b/ability/ability_runtime/actsstartrunnertest/entry/src/main/ets/MainAbility/MainAbility.ts @@ -1,4 +1,4 @@ -import Ability from '@ohos.application.Ability' +import Ability from '@ohos.app.ability.UIAbility' import AbilityDelegatorRegistry from '@ohos.application.abilityDelegatorRegistry' import { Hypium } from '@ohos/hypium' import testsuite from '../test/List.test' diff --git a/ability/ability_runtime/actsstartrunnertest/entry/src/main/ets/MainAbility2/MainAbility2.ts b/ability/ability_runtime/actsstartrunnertest/entry/src/main/ets/MainAbility2/MainAbility2.ts index 2434f4776803d80a31765ad67c2b9d9c9c02fc01..b8b135dd645fb5b0d169d155db453f5d48ad1853 100644 --- a/ability/ability_runtime/actsstartrunnertest/entry/src/main/ets/MainAbility2/MainAbility2.ts +++ b/ability/ability_runtime/actsstartrunnertest/entry/src/main/ets/MainAbility2/MainAbility2.ts @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -import Ability from '@ohos.application.Ability' +import Ability from '@ohos.app.ability.UIAbility' import commonEvent from '@ohos.commonEvent' function PublishCallBackOne() { console.debug("====>Publish CallBack ACTS_Start_CommonEvent====>"); diff --git a/ability/ability_runtime/actsstartrunnertest/entry/src/main/ets/MainAbility3/MainAbility3.ts b/ability/ability_runtime/actsstartrunnertest/entry/src/main/ets/MainAbility3/MainAbility3.ts index 4c810084ac253d09321d799a2d0d961ecdfe3951..d0aaad54fc51e6379bdbd7acf95c81e4a7a06340 100644 --- a/ability/ability_runtime/actsstartrunnertest/entry/src/main/ets/MainAbility3/MainAbility3.ts +++ b/ability/ability_runtime/actsstartrunnertest/entry/src/main/ets/MainAbility3/MainAbility3.ts @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -import Ability from '@ohos.application.Ability' +import Ability from '@ohos.app.ability.UIAbility' import commonEvent from '@ohos.commonEvent' function PublishCallBackOne() { console.debug("====>Publish CallBack ACTS_Start_CommonEvent====>"); diff --git a/ability/ability_runtime/actssupportfunction/actsonandoffscreentest/entry/src/main/ets/Application/MyAbilityStage.ts b/ability/ability_runtime/actssupportfunction/actsonandoffscreentest/entry/src/main/ets/Application/MyAbilityStage.ts index 8d3ffd1340628c7919ecdc7cb5dd81d37c483445..9cd145d84bf3bbb4fc9c08614effcd186565727f 100644 --- a/ability/ability_runtime/actssupportfunction/actsonandoffscreentest/entry/src/main/ets/Application/MyAbilityStage.ts +++ b/ability/ability_runtime/actssupportfunction/actsonandoffscreentest/entry/src/main/ets/Application/MyAbilityStage.ts @@ -12,7 +12,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -import AbilityStage from "@ohos.application.AbilityStage"; +import AbilityStage from "@ohos.app.ability.AbilityStage"; var TAG0 = 'ActsOnAndOffScreenTest:MyAbilityStage:'; export default class MyAbilityStage extends AbilityStage { diff --git a/ability/ability_runtime/actssupportfunction/actsonandoffscreentest/entry/src/main/ets/MainAbility/MainAbility.ts b/ability/ability_runtime/actssupportfunction/actsonandoffscreentest/entry/src/main/ets/MainAbility/MainAbility.ts index 8e765bf1f7f376c6871a5a1a4b0d35164d256de8..b4ea0100a99e90454f04bc690f72781f7ed24a09 100644 --- a/ability/ability_runtime/actssupportfunction/actsonandoffscreentest/entry/src/main/ets/MainAbility/MainAbility.ts +++ b/ability/ability_runtime/actssupportfunction/actsonandoffscreentest/entry/src/main/ets/MainAbility/MainAbility.ts @@ -12,7 +12,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -import Ability from '@ohos.application.Ability'; +import Ability from '@ohos.app.ability.UIAbility'; import AbilityDelegatorRegistry from '@ohos.application.abilityDelegatorRegistry'; import { Hypium } from '@ohos/hypium'; import testsuite from '../test/List.test'; diff --git a/ability/ability_runtime/actssupportfunction/actssupportfunctiontest/entry/src/main/ets/Application/MyAbilityStage.ts b/ability/ability_runtime/actssupportfunction/actssupportfunctiontest/entry/src/main/ets/Application/MyAbilityStage.ts index 7188dd896b5211cf183c36c0928a490e9ff41d2f..f3bd7f55ed02e9306fc9d4a5aa62ec620757d69e 100644 --- a/ability/ability_runtime/actssupportfunction/actssupportfunctiontest/entry/src/main/ets/Application/MyAbilityStage.ts +++ b/ability/ability_runtime/actssupportfunction/actssupportfunctiontest/entry/src/main/ets/Application/MyAbilityStage.ts @@ -12,7 +12,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -import AbilityStage from "@ohos.application.AbilityStage"; +import AbilityStage from "@ohos.app.ability.AbilityStage"; var TAG0 = 'SupportFunction:TestAbilityStage:'; export default class MyAbilityStage extends AbilityStage { diff --git a/ability/ability_runtime/actssupportfunction/actssupportfunctiontest/entry/src/main/ets/MainAbility/MainAbility.ts b/ability/ability_runtime/actssupportfunction/actssupportfunctiontest/entry/src/main/ets/MainAbility/MainAbility.ts index 26302eb5a95b35fe32d81f23dc84317971f5b160..f5d461ac3894b3715e44434e37e85e7d691881ac 100644 --- a/ability/ability_runtime/actssupportfunction/actssupportfunctiontest/entry/src/main/ets/MainAbility/MainAbility.ts +++ b/ability/ability_runtime/actssupportfunction/actssupportfunctiontest/entry/src/main/ets/MainAbility/MainAbility.ts @@ -12,7 +12,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -import Ability from '@ohos.application.Ability'; +import Ability from '@ohos.app.ability.UIAbility'; import AbilityDelegatorRegistry from '@ohos.application.abilityDelegatorRegistry'; import { Hypium } from '@ohos/hypium'; import testsuite from '../test/List.test'; diff --git a/ability/ability_runtime/actssupportfunction/stageonandoffscreen/entry/src/main/ets/Application/MyAbilityStage.ts b/ability/ability_runtime/actssupportfunction/stageonandoffscreen/entry/src/main/ets/Application/MyAbilityStage.ts index 7b26de8acd3a42978865785fcd735eb45e694a65..e93badcaad0df07356b8d9f74d88353d5405ebf7 100644 --- a/ability/ability_runtime/actssupportfunction/stageonandoffscreen/entry/src/main/ets/Application/MyAbilityStage.ts +++ b/ability/ability_runtime/actssupportfunction/stageonandoffscreen/entry/src/main/ets/Application/MyAbilityStage.ts @@ -12,7 +12,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -import AbilityStage from "@ohos.application.AbilityStage"; +import AbilityStage from "@ohos.app.ability.AbilityStage"; var TAG0 = 'StageOnAndOffScreen:AbilityStage:'; export default class MyAbilityStage extends AbilityStage { diff --git a/ability/ability_runtime/actssupportfunction/stageonandoffscreen/entry/src/main/ets/MainAbility/MainAbility.ts b/ability/ability_runtime/actssupportfunction/stageonandoffscreen/entry/src/main/ets/MainAbility/MainAbility.ts index 9b624c7538cc130a0cd2f7bd5a1e58b418bb1236..86ad5daa2f803122d10895487edf963d90c12bb7 100644 --- a/ability/ability_runtime/actssupportfunction/stageonandoffscreen/entry/src/main/ets/MainAbility/MainAbility.ts +++ b/ability/ability_runtime/actssupportfunction/stageonandoffscreen/entry/src/main/ets/MainAbility/MainAbility.ts @@ -12,7 +12,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -import Ability from '@ohos.application.Ability'; +import Ability from '@ohos.app.ability.UIAbility'; import commonEvent from '@ohos.commonEvent'; var TAG1 = 'StageOnAndOffScreen:MainAbility:'; diff --git a/ability/ability_runtime/actssupportfunction/stageonandoffscreen/entry/src/main/ets/MainAbility2/MainAbility2.ts b/ability/ability_runtime/actssupportfunction/stageonandoffscreen/entry/src/main/ets/MainAbility2/MainAbility2.ts index 27cb2995e9936e436ed27c6a0159aeac0138ea78..456aa561b8f02536e2532ebca1ceea12c0bb12cd 100644 --- a/ability/ability_runtime/actssupportfunction/stageonandoffscreen/entry/src/main/ets/MainAbility2/MainAbility2.ts +++ b/ability/ability_runtime/actssupportfunction/stageonandoffscreen/entry/src/main/ets/MainAbility2/MainAbility2.ts @@ -12,7 +12,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -import Ability from '@ohos.application.Ability'; +import Ability from '@ohos.app.ability.UIAbility'; import commonEvent from '@ohos.commonEvent'; var TAG2 = 'StageOnAndOffScreen:MainAbility2:'; diff --git a/ability/ability_runtime/actssupportfunction/stageonandoffscreen/entry/src/main/ets/MainAbility3/MainAbility3.ts b/ability/ability_runtime/actssupportfunction/stageonandoffscreen/entry/src/main/ets/MainAbility3/MainAbility3.ts index ff4a433b66f5f89577d71552b50196329b44aab3..ebfd2b9a65bb036add786114179fae8e09e1ea63 100644 --- a/ability/ability_runtime/actssupportfunction/stageonandoffscreen/entry/src/main/ets/MainAbility3/MainAbility3.ts +++ b/ability/ability_runtime/actssupportfunction/stageonandoffscreen/entry/src/main/ets/MainAbility3/MainAbility3.ts @@ -12,7 +12,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -import Ability from '@ohos.application.Ability'; +import Ability from '@ohos.app.ability.UIAbility'; import commonEvent from '@ohos.commonEvent'; var TAG3 = 'StageOnAndOffScreen:MainAbility3:'; diff --git a/ability/ability_runtime/actssupportfunction/stagesupportfunction/entry/src/main/ets/Application/MyAbilityStage.ts b/ability/ability_runtime/actssupportfunction/stagesupportfunction/entry/src/main/ets/Application/MyAbilityStage.ts index 80c14a76d8ed5ee91e22e943ecb5dcd093e1568a..db24362a5ffdca6cb1e1943275120272d93f7f34 100644 --- a/ability/ability_runtime/actssupportfunction/stagesupportfunction/entry/src/main/ets/Application/MyAbilityStage.ts +++ b/ability/ability_runtime/actssupportfunction/stagesupportfunction/entry/src/main/ets/Application/MyAbilityStage.ts @@ -12,7 +12,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -import AbilityStage from "@ohos.application.AbilityStage"; +import AbilityStage from "@ohos.app.ability.AbilityStage"; var TAG0 = 'StageSupportFunction:AbilityStage:'; export default class MyAbilityStage extends AbilityStage { diff --git a/ability/ability_runtime/actssupportfunction/stagesupportfunction/entry/src/main/ets/MainAbility/MainAbility.ts b/ability/ability_runtime/actssupportfunction/stagesupportfunction/entry/src/main/ets/MainAbility/MainAbility.ts index 92d9a0c821cdc45c60b93a8a23f3ac3e27d2b34f..f5bcdde650bf31716201092fc4070ce7abe2bb28 100644 --- a/ability/ability_runtime/actssupportfunction/stagesupportfunction/entry/src/main/ets/MainAbility/MainAbility.ts +++ b/ability/ability_runtime/actssupportfunction/stagesupportfunction/entry/src/main/ets/MainAbility/MainAbility.ts @@ -12,7 +12,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -import Ability from '@ohos.application.Ability'; +import Ability from '@ohos.app.ability.UIAbility'; import commonEvent from '@ohos.commonEvent'; var TAG1 = 'StageSupportFunction:MainAbility:'; diff --git a/ability/ability_runtime/actsusers/ActsAmsUsersApi7AppA/entry/src/main/ets/AbilityStage.ts b/ability/ability_runtime/actsusers/ActsAmsUsersApi7AppA/entry/src/main/ets/AbilityStage.ts index e2e06d6d3bddbd886d2f6554f50021d73235cfcc..e8b62736850a64b540eb06aaf1865197cd6f9ffa 100644 --- a/ability/ability_runtime/actsusers/ActsAmsUsersApi7AppA/entry/src/main/ets/AbilityStage.ts +++ b/ability/ability_runtime/actsusers/ActsAmsUsersApi7AppA/entry/src/main/ets/AbilityStage.ts @@ -12,7 +12,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -import AbilityStage from "@ohos.application.AbilityStage" +import AbilityStage from "@ohos.app.ability.AbilityStage" export default class MyAbilityStage extends AbilityStage { onCreate() { diff --git a/ability/ability_runtime/actsusers/ActsAmsUsersApi7AppA/entry/src/main/ets/MainAbility/MainAbility.ts b/ability/ability_runtime/actsusers/ActsAmsUsersApi7AppA/entry/src/main/ets/MainAbility/MainAbility.ts index c89305ea6db4b5ac3f7286b9657f6f7ca8074c72..75ea18cfb20523525a1dea622f9174fab81a0ad0 100644 --- a/ability/ability_runtime/actsusers/ActsAmsUsersApi7AppA/entry/src/main/ets/MainAbility/MainAbility.ts +++ b/ability/ability_runtime/actsusers/ActsAmsUsersApi7AppA/entry/src/main/ets/MainAbility/MainAbility.ts @@ -12,7 +12,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -import Ability from '@ohos.application.Ability' +import Ability from '@ohos.app.ability.UIAbility' export default class MainAbility extends Ability { onCreate(want, launchParam) { console.log("jws onCreate"); diff --git a/ability/ability_runtime/actsusers/ActsAmsUsersKillProcessAppA/entry/src/main/ets/Application/AbilityStage.ts b/ability/ability_runtime/actsusers/ActsAmsUsersKillProcessAppA/entry/src/main/ets/Application/AbilityStage.ts index 98eb012db14b28a1f92522e305b9d4538e496dd3..a41751fb10f96d4103d1120e59c5c5f5aa089e72 100644 --- a/ability/ability_runtime/actsusers/ActsAmsUsersKillProcessAppA/entry/src/main/ets/Application/AbilityStage.ts +++ b/ability/ability_runtime/actsusers/ActsAmsUsersKillProcessAppA/entry/src/main/ets/Application/AbilityStage.ts @@ -12,7 +12,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -import AbilityStage from "@ohos.application.AbilityStage" +import AbilityStage from "@ohos.app.ability.AbilityStage" export default class MyAbilityStage extends AbilityStage { onCreate() { diff --git a/ability/ability_runtime/actsusers/ActsAmsUsersKillProcessAppA/entry/src/main/ets/MainAbility/MainAbility.ts b/ability/ability_runtime/actsusers/ActsAmsUsersKillProcessAppA/entry/src/main/ets/MainAbility/MainAbility.ts index c4fe28ae15919af11a26f4f09be7f7de506a96f5..31797767189d09cad9e69c66b268a7c74c856fa4 100644 --- a/ability/ability_runtime/actsusers/ActsAmsUsersKillProcessAppA/entry/src/main/ets/MainAbility/MainAbility.ts +++ b/ability/ability_runtime/actsusers/ActsAmsUsersKillProcessAppA/entry/src/main/ets/MainAbility/MainAbility.ts @@ -12,7 +12,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -import Ability from '@ohos.application.Ability' +import Ability from '@ohos.app.ability.UIAbility' import commonEvent from '@ohos.commonEvent' function PublishCallBackOne() { console.debug("====>Publish CallBack ACTS_KillProcess====>"); diff --git a/ability/ability_runtime/actsusers/ActsAmsUsersKillProcessAppB/entry/src/main/ets/Application/AbilityStage.ts b/ability/ability_runtime/actsusers/ActsAmsUsersKillProcessAppB/entry/src/main/ets/Application/AbilityStage.ts index 98eb012db14b28a1f92522e305b9d4538e496dd3..a41751fb10f96d4103d1120e59c5c5f5aa089e72 100644 --- a/ability/ability_runtime/actsusers/ActsAmsUsersKillProcessAppB/entry/src/main/ets/Application/AbilityStage.ts +++ b/ability/ability_runtime/actsusers/ActsAmsUsersKillProcessAppB/entry/src/main/ets/Application/AbilityStage.ts @@ -12,7 +12,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -import AbilityStage from "@ohos.application.AbilityStage" +import AbilityStage from "@ohos.app.ability.AbilityStage" export default class MyAbilityStage extends AbilityStage { onCreate() { diff --git a/ability/ability_runtime/actsusers/ActsAmsUsersKillProcessAppB/entry/src/main/ets/MainAbility/MainAbility.ts b/ability/ability_runtime/actsusers/ActsAmsUsersKillProcessAppB/entry/src/main/ets/MainAbility/MainAbility.ts index c3d2af559bce9a478ec2ce68a7377a28907910e1..600828f3af487103afc358971130b57c787e013e 100644 --- a/ability/ability_runtime/actsusers/ActsAmsUsersKillProcessAppB/entry/src/main/ets/MainAbility/MainAbility.ts +++ b/ability/ability_runtime/actsusers/ActsAmsUsersKillProcessAppB/entry/src/main/ets/MainAbility/MainAbility.ts @@ -12,7 +12,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -import Ability from '@ohos.application.Ability' +import Ability from '@ohos.app.ability.UIAbility' import appManager from '@ohos.application.appManager' export default class MainAbility extends Ability { diff --git a/ability/ability_runtime/actsusers/ActsAmsUsersKillProcessAppC/entry/src/main/ets/Application/AbilityStage.ts b/ability/ability_runtime/actsusers/ActsAmsUsersKillProcessAppC/entry/src/main/ets/Application/AbilityStage.ts index 98eb012db14b28a1f92522e305b9d4538e496dd3..a41751fb10f96d4103d1120e59c5c5f5aa089e72 100644 --- a/ability/ability_runtime/actsusers/ActsAmsUsersKillProcessAppC/entry/src/main/ets/Application/AbilityStage.ts +++ b/ability/ability_runtime/actsusers/ActsAmsUsersKillProcessAppC/entry/src/main/ets/Application/AbilityStage.ts @@ -12,7 +12,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -import AbilityStage from "@ohos.application.AbilityStage" +import AbilityStage from "@ohos.app.ability.AbilityStage" export default class MyAbilityStage extends AbilityStage { onCreate() { diff --git a/ability/ability_runtime/actsusers/ActsAmsUsersKillProcessAppC/entry/src/main/ets/MainAbility/MainAbility.ts b/ability/ability_runtime/actsusers/ActsAmsUsersKillProcessAppC/entry/src/main/ets/MainAbility/MainAbility.ts index 3eaadf9ce0fde2bfcb4820b84904bcb42c190c2b..6f077e45248eb9c9295936bc607a0c1c97daf968 100644 --- a/ability/ability_runtime/actsusers/ActsAmsUsersKillProcessAppC/entry/src/main/ets/MainAbility/MainAbility.ts +++ b/ability/ability_runtime/actsusers/ActsAmsUsersKillProcessAppC/entry/src/main/ets/MainAbility/MainAbility.ts @@ -12,7 +12,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -import Ability from '@ohos.application.Ability' +import Ability from '@ohos.app.ability.UIAbility' import appManager from '@ohos.application.appManager' export default class MainAbility extends Ability { diff --git a/ability/ability_runtime/actsusers/ActsAmsUsersSystemTest/entry/src/main/ets/Application/AbilityStage.ts b/ability/ability_runtime/actsusers/ActsAmsUsersSystemTest/entry/src/main/ets/Application/AbilityStage.ts index 5e2915fe4fc033cd5c9bd579dc08fe7369e51016..953114c1b479f368cb6c6bd456f0a171a358d148 100644 --- a/ability/ability_runtime/actsusers/ActsAmsUsersSystemTest/entry/src/main/ets/Application/AbilityStage.ts +++ b/ability/ability_runtime/actsusers/ActsAmsUsersSystemTest/entry/src/main/ets/Application/AbilityStage.ts @@ -12,7 +12,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -import AbilityStage from "@ohos.application.AbilityStage" +import AbilityStage from "@ohos.app.ability.AbilityStage" export default class MyAbilityStage extends AbilityStage { onCreate() { diff --git a/ability/ability_runtime/actsusers/ActsAmsUsersSystemTest/entry/src/main/ets/MainAbility/MainAbility.ts b/ability/ability_runtime/actsusers/ActsAmsUsersSystemTest/entry/src/main/ets/MainAbility/MainAbility.ts index 5d9cb94eb1b16f32da7f1ba0b9896c87323bca11..5e7a70c5802092a0c8805701650591856fe93ad4 100644 --- a/ability/ability_runtime/actsusers/ActsAmsUsersSystemTest/entry/src/main/ets/MainAbility/MainAbility.ts +++ b/ability/ability_runtime/actsusers/ActsAmsUsersSystemTest/entry/src/main/ets/MainAbility/MainAbility.ts @@ -12,7 +12,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -import Ability from '@ohos.application.Ability' +import Ability from '@ohos.app.ability.UIAbility' export default class MainAbility extends Ability { onCreate(want,launchParam){ diff --git a/ability/ability_runtime/actsusers/ActsAmsUsersSystemTest/entry/src/main/ets/MainAbility2/MainAbility2.ts b/ability/ability_runtime/actsusers/ActsAmsUsersSystemTest/entry/src/main/ets/MainAbility2/MainAbility2.ts index 819778e4a382140881d768693896cdd98f927b70..f9adf1ea43a6a401dedd9ea248e4df0f342e8acf 100644 --- a/ability/ability_runtime/actsusers/ActsAmsUsersSystemTest/entry/src/main/ets/MainAbility2/MainAbility2.ts +++ b/ability/ability_runtime/actsusers/ActsAmsUsersSystemTest/entry/src/main/ets/MainAbility2/MainAbility2.ts @@ -12,7 +12,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -import Ability from '@ohos.application.Ability' +import Ability from '@ohos.app.ability.UIAbility' import commonEvent from '@ohos.commonEvent' function PublishCallBackOne() { console.debug("====>Publish CallBack ACTS_StartAbility_0100_CommonEvent====>"); diff --git a/ability/ability_runtime/actsusers/ActsAmsUsersSystemTest/entry/src/main/ets/MainAbility3/MainAbility3.ts b/ability/ability_runtime/actsusers/ActsAmsUsersSystemTest/entry/src/main/ets/MainAbility3/MainAbility3.ts index 7d1f0f3d280bcb813d90bbe85a15a06296cd54e3..68e8d62a8101e6af98f88e0acc8c840f99ab82f9 100644 --- a/ability/ability_runtime/actsusers/ActsAmsUsersSystemTest/entry/src/main/ets/MainAbility3/MainAbility3.ts +++ b/ability/ability_runtime/actsusers/ActsAmsUsersSystemTest/entry/src/main/ets/MainAbility3/MainAbility3.ts @@ -12,7 +12,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -import Ability from '@ohos.application.Ability' +import Ability from '@ohos.app.ability.UIAbility' export default class MainAbility3 extends Ability { onCreate(want,launchParam){ diff --git a/ability/ability_runtime/actsusers/ActsAmsUsersThirdTest/entry/src/main/ets/Application/AbilityStage.ts b/ability/ability_runtime/actsusers/ActsAmsUsersThirdTest/entry/src/main/ets/Application/AbilityStage.ts index 5e2915fe4fc033cd5c9bd579dc08fe7369e51016..953114c1b479f368cb6c6bd456f0a171a358d148 100644 --- a/ability/ability_runtime/actsusers/ActsAmsUsersThirdTest/entry/src/main/ets/Application/AbilityStage.ts +++ b/ability/ability_runtime/actsusers/ActsAmsUsersThirdTest/entry/src/main/ets/Application/AbilityStage.ts @@ -12,7 +12,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -import AbilityStage from "@ohos.application.AbilityStage" +import AbilityStage from "@ohos.app.ability.AbilityStage" export default class MyAbilityStage extends AbilityStage { onCreate() { diff --git a/ability/ability_runtime/actsusers/ActsAmsUsersThirdTest/entry/src/main/ets/MainAbility/MainAbility.ts b/ability/ability_runtime/actsusers/ActsAmsUsersThirdTest/entry/src/main/ets/MainAbility/MainAbility.ts index 28be9d6cdefeae6069de5011f9546b61c54d2345..78ccdb3df25ccfced2e998379f57d3d2a203630a 100644 --- a/ability/ability_runtime/actsusers/ActsAmsUsersThirdTest/entry/src/main/ets/MainAbility/MainAbility.ts +++ b/ability/ability_runtime/actsusers/ActsAmsUsersThirdTest/entry/src/main/ets/MainAbility/MainAbility.ts @@ -12,7 +12,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -import Ability from '@ohos.application.Ability' +import Ability from '@ohos.app.ability.UIAbility' export default class MainAbility extends Ability { diff --git a/ability/ability_runtime/actsusers/ActsAmsUsersThirdTest/entry/src/main/ets/MainAbility2/MainAbility2.ts b/ability/ability_runtime/actsusers/ActsAmsUsersThirdTest/entry/src/main/ets/MainAbility2/MainAbility2.ts index e66016096d8bbe4076a7e40687131f6a632488f0..690f0fbff41e61d35de82461ef655b3437caf759 100644 --- a/ability/ability_runtime/actsusers/ActsAmsUsersThirdTest/entry/src/main/ets/MainAbility2/MainAbility2.ts +++ b/ability/ability_runtime/actsusers/ActsAmsUsersThirdTest/entry/src/main/ets/MainAbility2/MainAbility2.ts @@ -12,7 +12,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -import Ability from '@ohos.application.Ability' +import Ability from '@ohos.app.ability.UIAbility' import commonEvent from '@ohos.commonEvent' function PublishCallBackOne() { console.debug("====>Publish CallBack ACTS_StartAbility_0100_CommonEvent====>"); diff --git a/ability/ability_runtime/actsusers/ActsAmsUsersThirdTest/entry/src/main/ets/MainAbility3/MainAbility3.ts b/ability/ability_runtime/actsusers/ActsAmsUsersThirdTest/entry/src/main/ets/MainAbility3/MainAbility3.ts index be068fab943bd52efa843617c4bfa71283d0a012..7aa859733a6f261d4e16a2ddda4eb4c1ea3c3c90 100644 --- a/ability/ability_runtime/actsusers/ActsAmsUsersThirdTest/entry/src/main/ets/MainAbility3/MainAbility3.ts +++ b/ability/ability_runtime/actsusers/ActsAmsUsersThirdTest/entry/src/main/ets/MainAbility3/MainAbility3.ts @@ -12,7 +12,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -import Ability from '@ohos.application.Ability' +import Ability from '@ohos.app.ability.UIAbility' export default class MainAbility extends Ability { diff --git a/ability/ability_runtime/actsusers/ActsAmsUsersThirdTest/entry/src/main/ets/TestAbility/TestAbility.ts b/ability/ability_runtime/actsusers/ActsAmsUsersThirdTest/entry/src/main/ets/TestAbility/TestAbility.ts index e9f9aadff45f162df116bfe3a90661ea6ab331dc..4f101c99c1576a3b8a17594f6feaaf063a917b5f 100644 --- a/ability/ability_runtime/actsusers/ActsAmsUsersThirdTest/entry/src/main/ets/TestAbility/TestAbility.ts +++ b/ability/ability_runtime/actsusers/ActsAmsUsersThirdTest/entry/src/main/ets/TestAbility/TestAbility.ts @@ -13,7 +13,7 @@ * limitations under the License. */ -import Ability from '@ohos.application.Ability' +import Ability from '@ohos.app.ability.UIAbility' export default class TestAbility extends Ability { onCreate(want, launchParam) { diff --git a/ability/ability_runtime/amscontextualinforquery/actsamsstaticabilitystagecontexttest/entry/src/main/ets/Application/AbilityStage.ts b/ability/ability_runtime/amscontextualinforquery/actsamsstaticabilitystagecontexttest/entry/src/main/ets/Application/AbilityStage.ts index cdc3a115e142a58f8b541720bd9d04f27d0c9445..958e157b6b1e69a8a166f5dfad26aeb05bc158d3 100644 --- a/ability/ability_runtime/amscontextualinforquery/actsamsstaticabilitystagecontexttest/entry/src/main/ets/Application/AbilityStage.ts +++ b/ability/ability_runtime/amscontextualinforquery/actsamsstaticabilitystagecontexttest/entry/src/main/ets/Application/AbilityStage.ts @@ -12,7 +12,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -import AbilityStage from "@ohos.application.AbilityStage" +import AbilityStage from "@ohos.app.ability.AbilityStage" export default class MyAbilityStage extends AbilityStage { onCreate() { diff --git a/ability/ability_runtime/amscontextualinforquery/actsamsstaticabilitystagecontexttest/entry/src/main/ets/MainAbility/MainAbility.ts b/ability/ability_runtime/amscontextualinforquery/actsamsstaticabilitystagecontexttest/entry/src/main/ets/MainAbility/MainAbility.ts index 5d9cb94eb1b16f32da7f1ba0b9896c87323bca11..5e7a70c5802092a0c8805701650591856fe93ad4 100644 --- a/ability/ability_runtime/amscontextualinforquery/actsamsstaticabilitystagecontexttest/entry/src/main/ets/MainAbility/MainAbility.ts +++ b/ability/ability_runtime/amscontextualinforquery/actsamsstaticabilitystagecontexttest/entry/src/main/ets/MainAbility/MainAbility.ts @@ -12,7 +12,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -import Ability from '@ohos.application.Ability' +import Ability from '@ohos.app.ability.UIAbility' export default class MainAbility extends Ability { onCreate(want,launchParam){ diff --git a/ability/ability_runtime/amscontextualinforquery/actsamsstaticabilitystagecontexttest/entry/src/main/ets/TestAbility/TestAbility.ts b/ability/ability_runtime/amscontextualinforquery/actsamsstaticabilitystagecontexttest/entry/src/main/ets/TestAbility/TestAbility.ts index 89a84730505783ba229175ab4b55d37f91a16266..8028a70f8af44690b95a08bd177bca6b09f24687 100644 --- a/ability/ability_runtime/amscontextualinforquery/actsamsstaticabilitystagecontexttest/entry/src/main/ets/TestAbility/TestAbility.ts +++ b/ability/ability_runtime/amscontextualinforquery/actsamsstaticabilitystagecontexttest/entry/src/main/ets/TestAbility/TestAbility.ts @@ -12,7 +12,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -import Ability from '@ohos.application.Ability' +import Ability from '@ohos.app.ability.UIAbility' export default class TestAbility extends Ability { onCreate(want, launchParam) { diff --git a/ability/ability_runtime/amscontextualinforquery/actsamsstatichapa/entry/src/main/ets/Application/AbilityStage.ts b/ability/ability_runtime/amscontextualinforquery/actsamsstatichapa/entry/src/main/ets/Application/AbilityStage.ts index 98eb012db14b28a1f92522e305b9d4538e496dd3..a41751fb10f96d4103d1120e59c5c5f5aa089e72 100644 --- a/ability/ability_runtime/amscontextualinforquery/actsamsstatichapa/entry/src/main/ets/Application/AbilityStage.ts +++ b/ability/ability_runtime/amscontextualinforquery/actsamsstatichapa/entry/src/main/ets/Application/AbilityStage.ts @@ -12,7 +12,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -import AbilityStage from "@ohos.application.AbilityStage" +import AbilityStage from "@ohos.app.ability.AbilityStage" export default class MyAbilityStage extends AbilityStage { onCreate() { diff --git a/ability/ability_runtime/amscontextualinforquery/actsamsstatichapa/entry/src/main/ets/MainAbility/MainAbility.ts b/ability/ability_runtime/amscontextualinforquery/actsamsstatichapa/entry/src/main/ets/MainAbility/MainAbility.ts index bb674485fe00d57cf189c7d664daebe5f869ba43..53a58cda859a860c09acbf6df8202fea84709979 100644 --- a/ability/ability_runtime/amscontextualinforquery/actsamsstatichapa/entry/src/main/ets/MainAbility/MainAbility.ts +++ b/ability/ability_runtime/amscontextualinforquery/actsamsstatichapa/entry/src/main/ets/MainAbility/MainAbility.ts @@ -12,7 +12,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -import Ability from '@ohos.application.Ability' +import Ability from '@ohos.app.ability.UIAbility' import commonEvent from '@ohos.commonEvent' export default class MainAbility extends Ability { diff --git a/ability/ability_runtime/amscontextualinforquery/actsamsstatichapb/entry/src/main/ets/Application/AbilityStage.ts b/ability/ability_runtime/amscontextualinforquery/actsamsstatichapb/entry/src/main/ets/Application/AbilityStage.ts index 98eb012db14b28a1f92522e305b9d4538e496dd3..a41751fb10f96d4103d1120e59c5c5f5aa089e72 100644 --- a/ability/ability_runtime/amscontextualinforquery/actsamsstatichapb/entry/src/main/ets/Application/AbilityStage.ts +++ b/ability/ability_runtime/amscontextualinforquery/actsamsstatichapb/entry/src/main/ets/Application/AbilityStage.ts @@ -12,7 +12,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -import AbilityStage from "@ohos.application.AbilityStage" +import AbilityStage from "@ohos.app.ability.AbilityStage" export default class MyAbilityStage extends AbilityStage { onCreate() { diff --git a/ability/ability_runtime/amscontextualinforquery/actsamsstatichapb/entry/src/main/ets/MainAbility/MainAbility.ts b/ability/ability_runtime/amscontextualinforquery/actsamsstatichapb/entry/src/main/ets/MainAbility/MainAbility.ts index 24d748e5f55a67d150224d910114cba48e929814..9830a346a1f1888057820fc9eb81f44dc440e65e 100644 --- a/ability/ability_runtime/amscontextualinforquery/actsamsstatichapb/entry/src/main/ets/MainAbility/MainAbility.ts +++ b/ability/ability_runtime/amscontextualinforquery/actsamsstatichapb/entry/src/main/ets/MainAbility/MainAbility.ts @@ -12,7 +12,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -import Ability from '@ohos.application.Ability' +import Ability from '@ohos.app.ability.UIAbility' import commonEvent from '@ohos.commonEvent' export default class MainAbility extends Ability { diff --git a/ability/ability_runtime/amscontextualinforquery/actsamsstaticinfomationquerytest/entry/src/main/ets/Application/AbilityStage.ts b/ability/ability_runtime/amscontextualinforquery/actsamsstaticinfomationquerytest/entry/src/main/ets/Application/AbilityStage.ts index 5e2915fe4fc033cd5c9bd579dc08fe7369e51016..953114c1b479f368cb6c6bd456f0a171a358d148 100644 --- a/ability/ability_runtime/amscontextualinforquery/actsamsstaticinfomationquerytest/entry/src/main/ets/Application/AbilityStage.ts +++ b/ability/ability_runtime/amscontextualinforquery/actsamsstaticinfomationquerytest/entry/src/main/ets/Application/AbilityStage.ts @@ -12,7 +12,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -import AbilityStage from "@ohos.application.AbilityStage" +import AbilityStage from "@ohos.app.ability.AbilityStage" export default class MyAbilityStage extends AbilityStage { onCreate() { diff --git a/ability/ability_runtime/amscontextualinforquery/actsamsstaticinfomationquerytest/entry/src/main/ets/MainAbility/MainAbility.ts b/ability/ability_runtime/amscontextualinforquery/actsamsstaticinfomationquerytest/entry/src/main/ets/MainAbility/MainAbility.ts index 5d9cb94eb1b16f32da7f1ba0b9896c87323bca11..5e7a70c5802092a0c8805701650591856fe93ad4 100644 --- a/ability/ability_runtime/amscontextualinforquery/actsamsstaticinfomationquerytest/entry/src/main/ets/MainAbility/MainAbility.ts +++ b/ability/ability_runtime/amscontextualinforquery/actsamsstaticinfomationquerytest/entry/src/main/ets/MainAbility/MainAbility.ts @@ -12,7 +12,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -import Ability from '@ohos.application.Ability' +import Ability from '@ohos.app.ability.UIAbility' export default class MainAbility extends Ability { onCreate(want,launchParam){ diff --git a/ability/ability_runtime/amscontextualinforquery/actsamsstaticinfomationquerytest/entry/src/main/ets/TestAbility/TestAbility.ts b/ability/ability_runtime/amscontextualinforquery/actsamsstaticinfomationquerytest/entry/src/main/ets/TestAbility/TestAbility.ts index 89a84730505783ba229175ab4b55d37f91a16266..8028a70f8af44690b95a08bd177bca6b09f24687 100644 --- a/ability/ability_runtime/amscontextualinforquery/actsamsstaticinfomationquerytest/entry/src/main/ets/TestAbility/TestAbility.ts +++ b/ability/ability_runtime/amscontextualinforquery/actsamsstaticinfomationquerytest/entry/src/main/ets/TestAbility/TestAbility.ts @@ -12,7 +12,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -import Ability from '@ohos.application.Ability' +import Ability from '@ohos.app.ability.UIAbility' export default class TestAbility extends Ability { onCreate(want, launchParam) { diff --git a/ability/ability_runtime/amscontextualinforquery/actsamsstaticinformationmultipletest/entry/src/main/ets/Application/AbilityStage.ts b/ability/ability_runtime/amscontextualinforquery/actsamsstaticinformationmultipletest/entry/src/main/ets/Application/AbilityStage.ts index 5e2915fe4fc033cd5c9bd579dc08fe7369e51016..953114c1b479f368cb6c6bd456f0a171a358d148 100644 --- a/ability/ability_runtime/amscontextualinforquery/actsamsstaticinformationmultipletest/entry/src/main/ets/Application/AbilityStage.ts +++ b/ability/ability_runtime/amscontextualinforquery/actsamsstaticinformationmultipletest/entry/src/main/ets/Application/AbilityStage.ts @@ -12,7 +12,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -import AbilityStage from "@ohos.application.AbilityStage" +import AbilityStage from "@ohos.app.ability.AbilityStage" export default class MyAbilityStage extends AbilityStage { onCreate() { diff --git a/ability/ability_runtime/amscontextualinforquery/actsamsstaticinformationmultipletest/entry/src/main/ets/MainAbility/MainAbility.ts b/ability/ability_runtime/amscontextualinforquery/actsamsstaticinformationmultipletest/entry/src/main/ets/MainAbility/MainAbility.ts index 5d9cb94eb1b16f32da7f1ba0b9896c87323bca11..5e7a70c5802092a0c8805701650591856fe93ad4 100644 --- a/ability/ability_runtime/amscontextualinforquery/actsamsstaticinformationmultipletest/entry/src/main/ets/MainAbility/MainAbility.ts +++ b/ability/ability_runtime/amscontextualinforquery/actsamsstaticinformationmultipletest/entry/src/main/ets/MainAbility/MainAbility.ts @@ -12,7 +12,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -import Ability from '@ohos.application.Ability' +import Ability from '@ohos.app.ability.UIAbility' export default class MainAbility extends Ability { onCreate(want,launchParam){ diff --git a/ability/ability_runtime/amscontextualinforquery/actsamsstaticinformationmultipletest/entry/src/main/ets/TestAbility/TestAbility.ts b/ability/ability_runtime/amscontextualinforquery/actsamsstaticinformationmultipletest/entry/src/main/ets/TestAbility/TestAbility.ts index 89a84730505783ba229175ab4b55d37f91a16266..8028a70f8af44690b95a08bd177bca6b09f24687 100644 --- a/ability/ability_runtime/amscontextualinforquery/actsamsstaticinformationmultipletest/entry/src/main/ets/TestAbility/TestAbility.ts +++ b/ability/ability_runtime/amscontextualinforquery/actsamsstaticinformationmultipletest/entry/src/main/ets/TestAbility/TestAbility.ts @@ -12,7 +12,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -import Ability from '@ohos.application.Ability' +import Ability from '@ohos.app.ability.UIAbility' export default class TestAbility extends Ability { onCreate(want, launchParam) { diff --git a/ability/ability_runtime/amscontextualinforquery/actsamsstaticinformationmultitest/entry/src/main/ets/Application/AbilityStage.ts b/ability/ability_runtime/amscontextualinforquery/actsamsstaticinformationmultitest/entry/src/main/ets/Application/AbilityStage.ts index 5e2915fe4fc033cd5c9bd579dc08fe7369e51016..953114c1b479f368cb6c6bd456f0a171a358d148 100644 --- a/ability/ability_runtime/amscontextualinforquery/actsamsstaticinformationmultitest/entry/src/main/ets/Application/AbilityStage.ts +++ b/ability/ability_runtime/amscontextualinforquery/actsamsstaticinformationmultitest/entry/src/main/ets/Application/AbilityStage.ts @@ -12,7 +12,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -import AbilityStage from "@ohos.application.AbilityStage" +import AbilityStage from "@ohos.app.ability.AbilityStage" export default class MyAbilityStage extends AbilityStage { onCreate() { diff --git a/ability/ability_runtime/amscontextualinforquery/actsamsstaticinformationmultitest/entry/src/main/ets/MainAbility/MainAbility.ts b/ability/ability_runtime/amscontextualinforquery/actsamsstaticinformationmultitest/entry/src/main/ets/MainAbility/MainAbility.ts index 5d9cb94eb1b16f32da7f1ba0b9896c87323bca11..5e7a70c5802092a0c8805701650591856fe93ad4 100644 --- a/ability/ability_runtime/amscontextualinforquery/actsamsstaticinformationmultitest/entry/src/main/ets/MainAbility/MainAbility.ts +++ b/ability/ability_runtime/amscontextualinforquery/actsamsstaticinformationmultitest/entry/src/main/ets/MainAbility/MainAbility.ts @@ -12,7 +12,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -import Ability from '@ohos.application.Ability' +import Ability from '@ohos.app.ability.UIAbility' export default class MainAbility extends Ability { onCreate(want,launchParam){ diff --git a/ability/ability_runtime/amscontextualinforquery/actsamsstaticinformationmultitest/entry/src/main/ets/TestAbility/TestAbility.ts b/ability/ability_runtime/amscontextualinforquery/actsamsstaticinformationmultitest/entry/src/main/ets/TestAbility/TestAbility.ts index 89a84730505783ba229175ab4b55d37f91a16266..8028a70f8af44690b95a08bd177bca6b09f24687 100644 --- a/ability/ability_runtime/amscontextualinforquery/actsamsstaticinformationmultitest/entry/src/main/ets/TestAbility/TestAbility.ts +++ b/ability/ability_runtime/amscontextualinforquery/actsamsstaticinformationmultitest/entry/src/main/ets/TestAbility/TestAbility.ts @@ -12,7 +12,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -import Ability from '@ohos.application.Ability' +import Ability from '@ohos.app.ability.UIAbility' export default class TestAbility extends Ability { onCreate(want, launchParam) { diff --git a/ability/ability_runtime/amscontextualinforquery/actsamsstaticquerytesttwohap/entry/src/main/ets/Application/AbilityStage.ts b/ability/ability_runtime/amscontextualinforquery/actsamsstaticquerytesttwohap/entry/src/main/ets/Application/AbilityStage.ts index 5c09242f70e8d039556e2f3c1ac637d8e50193f0..5fbeb922f8d3862a1f10df638d83eb58d7592177 100644 --- a/ability/ability_runtime/amscontextualinforquery/actsamsstaticquerytesttwohap/entry/src/main/ets/Application/AbilityStage.ts +++ b/ability/ability_runtime/amscontextualinforquery/actsamsstaticquerytesttwohap/entry/src/main/ets/Application/AbilityStage.ts @@ -13,7 +13,7 @@ * limitations under the License. */ -import AbilityStage from "@ohos.application.AbilityStage" +import AbilityStage from "@ohos.app.ability.AbilityStage" export default class MyAbilityStage extends AbilityStage { onCreate() { diff --git a/ability/ability_runtime/amscontextualinforquery/actsamsstaticquerytesttwohap/entry/src/main/ets/MainAbility/MainAbility.ts b/ability/ability_runtime/amscontextualinforquery/actsamsstaticquerytesttwohap/entry/src/main/ets/MainAbility/MainAbility.ts index 054401cd37a2538383d834ce53f5a6e6c26986d7..243e393b9badad912b99fc0e9578033f158a5cf9 100644 --- a/ability/ability_runtime/amscontextualinforquery/actsamsstaticquerytesttwohap/entry/src/main/ets/MainAbility/MainAbility.ts +++ b/ability/ability_runtime/amscontextualinforquery/actsamsstaticquerytesttwohap/entry/src/main/ets/MainAbility/MainAbility.ts @@ -13,7 +13,7 @@ * limitations under the License. */ -import Ability from '@ohos.application.Ability' +import Ability from '@ohos.app.ability.UIAbility' import commonEvent from '@ohos.commonEvent' export default class MainAbility extends Ability { diff --git a/ability/ability_runtime/amscontextualinforquery/actsamsstaticquerytesttwohap/entry/src/main/ets/SecondMainAbility/SecondMainAbility.ts b/ability/ability_runtime/amscontextualinforquery/actsamsstaticquerytesttwohap/entry/src/main/ets/SecondMainAbility/SecondMainAbility.ts index 2c0c39850097e77b6eddef894b87a4dcc935a91f..8e8bf60249bf380c6dad0e54544f3231e6219162 100644 --- a/ability/ability_runtime/amscontextualinforquery/actsamsstaticquerytesttwohap/entry/src/main/ets/SecondMainAbility/SecondMainAbility.ts +++ b/ability/ability_runtime/amscontextualinforquery/actsamsstaticquerytesttwohap/entry/src/main/ets/SecondMainAbility/SecondMainAbility.ts @@ -13,7 +13,7 @@ * limitations under the License. */ -import Ability from '@ohos.application.Ability' +import Ability from '@ohos.app.ability.UIAbility' import commonEvent from '@ohos.commonEvent' export default class SecondAbility extends Ability { diff --git a/ability/ability_runtime/amsdisplayIdtest/actsamsspecifytesthap/entry/src/main/ets/Application/AbilityStage.ts b/ability/ability_runtime/amsdisplayIdtest/actsamsspecifytesthap/entry/src/main/ets/Application/AbilityStage.ts index 98eb012db14b28a1f92522e305b9d4538e496dd3..a41751fb10f96d4103d1120e59c5c5f5aa089e72 100644 --- a/ability/ability_runtime/amsdisplayIdtest/actsamsspecifytesthap/entry/src/main/ets/Application/AbilityStage.ts +++ b/ability/ability_runtime/amsdisplayIdtest/actsamsspecifytesthap/entry/src/main/ets/Application/AbilityStage.ts @@ -12,7 +12,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -import AbilityStage from "@ohos.application.AbilityStage" +import AbilityStage from "@ohos.app.ability.AbilityStage" export default class MyAbilityStage extends AbilityStage { onCreate() { diff --git a/ability/ability_runtime/amsdisplayIdtest/actsamsspecifytesthap/entry/src/main/ets/MainAbility/MainAbility.ts b/ability/ability_runtime/amsdisplayIdtest/actsamsspecifytesthap/entry/src/main/ets/MainAbility/MainAbility.ts index b989a745e625abd167133072efe3efdaaca18718..eb7d1deec63923fa5449ab4fc923aff1d6e31186 100644 --- a/ability/ability_runtime/amsdisplayIdtest/actsamsspecifytesthap/entry/src/main/ets/MainAbility/MainAbility.ts +++ b/ability/ability_runtime/amsdisplayIdtest/actsamsspecifytesthap/entry/src/main/ets/MainAbility/MainAbility.ts @@ -12,7 +12,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -import Ability from '@ohos.application.Ability' +import Ability from '@ohos.app.ability.UIAbility' import commonEvent from '@ohos.commonEvent' var callBackSeq = ""; diff --git a/ability/ability_runtime/amsdisplayIdtest/actsamsstartabilityforresulttest/entry/src/main/ets/Application/AbilityStage.ts b/ability/ability_runtime/amsdisplayIdtest/actsamsstartabilityforresulttest/entry/src/main/ets/Application/AbilityStage.ts index 4ca5011008cfcf3af89fe1b915a9a284832631bd..a49c97fed57974cc0fde995d55636e4170da0794 100644 --- a/ability/ability_runtime/amsdisplayIdtest/actsamsstartabilityforresulttest/entry/src/main/ets/Application/AbilityStage.ts +++ b/ability/ability_runtime/amsdisplayIdtest/actsamsstartabilityforresulttest/entry/src/main/ets/Application/AbilityStage.ts @@ -12,7 +12,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -import AbilityStage from "@ohos.application.AbilityStage" +import AbilityStage from "@ohos.app.ability.AbilityStage" export default class MyAbilityStage extends AbilityStage { onCreate() { diff --git a/ability/ability_runtime/amsdisplayIdtest/actsamsstartabilityforresulttest/entry/src/main/ets/MainAbility/MainAbility.ts b/ability/ability_runtime/amsdisplayIdtest/actsamsstartabilityforresulttest/entry/src/main/ets/MainAbility/MainAbility.ts index 5d9cb94eb1b16f32da7f1ba0b9896c87323bca11..5e7a70c5802092a0c8805701650591856fe93ad4 100644 --- a/ability/ability_runtime/amsdisplayIdtest/actsamsstartabilityforresulttest/entry/src/main/ets/MainAbility/MainAbility.ts +++ b/ability/ability_runtime/amsdisplayIdtest/actsamsstartabilityforresulttest/entry/src/main/ets/MainAbility/MainAbility.ts @@ -12,7 +12,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -import Ability from '@ohos.application.Ability' +import Ability from '@ohos.app.ability.UIAbility' export default class MainAbility extends Ability { onCreate(want,launchParam){ diff --git a/ability/ability_runtime/amsdisplayIdtest/actsamsstartabilityforresulttest/entry/src/main/ets/MainAbility2/MainAbility2.ts b/ability/ability_runtime/amsdisplayIdtest/actsamsstartabilityforresulttest/entry/src/main/ets/MainAbility2/MainAbility2.ts index e67d5ef1ae1362462abe3dbf080e06930cb6a064..1b100e267b9c0b3ee81b6b7d864e89a814cd6b82 100644 --- a/ability/ability_runtime/amsdisplayIdtest/actsamsstartabilityforresulttest/entry/src/main/ets/MainAbility2/MainAbility2.ts +++ b/ability/ability_runtime/amsdisplayIdtest/actsamsstartabilityforresulttest/entry/src/main/ets/MainAbility2/MainAbility2.ts @@ -12,7 +12,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -import Ability from '@ohos.application.Ability' +import Ability from '@ohos.app.ability.UIAbility' import commonEvent from '@ohos.commonEvent' async function onShowProcess() { diff --git a/ability/ability_runtime/amsdisplayIdtest/actsamsstartabilityforresulttest/entry/src/main/ets/TestAbility/TestAbility.ts b/ability/ability_runtime/amsdisplayIdtest/actsamsstartabilityforresulttest/entry/src/main/ets/TestAbility/TestAbility.ts index 89a84730505783ba229175ab4b55d37f91a16266..8028a70f8af44690b95a08bd177bca6b09f24687 100644 --- a/ability/ability_runtime/amsdisplayIdtest/actsamsstartabilityforresulttest/entry/src/main/ets/TestAbility/TestAbility.ts +++ b/ability/ability_runtime/amsdisplayIdtest/actsamsstartabilityforresulttest/entry/src/main/ets/TestAbility/TestAbility.ts @@ -12,7 +12,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -import Ability from '@ohos.application.Ability' +import Ability from '@ohos.app.ability.UIAbility' export default class TestAbility extends Ability { onCreate(want, launchParam) { diff --git a/ability/ability_runtime/amsdisplayIdtest/actsamsstartabilitytest/entry/src/main/ets/Application/AbilityStage.ts b/ability/ability_runtime/amsdisplayIdtest/actsamsstartabilitytest/entry/src/main/ets/Application/AbilityStage.ts index 5e2915fe4fc033cd5c9bd579dc08fe7369e51016..953114c1b479f368cb6c6bd456f0a171a358d148 100644 --- a/ability/ability_runtime/amsdisplayIdtest/actsamsstartabilitytest/entry/src/main/ets/Application/AbilityStage.ts +++ b/ability/ability_runtime/amsdisplayIdtest/actsamsstartabilitytest/entry/src/main/ets/Application/AbilityStage.ts @@ -12,7 +12,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -import AbilityStage from "@ohos.application.AbilityStage" +import AbilityStage from "@ohos.app.ability.AbilityStage" export default class MyAbilityStage extends AbilityStage { onCreate() { diff --git a/ability/ability_runtime/amsdisplayIdtest/actsamsstartabilitytest/entry/src/main/ets/MainAbility/MainAbility.ts b/ability/ability_runtime/amsdisplayIdtest/actsamsstartabilitytest/entry/src/main/ets/MainAbility/MainAbility.ts index 10dd9a1eaff7ad67843219facba7f8aea7b5a1a5..b4ad1e5b3b8fe4c4f19e34fcf97248a96e9e50e3 100644 --- a/ability/ability_runtime/amsdisplayIdtest/actsamsstartabilitytest/entry/src/main/ets/MainAbility/MainAbility.ts +++ b/ability/ability_runtime/amsdisplayIdtest/actsamsstartabilitytest/entry/src/main/ets/MainAbility/MainAbility.ts @@ -12,7 +12,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -import Ability from '@ohos.application.Ability' +import Ability from '@ohos.app.ability.UIAbility' export default class MainAbility extends Ability { onCreate(want,launchParam){ diff --git a/ability/ability_runtime/apicover/apicoverhaptest/entry/src/main/ets/Application/AbilityStage.ts b/ability/ability_runtime/apicover/apicoverhaptest/entry/src/main/ets/Application/AbilityStage.ts index a590b7d615d839ed6c67eced002d150020e300d5..7e917ee0f146b706fc264dfaac71ac33f8c513a0 100644 --- a/ability/ability_runtime/apicover/apicoverhaptest/entry/src/main/ets/Application/AbilityStage.ts +++ b/ability/ability_runtime/apicover/apicoverhaptest/entry/src/main/ets/Application/AbilityStage.ts @@ -13,7 +13,7 @@ * limitations under the License. */ -import AbilityStage from "@ohos.application.AbilityStage" +import AbilityStage from "@ohos.app.ability.AbilityStage" export default class MyAbilityStage extends AbilityStage { onCreate() { diff --git a/ability/ability_runtime/apicover/apicoverhaptest/entry/src/main/ets/CreateFormAbility/CreateFormAbility.ts b/ability/ability_runtime/apicover/apicoverhaptest/entry/src/main/ets/CreateFormAbility/CreateFormAbility.ts index 481070a0daa9da861c7451a088c1e43afe74414a..e4c12a94fd4d44b567c8471eb570b6648a81abfa 100644 --- a/ability/ability_runtime/apicover/apicoverhaptest/entry/src/main/ets/CreateFormAbility/CreateFormAbility.ts +++ b/ability/ability_runtime/apicover/apicoverhaptest/entry/src/main/ets/CreateFormAbility/CreateFormAbility.ts @@ -12,7 +12,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -import Ability from '@ohos.application.Ability' +import Ability from '@ohos.app.ability.UIAbility' export default class CreateFormAbility extends Ability { onCreate(want, launchParam) { diff --git a/ability/ability_runtime/apicover/apicoverhaptest/entry/src/main/ets/FormAbility/FormAbility.ts b/ability/ability_runtime/apicover/apicoverhaptest/entry/src/main/ets/FormAbility/FormAbility.ts index e07c8d2677a609954848949db2d116b99e7ffbe9..f6531bc6ae4e6e2392bdd140e5ee6079245b5ba2 100644 --- a/ability/ability_runtime/apicover/apicoverhaptest/entry/src/main/ets/FormAbility/FormAbility.ts +++ b/ability/ability_runtime/apicover/apicoverhaptest/entry/src/main/ets/FormAbility/FormAbility.ts @@ -13,13 +13,13 @@ * limitations under the License. */ -import FormExtension from '@ohos.application.FormExtension'; +import FormExtension from '@ohos.app.form.FormExtensionAbility'; import formBindingData from '@ohos.application.formBindingData'; import formInfo from '@ohos.application.formInfo'; import commonEvent from '@ohos.commonEvent'; export default class FormAbility extends FormExtension { - onCreate(want) { + onAddForm(want) { // Called to return a FormBindingData object. console.info("FormAbility onCreate") let formData = { @@ -40,24 +40,24 @@ export default class FormAbility extends FormExtension { return formBindingData.createFormBindingData(formData); } - onCastToNormal(formId) { + onCastToNormalForm(formId) { // Called when the form provider is notified that a temporary form is successfully // converted to a normal form. } - onUpdate(formId) { + onUpdateForm(formId) { // Called to notify the form provider to update a specified form. } - onVisibilityChange(newStatus) { + onChangeFormVisibility(newStatus) { // Called when the form provider receives form events from the system. } - onEvent(formId, message) { + onFormEvent(formId, message) { // Called when a specified message event defined by the form provider is triggered. } - onDestroy(formId) { + onRemoveForm(formId) { // Called to notify the form provider that a specified form has been destroyed. } diff --git a/ability/ability_runtime/apicover/apicoverhaptest/entry/src/main/ets/FormHostAbility/FormHostAbility.ts b/ability/ability_runtime/apicover/apicoverhaptest/entry/src/main/ets/FormHostAbility/FormHostAbility.ts index b87146f0022cc25140be23f512b2d30bd407cb49..db846c9f2a3b2bd3f5916da01412b52b298b99f6 100644 --- a/ability/ability_runtime/apicover/apicoverhaptest/entry/src/main/ets/FormHostAbility/FormHostAbility.ts +++ b/ability/ability_runtime/apicover/apicoverhaptest/entry/src/main/ets/FormHostAbility/FormHostAbility.ts @@ -12,7 +12,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -import Ability from '@ohos.application.Ability' +import Ability from '@ohos.app.ability.UIAbility' export default class MainAbility extends Ability { diff --git a/ability/ability_runtime/apicover/apicoverhaptest/entry/src/main/ets/MainAbility/MainAbility.ts b/ability/ability_runtime/apicover/apicoverhaptest/entry/src/main/ets/MainAbility/MainAbility.ts index 83be6c5a2a1cab94029e5a4ed20690d133a08f58..881e90c13c2404e167090ce55019ad24f8b4cc2b 100644 --- a/ability/ability_runtime/apicover/apicoverhaptest/entry/src/main/ets/MainAbility/MainAbility.ts +++ b/ability/ability_runtime/apicover/apicoverhaptest/entry/src/main/ets/MainAbility/MainAbility.ts @@ -12,7 +12,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -import Ability from '@ohos.application.Ability' +import Ability from '@ohos.app.ability.UIAbility' export default class MainAbility extends Ability { diff --git a/ability/ability_runtime/apicover/apicoverhaptest/entry/src/main/ets/SecondAbility/SecondAbility.ts b/ability/ability_runtime/apicover/apicoverhaptest/entry/src/main/ets/SecondAbility/SecondAbility.ts index 5a2b21198a7510b760d93a98d453e998258aa43c..293bcb917a15afae98c1261223844a31daa3dfe2 100644 --- a/ability/ability_runtime/apicover/apicoverhaptest/entry/src/main/ets/SecondAbility/SecondAbility.ts +++ b/ability/ability_runtime/apicover/apicoverhaptest/entry/src/main/ets/SecondAbility/SecondAbility.ts @@ -12,7 +12,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -import Ability from '@ohos.application.Ability' +import Ability from '@ohos.app.ability.UIAbility' import commonEvent from '@ohos.commonEvent'; export default class SecondAbility extends Ability { diff --git a/ability/ability_runtime/apicover/apicoverhaptest/entry/src/main/ets/TestAbility/TestAbility.ts b/ability/ability_runtime/apicover/apicoverhaptest/entry/src/main/ets/TestAbility/TestAbility.ts index 89a84730505783ba229175ab4b55d37f91a16266..8028a70f8af44690b95a08bd177bca6b09f24687 100644 --- a/ability/ability_runtime/apicover/apicoverhaptest/entry/src/main/ets/TestAbility/TestAbility.ts +++ b/ability/ability_runtime/apicover/apicoverhaptest/entry/src/main/ets/TestAbility/TestAbility.ts @@ -12,7 +12,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -import Ability from '@ohos.application.Ability' +import Ability from '@ohos.app.ability.UIAbility' export default class TestAbility extends Ability { onCreate(want, launchParam) { diff --git a/ability/ability_runtime/apicover/apicoverhaptest/entry/src/main/ets/test/ApiCoverAbility.test.ets b/ability/ability_runtime/apicover/apicoverhaptest/entry/src/main/ets/test/ApiCoverAbility.test.ets index ce9fc0a9c14779b464dc4de409edad54a13ddb55..c1f8ab65e6d4d9f6028ae08d753ddfab1f86f474 100644 --- a/ability/ability_runtime/apicover/apicoverhaptest/entry/src/main/ets/test/ApiCoverAbility.test.ets +++ b/ability/ability_runtime/apicover/apicoverhaptest/entry/src/main/ets/test/ApiCoverAbility.test.ets @@ -19,10 +19,10 @@ import FormInfo from '@ohos.application.formInfo'; import formInfoNew from '@ohos.app.form.formInfo'; import formError from '@ohos.application.formError'; import formHost from '@ohos.application.formHost'; -import errorManager from '@ohos.application.errorManager'; -import abilityConstant from '@ohos.application.AbilityConstant' +import errorManager from '@ohos.app.ability.errorManager'; +import abilityConstant from '@ohos.app.ability.AbilityConstant' import appManager from '@ohos.application.appManager' -import applicationContext from '@ohos.application.context' +import appManagerNew from '@ohos.app.ability.appManager' import commonEvent from '@ohos.commonEvent'; import ability from '@ohos.ability.ability'; import abilityDelegatorRegistry from '@ohos.app.ability.abilityDelegatorRegistry'; @@ -313,7 +313,7 @@ export default function ApiCoverTest() { */ it('SUB_AA_ABILITY_Extension_API_012', 0, async function (done) { try { - let info: appManager.ProcessRunningInfo; + let info: appManagerNew.ProcessRunningInfo; let stageContext: common.AbilityStageContext = globalThis.stageContext; let abilityContext: common.UIAbilityContext = globalThis.abilityContext; let appContext: common.ApplicationContext = abilityContext.getApplicationContext(); @@ -453,23 +453,12 @@ export default function ApiCoverTest() { expect("ohos.extra.param.key.form_name").assertEqual(FormInfo.FormParam.NAME_KEY) expect("ohos.extra.param.key.form_temporary").assertEqual(FormInfo.FormParam.TEMPORARY_KEY) expect("ohos.extra.param.key.form_identity").assertEqual(FormInfo.FormParam.IDENTITY_KEY) - expect("ohos.extra.param.key.bundle_name").assertEqual(FormInfo.FormParam.BUNDLE_NAME_KEY) - expect("ohos.extra.param.key.ability_name").assertEqual(FormInfo.FormParam.ABILITY_NAME_KEY) expect(0).assertEqual(FormInfo.FormState.DEFAULT) expect(1).assertEqual(FormInfo.FormState.READY) expect(-1).assertEqual(FormInfo.FormState.UNKNOWN) expect(0).assertEqual(FormInfo.ColorMode.MODE_DARK) expect(1).assertEqual(FormInfo.ColorMode.MODE_LIGHT) - console.info("SUB_AA_Form_provider_TestFormInfo_0100:" + FormInfo.FormDimension.Dimension_2_1); - expect(1).assertEqual(FormInfo.FormDimension.Dimension_1_2) - expect(2).assertEqual(FormInfo.FormDimension.Dimension_2_2) - expect(3).assertEqual(FormInfo.FormDimension.Dimension_2_4) - expect(4).assertEqual(FormInfo.FormDimension.Dimension_4_4) - expect(5).assertEqual(FormInfo.FormDimension.Dimension_2_1) expect(1).assertEqual(FormInfo.FormType.JS); - expect(2).assertEqual(FormInfo.FormType.eTS); - expect(1).assertEqual(FormInfo.VisibilityType.FORM_VISIBLE); - expect(2).assertEqual(FormInfo.VisibilityType.FORM_INVISIBLE); done(); }); @@ -515,50 +504,6 @@ export default function ApiCoverTest() { done(); }); - /* - * @tc.number SUB_AA_ReisterErrorObserver_0100 - * @tc.name Test ReisterErrorObserver. - * @tc.desc Function test - * @tc.level 3 - */ - it('SUB_AA_ReisterErrorObserver_0100', 0, async function (done) { - let errorObserver:errorManager.ErrorObserver; - errorObserver = { - onUnhandledException:(errMessage) => { - console.info("SUB_AA_ReisterErrorObserver_0100" + JSON.stringify(errMessage)); - } - } - let errCodeId = errorManager.registerErrorObserver(errorObserver) - expect(errCodeId).assertEqual(0) - errorManager.unregisterErrorObserver(errCodeId).then((data)=>{ - expect(data).assertEqual(undefined) - done(); - }).catch((err)=>{ - expect().assertFail() - done(); - }) - }); - - /* - * @tc.number SUB_AA_ReisterErrorObserver_0200 - * @tc.name Test unregisterErrorObserver with error number. - * @tc.desc Function test - * @tc.level 3 - */ - it('SUB_AA_ReisterErrorObserver_0200', 0, async function (done) { - errorManager.unregisterErrorObserver(-1, (err, data)=>{ - console.info("SUB_AA_ReisterErrorObserver_0200:" + JSON.stringify(err) + " " + JSON.stringify(data)); - console.info("SUB_AA_ReisterErrorObserver_0200:" + typeof(err.code)); - if(err.code != 0){ - expect(err.code).assertEqual(-2) - done() - }else{ - expect().assertFail() - done(); - } - }) - }); - /* * @tc.number SUB_AA_Test_AbilityConstant_0100 * @tc.name Test abilityConstant. @@ -582,9 +527,9 @@ export default function ApiCoverTest() { * @tc.level 3 */ it('SUB_AA_Test_ProcessRunningInformation_0100', 0, async function (done) { - let processRunningInformation:appManager.ProcessRunningInformation; + let processRunningInformation:appManagerNew.ProcessRunningInformation; let process; - appManager.getProcessRunningInformation().then((processRunningInformations)=>{ + appManagerNew.getProcessRunningInformation().then((processRunningInformations)=>{ console.info("SUB_AA_Test_ProcessRunningInformation_0100:" + JSON.stringify(processRunningInformations)); for(let i = 0; i < processRunningInformations.length; i++){ console.info("SUB_AA_Test_ProcessRunningInformation_0100:" + JSON.stringify(processRunningInformations[i])); @@ -611,24 +556,23 @@ export default function ApiCoverTest() { */ it('SUB_AA_Test_ProcessRunningInformation_0200', 0, async function (done) { let process; - appManager.getProcessRunningInformation((error, processRunningInformations)=>{ - if(error.code == 0){ - console.info("SUB_AA_Test_ProcessRunningInformation_0100:" + JSON.stringify(processRunningInformations)); - for(let i = 0; i < processRunningInformations.length; i++){ - console.info("SUB_AA_Test_ProcessRunningInformation_0100:" + JSON.stringify(processRunningInformations[i])); - expect(processRunningInformations[i].pid).assertLarger(0) - expect(processRunningInformations[i].uid).assertLarger(0) - if(processRunningInformations[i].processName == "com.example.apicoverhaptest"){ - process = processRunningInformations[i] - } - } - expect(process.bundleNames[0]).assertEqual("com.example.apicoverhaptest") - done() - }else{ - console.info("SUB_AA_Test_ProcessRunningInformation_0100:" + JSON.stringify(error)); + appManagerNew.getProcessRunningInformation((error, processRunningInformations)=>{ + if (error) { + console.info("SUB_AA_Test_ProcessRunningInformation_0200:" + JSON.stringify(error)); expect().assertFail() done() } + console.info("SUB_AA_Test_ProcessRunningInformation_0200:" + JSON.stringify(processRunningInformations)); + for(let i = 0; i < processRunningInformations.length; i++){ + console.info("SUB_AA_Test_ProcessRunningInformation_0200:" + JSON.stringify(processRunningInformations[i])); + expect(processRunningInformations[i].pid).assertLarger(0) + expect(processRunningInformations[i].uid).assertLarger(0) + if(processRunningInformations[i].processName == "com.example.apicoverhaptest"){ + process = processRunningInformations[i] + } + } + expect(process.bundleNames[0]).assertEqual("com.example.apicoverhaptest") + done() }) }); @@ -689,7 +633,7 @@ export default function ApiCoverTest() { */ it('SUB_AA_FMS_AcquireForm_0100', 0, async function (done) { let subscriber = null - let formExtensionContext:applicationContext.FormExtensionContext + let formExtensionContext:common.FormExtensionContext let pacMap:ability.PacMap let subscribeInfo = { events: ["Form_StartAbility"] diff --git a/ability/ability_runtime/apicover/apicoverhaptest/entry/src/main/ets/test/VerificationTest.ets b/ability/ability_runtime/apicover/apicoverhaptest/entry/src/main/ets/test/VerificationTest.ets index d70ed9217bec61a3fdc962e45b46fddf30b105d4..722516ad82802f1e2ff837cb2cd2840a82b3281d 100644 --- a/ability/ability_runtime/apicover/apicoverhaptest/entry/src/main/ets/test/VerificationTest.ets +++ b/ability/ability_runtime/apicover/apicoverhaptest/entry/src/main/ets/test/VerificationTest.ets @@ -14,7 +14,7 @@ */ import { describe, beforeAll, beforeEach, afterEach, afterAll, it, expect } from '@ohos/hypium' import commonEvent from '@ohos.commonEvent'; -import AbilityConstant from "@ohos.application.AbilityConstant"; +import AbilityConstant from "@ohos.app.ability.AbilityConstant"; import appManager from "@ohos.application.appManager"; import wantConstant from '@ohos.ability.wantConstant'; diff --git a/ability/ability_runtime/apicover/apicoverhaptest/entry/src/main/ets/test/WantAgentCover.test.ets b/ability/ability_runtime/apicover/apicoverhaptest/entry/src/main/ets/test/WantAgentCover.test.ets index 03f08edb4d5628dd5c3c966ef13ff939ec4d90b0..7d9270e77250f6e879cfc73e0bc4fbc0ba5cedbb 100644 --- a/ability/ability_runtime/apicover/apicoverhaptest/entry/src/main/ets/test/WantAgentCover.test.ets +++ b/ability/ability_runtime/apicover/apicoverhaptest/entry/src/main/ets/test/WantAgentCover.test.ets @@ -13,7 +13,7 @@ * limitations under the License. */ import { describe, beforeAll, beforeEach, afterEach, afterAll, it, expect } from '@ohos/hypium' -import wantAgent from '@ohos.wantAgent'; +import wantAgent from '@ohos.app.ability.wantAgent'; var TAG export default function wantAgentCoverTest() { diff --git a/ability/ability_runtime/apicover/stagesupplement/entry/src/main/ets/Application/AbilityStage.ts b/ability/ability_runtime/apicover/stagesupplement/entry/src/main/ets/Application/AbilityStage.ts index d8f2468920ab67540f4c3adad5b50bb982c39bb4..4fc667ef5304212e2e8f9a46293bd5f0e0a93c3f 100644 --- a/ability/ability_runtime/apicover/stagesupplement/entry/src/main/ets/Application/AbilityStage.ts +++ b/ability/ability_runtime/apicover/stagesupplement/entry/src/main/ets/Application/AbilityStage.ts @@ -1,4 +1,4 @@ -import AbilityStage from "@ohos.application.AbilityStage" +import AbilityStage from "@ohos.app.ability.AbilityStage" import commonEvent from '@ohos.commonEvent'; export default class MyAbilityStage extends AbilityStage { onCreate() { diff --git a/ability/ability_runtime/apicover/stagesupplement/entry/src/main/ets/MainAbility/MainAbility.ts b/ability/ability_runtime/apicover/stagesupplement/entry/src/main/ets/MainAbility/MainAbility.ts index 28beb02c5ae8892b79e9b57f62b863b771f71f39..b2d78e904481e2aa75a75cefb0d50939ede9c6c6 100644 --- a/ability/ability_runtime/apicover/stagesupplement/entry/src/main/ets/MainAbility/MainAbility.ts +++ b/ability/ability_runtime/apicover/stagesupplement/entry/src/main/ets/MainAbility/MainAbility.ts @@ -1,4 +1,4 @@ -import Ability from '@ohos.application.Ability' +import Ability from '@ohos.app.ability.UIAbility' import commonEvent from '@ohos.commonEvent'; var printLog1 = "Stage:MainAbility:"; diff --git a/ability/ability_runtime/apicover/stagesupplement/entry/src/main/ets/MainAbility10/MainAbility10.ts b/ability/ability_runtime/apicover/stagesupplement/entry/src/main/ets/MainAbility10/MainAbility10.ts index c2f80ac0b470e615534ab93c64c9a5414eda7903..a1ce6ac23d9cd32714beb8821cffa0e3056ea928 100644 --- a/ability/ability_runtime/apicover/stagesupplement/entry/src/main/ets/MainAbility10/MainAbility10.ts +++ b/ability/ability_runtime/apicover/stagesupplement/entry/src/main/ets/MainAbility10/MainAbility10.ts @@ -1,4 +1,4 @@ -import Ability from '@ohos.application.Ability' +import Ability from '@ohos.app.ability.UIAbility' import commonEvent from '@ohos.commonEvent'; var printLog10 = "Stage:MainAbility10:"; diff --git a/ability/ability_runtime/apicover/stagesupplement/entry/src/main/ets/MainAbility3/MainAbility3.ts b/ability/ability_runtime/apicover/stagesupplement/entry/src/main/ets/MainAbility3/MainAbility3.ts index 2753701fb905113f33c84cc9e7f4afa57929aba6..43c70ada7d41eb88eedbe4abf1230add76b0202f 100644 --- a/ability/ability_runtime/apicover/stagesupplement/entry/src/main/ets/MainAbility3/MainAbility3.ts +++ b/ability/ability_runtime/apicover/stagesupplement/entry/src/main/ets/MainAbility3/MainAbility3.ts @@ -1,4 +1,4 @@ -import Ability from '@ohos.application.Ability' +import Ability from '@ohos.app.ability.UIAbility' import commonEvent from '@ohos.commonEvent'; var printLog3 = "Stage:MainAbility3:"; diff --git a/ability/ability_runtime/apicover/stagesupplement/entry/src/main/ets/MainAbility4/MainAbility4.ts b/ability/ability_runtime/apicover/stagesupplement/entry/src/main/ets/MainAbility4/MainAbility4.ts index 37f65bfebbdb1cf5ded2ac4e65015859e2fcdda6..2566b910a9a63146207697510808327cac362052 100644 --- a/ability/ability_runtime/apicover/stagesupplement/entry/src/main/ets/MainAbility4/MainAbility4.ts +++ b/ability/ability_runtime/apicover/stagesupplement/entry/src/main/ets/MainAbility4/MainAbility4.ts @@ -1,4 +1,4 @@ -import Ability from '@ohos.application.Ability' +import Ability from '@ohos.app.ability.UIAbility' import commonEvent from '@ohos.commonEvent'; var printLog4 = "Stage:MainAbility4:"; diff --git a/ability/ability_runtime/apicover/stagesupplement/entry/src/main/ets/MainAbility5/MainAbility5.ts b/ability/ability_runtime/apicover/stagesupplement/entry/src/main/ets/MainAbility5/MainAbility5.ts index cb63cb3cd32e42c9cdc44cdabc01fbc8e3424db3..b2c119ffb0787289b507380c5cf9ae5d6ac59f0d 100644 --- a/ability/ability_runtime/apicover/stagesupplement/entry/src/main/ets/MainAbility5/MainAbility5.ts +++ b/ability/ability_runtime/apicover/stagesupplement/entry/src/main/ets/MainAbility5/MainAbility5.ts @@ -1,4 +1,4 @@ -import Ability from '@ohos.application.Ability' +import Ability from '@ohos.app.ability.UIAbility' import commonEvent from '@ohos.commonEvent'; var printLog5 = "Stage:MainAbility5:"; diff --git a/ability/ability_runtime/apicover/stagesupplement/entry/src/main/ets/MainAbility9/MainAbility9.ts b/ability/ability_runtime/apicover/stagesupplement/entry/src/main/ets/MainAbility9/MainAbility9.ts index 38e87d4e734b8162e0de3904e60dd5efccd5dc90..5aabdbe2a4fd79393de39361f86fc9ae3035a4e6 100644 --- a/ability/ability_runtime/apicover/stagesupplement/entry/src/main/ets/MainAbility9/MainAbility9.ts +++ b/ability/ability_runtime/apicover/stagesupplement/entry/src/main/ets/MainAbility9/MainAbility9.ts @@ -1,6 +1,6 @@ -import Ability from '@ohos.application.Ability' +import Ability from '@ohos.app.ability.UIAbility' import commonEvent from '@ohos.commonEvent'; -import AbilityConstant from '@ohos.application.AbilityConstant'; +import AbilityConstant from '@ohos.app.ability.AbilityConstant'; var printLog9 = "Stage:MainAbility9:"; var listPush9 = "Stage_MainAbility9_"; diff --git a/ability/ability_runtime/apitest/entry/src/main/ets/Application/AbilityStage.ts b/ability/ability_runtime/apitest/entry/src/main/ets/Application/AbilityStage.ts index 2ae1bf3ce4d07b5d5a4e8bc485d994849d55de70..f851e3de00d0ec2a83e3c03e57ccd2845c27ac7f 100644 --- a/ability/ability_runtime/apitest/entry/src/main/ets/Application/AbilityStage.ts +++ b/ability/ability_runtime/apitest/entry/src/main/ets/Application/AbilityStage.ts @@ -12,7 +12,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -import AbilityStage from "@ohos.application.AbilityStage" +import AbilityStage from "@ohos.app.ability.AbilityStage" export default class MyAbilityStage extends AbilityStage { onCreate() { diff --git a/ability/ability_runtime/apitest/entry/src/main/ets/MainAbility/MainAbility.ts b/ability/ability_runtime/apitest/entry/src/main/ets/MainAbility/MainAbility.ts index 38415bcb1d2ba024393958abc33c247f4eb33c8d..e7b2eeb8fed9163f149f712f9c74e1aa1903c8bf 100644 --- a/ability/ability_runtime/apitest/entry/src/main/ets/MainAbility/MainAbility.ts +++ b/ability/ability_runtime/apitest/entry/src/main/ets/MainAbility/MainAbility.ts @@ -12,7 +12,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -import Ability from '@ohos.application.Ability' +import Ability from '@ohos.app.ability.UIAbility' import AbilityDelegatorRegistry from '@ohos.application.abilityDelegatorRegistry' import { Hypium } from '@ohos/hypium' import testsuite from '../test/List.test' diff --git a/ability/ability_runtime/apitest/entry/src/main/ets/MainAbility2/MainAbility2.ts b/ability/ability_runtime/apitest/entry/src/main/ets/MainAbility2/MainAbility2.ts index f182429412cd553f67162311b079a60ff71d902c..c2953016c678e3586b108184d86f246501c88fb0 100644 --- a/ability/ability_runtime/apitest/entry/src/main/ets/MainAbility2/MainAbility2.ts +++ b/ability/ability_runtime/apitest/entry/src/main/ets/MainAbility2/MainAbility2.ts @@ -12,7 +12,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -import Ability from '@ohos.application.Ability' +import Ability from '@ohos.app.ability.UIAbility' import commonEvent from '@ohos.commonEvent' function PublishCallBackOne() { console.debug("====>Publish CallBack ACTS_DoAbilityForeground_0100_Event====>"); diff --git a/ability/ability_runtime/apitest/entry/src/main/ets/MainAbility3/MainAbility3.ts b/ability/ability_runtime/apitest/entry/src/main/ets/MainAbility3/MainAbility3.ts index 077b6fa9ef84bc8c243e47d99f2fde6eccc2657b..7d11ea72a3e7bbcfa3704035a332cdfa6b48be53 100644 --- a/ability/ability_runtime/apitest/entry/src/main/ets/MainAbility3/MainAbility3.ts +++ b/ability/ability_runtime/apitest/entry/src/main/ets/MainAbility3/MainAbility3.ts @@ -12,7 +12,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -import Ability from '@ohos.application.Ability' +import Ability from '@ohos.app.ability.UIAbility' import commonEvent from '@ohos.commonEvent' function PublishCallBackOne() { console.debug("====>Publish CallBack ACTS_DoAbilityForeground_0300_Event====>"); diff --git a/ability/ability_runtime/apitest/entry/src/main/ets/MainAbility4/MainAbility4.ts b/ability/ability_runtime/apitest/entry/src/main/ets/MainAbility4/MainAbility4.ts index 36898c0b26fb484bfb622f67764d6ed25ab740d7..b1c44b39472c1427d6ffd50cca639b2091257974 100644 --- a/ability/ability_runtime/apitest/entry/src/main/ets/MainAbility4/MainAbility4.ts +++ b/ability/ability_runtime/apitest/entry/src/main/ets/MainAbility4/MainAbility4.ts @@ -12,7 +12,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -import Ability from '@ohos.application.Ability' +import Ability from '@ohos.app.ability.UIAbility' import commonEvent from '@ohos.commonEvent' function PublishCallBackOne() { console.debug("====>Publish CallBack Event====>"); diff --git a/ability/ability_runtime/apitest/entry/src/main/ets/MainAbility5/MainAbility5.ts b/ability/ability_runtime/apitest/entry/src/main/ets/MainAbility5/MainAbility5.ts index e199b01c89d907714dad64910e9876b058266679..ebafd94e121262fc91973d6568ca69576a722245 100644 --- a/ability/ability_runtime/apitest/entry/src/main/ets/MainAbility5/MainAbility5.ts +++ b/ability/ability_runtime/apitest/entry/src/main/ets/MainAbility5/MainAbility5.ts @@ -12,7 +12,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -import Ability from '@ohos.application.Ability' +import Ability from '@ohos.app.ability.UIAbility' import commonEvent from '@ohos.commonEvent' function PublishCallBackOne() { console.debug("====>Publish CallBack Event====>"); diff --git a/ability/ability_runtime/context/actscreatemodulecontextassist/entry/src/main/ets/Application/AbilityStage.ts b/ability/ability_runtime/context/actscreatemodulecontextassist/entry/src/main/ets/Application/AbilityStage.ts index 5073f074333769e258d7b97d27aa750302f91fbe..a31d98d3a92d876ad5db3ea4ebdd51b8629c07a3 100644 --- a/ability/ability_runtime/context/actscreatemodulecontextassist/entry/src/main/ets/Application/AbilityStage.ts +++ b/ability/ability_runtime/context/actscreatemodulecontextassist/entry/src/main/ets/Application/AbilityStage.ts @@ -13,7 +13,7 @@ * limitations under the License. */ -import AbilityStage from "@ohos.application.AbilityStage" +import AbilityStage from "@ohos.app.ability.AbilityStage" export default class MyAbilityStage extends AbilityStage { onCreate() { diff --git a/ability/ability_runtime/context/actscreatemodulecontextassist/entry/src/main/ets/MainAbility/MainAbility.ts b/ability/ability_runtime/context/actscreatemodulecontextassist/entry/src/main/ets/MainAbility/MainAbility.ts index 2f1389c76e39a641715b88eb6163d50366ceb508..8625a754d80bbf342473ebfb4fe24ecdd0e9cec3 100644 --- a/ability/ability_runtime/context/actscreatemodulecontextassist/entry/src/main/ets/MainAbility/MainAbility.ts +++ b/ability/ability_runtime/context/actscreatemodulecontextassist/entry/src/main/ets/MainAbility/MainAbility.ts @@ -13,7 +13,7 @@ * limitations under the License. */ -import Ability from '@ohos.application.Ability' +import Ability from '@ohos.app.ability.UIAbility' export default class MainAbility extends Ability { async onCreate(want, launchParam) { diff --git a/ability/ability_runtime/context/actscreatemodulecontextassistone/entry/src/main/ets/Application/AbilityStage.ts b/ability/ability_runtime/context/actscreatemodulecontextassistone/entry/src/main/ets/Application/AbilityStage.ts index 5073f074333769e258d7b97d27aa750302f91fbe..a31d98d3a92d876ad5db3ea4ebdd51b8629c07a3 100644 --- a/ability/ability_runtime/context/actscreatemodulecontextassistone/entry/src/main/ets/Application/AbilityStage.ts +++ b/ability/ability_runtime/context/actscreatemodulecontextassistone/entry/src/main/ets/Application/AbilityStage.ts @@ -13,7 +13,7 @@ * limitations under the License. */ -import AbilityStage from "@ohos.application.AbilityStage" +import AbilityStage from "@ohos.app.ability.AbilityStage" export default class MyAbilityStage extends AbilityStage { onCreate() { diff --git a/ability/ability_runtime/context/actscreatemodulecontextassistone/entry/src/main/ets/MainAbility/MainAbility.ts b/ability/ability_runtime/context/actscreatemodulecontextassistone/entry/src/main/ets/MainAbility/MainAbility.ts index 2f1389c76e39a641715b88eb6163d50366ceb508..8625a754d80bbf342473ebfb4fe24ecdd0e9cec3 100644 --- a/ability/ability_runtime/context/actscreatemodulecontextassistone/entry/src/main/ets/MainAbility/MainAbility.ts +++ b/ability/ability_runtime/context/actscreatemodulecontextassistone/entry/src/main/ets/MainAbility/MainAbility.ts @@ -13,7 +13,7 @@ * limitations under the License. */ -import Ability from '@ohos.application.Ability' +import Ability from '@ohos.app.ability.UIAbility' export default class MainAbility extends Ability { async onCreate(want, launchParam) { diff --git a/ability/ability_runtime/context/actscreatemodulecontexttest/entry/src/main/ets/Application/AbilityStage.ts b/ability/ability_runtime/context/actscreatemodulecontexttest/entry/src/main/ets/Application/AbilityStage.ts index 2b1035b73f5f61109e5ce372b42bebd105bb68d3..aa42e29692cb11591dfbff6ccb3d7bf4e49d80dd 100644 --- a/ability/ability_runtime/context/actscreatemodulecontexttest/entry/src/main/ets/Application/AbilityStage.ts +++ b/ability/ability_runtime/context/actscreatemodulecontexttest/entry/src/main/ets/Application/AbilityStage.ts @@ -13,7 +13,7 @@ * limitations under the License. */ -import AbilityStage from "@ohos.application.AbilityStage" +import AbilityStage from "@ohos.app.ability.AbilityStage" export default class MyAbilityStage extends AbilityStage { onCreate() { diff --git a/ability/ability_runtime/context/actscreatemodulecontexttest/entry/src/main/ets/MainAbility/MainAbility.ts b/ability/ability_runtime/context/actscreatemodulecontexttest/entry/src/main/ets/MainAbility/MainAbility.ts index 07eefcc2c8f98aa12043bb97840478e7f980b9c8..5944d812e6159d1fb9dc511acaebdc55409ef406 100644 --- a/ability/ability_runtime/context/actscreatemodulecontexttest/entry/src/main/ets/MainAbility/MainAbility.ts +++ b/ability/ability_runtime/context/actscreatemodulecontexttest/entry/src/main/ets/MainAbility/MainAbility.ts @@ -13,7 +13,7 @@ * limitations under the License. */ -import Ability from '@ohos.application.Ability' +import Ability from '@ohos.app.ability.UIAbility' import AbilityDelegatorRegistry from '@ohos.application.abilityDelegatorRegistry' import { Hypium } from '@ohos/hypium' import testsuite from '../test/List.test' diff --git a/ability/ability_runtime/formmanager/stage/actsformprovidergetformsinfo/entry/src/main/ets/Application/AbilityStage.ts b/ability/ability_runtime/formmanager/stage/actsformprovidergetformsinfo/entry/src/main/ets/Application/AbilityStage.ts index 6ceb0c290ae831a45143a5e2b42d4351f2fc3d7e..3745b4557c4d87274ed1fd9e5efef51b63d4ceca 100644 --- a/ability/ability_runtime/formmanager/stage/actsformprovidergetformsinfo/entry/src/main/ets/Application/AbilityStage.ts +++ b/ability/ability_runtime/formmanager/stage/actsformprovidergetformsinfo/entry/src/main/ets/Application/AbilityStage.ts @@ -12,7 +12,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -import AbilityStage from "@ohos.application.AbilityStage" +import AbilityStage from "@ohos.app.ability.AbilityStage" export default class MyAbilityStage extends AbilityStage { onCreate() { diff --git a/ability/ability_runtime/formmanager/stage/actsformprovidergetformsinfo/entry/src/main/ets/MainAbility/MainAbility.ts b/ability/ability_runtime/formmanager/stage/actsformprovidergetformsinfo/entry/src/main/ets/MainAbility/MainAbility.ts index a67282173ec15a6ef903fc9a09cd1b7277cad5ca..a133ba34fae46c2ff69dea92ab648706fa7a3240 100644 --- a/ability/ability_runtime/formmanager/stage/actsformprovidergetformsinfo/entry/src/main/ets/MainAbility/MainAbility.ts +++ b/ability/ability_runtime/formmanager/stage/actsformprovidergetformsinfo/entry/src/main/ets/MainAbility/MainAbility.ts @@ -12,7 +12,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -import Ability from '@ohos.application.Ability' +import Ability from '@ohos.app.ability.UIAbility' export default class MainAbility extends Ability { onCreate(want, launchParam) { diff --git a/ability/ability_runtime/formmanager/stage/actsformprovidergetformsinfo/entry/src/main/ets/TestAbility/TestAbility.ts b/ability/ability_runtime/formmanager/stage/actsformprovidergetformsinfo/entry/src/main/ets/TestAbility/TestAbility.ts index 89a84730505783ba229175ab4b55d37f91a16266..8028a70f8af44690b95a08bd177bca6b09f24687 100644 --- a/ability/ability_runtime/formmanager/stage/actsformprovidergetformsinfo/entry/src/main/ets/TestAbility/TestAbility.ts +++ b/ability/ability_runtime/formmanager/stage/actsformprovidergetformsinfo/entry/src/main/ets/TestAbility/TestAbility.ts @@ -12,7 +12,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -import Ability from '@ohos.application.Ability' +import Ability from '@ohos.app.ability.UIAbility' export default class TestAbility extends Ability { onCreate(want, launchParam) { diff --git a/ability/ability_runtime/formmanager/stage/actsformprovidergetformsinfo/entry/src/main/ets/test/GetFormsInfoTest.test.ets b/ability/ability_runtime/formmanager/stage/actsformprovidergetformsinfo/entry/src/main/ets/test/GetFormsInfoTest.test.ets index 730bf353d64bdd57d839d39874337dfa3d1de043..965669dc47f4055eff11750d40ce5a9d02b4c73e 100644 --- a/ability/ability_runtime/formmanager/stage/actsformprovidergetformsinfo/entry/src/main/ets/test/GetFormsInfoTest.test.ets +++ b/ability/ability_runtime/formmanager/stage/actsformprovidergetformsinfo/entry/src/main/ets/test/GetFormsInfoTest.test.ets @@ -13,8 +13,8 @@ * limitations under the License. */ import { describe, beforeAll, beforeEach, afterEach, afterAll, it, expect } from '@ohos/hypium' -import formProvider from '@ohos.application.formProvider'; -import formInfo from '@ohos.application.formInfo'; +import formProvider from '@ohos.app.form.formProvider'; +import formInfo from '@ohos.app.form.formInfo'; import formError from '@ohos.application.formError'; let module1FormInfo: formInfo.FormInfo = { @@ -59,6 +59,7 @@ let module2FormInfo: formInfo.FormInfo = { customizeData: {} } +const ERR_ADD_INVALID_PARAM = 401; var expectResult = Array(); expectResult.push(module1FormInfo); expectResult.push(module2FormInfo); @@ -75,7 +76,7 @@ export default function abilityTest() { formProvider.getFormsInfo((err, value) => { console.info("formProvider::GetFormsInfoTest err: " + JSON.stringify(err)); console.info("formProvider::GetFormsInfoTest value: " + JSON.stringify(value)); - expect(err.code).assertEqual(0); + expect(err).assertEqual(null); expect(value.length).assertEqual(2); checkResultArray(expectResult, value) done(); @@ -124,12 +125,18 @@ export default function abilityTest() { */ it('SUB_AA_OpenHarmony_ProviderGetForsInfo_0400', 0, async function (done) { console.info("SUB_AA_OpenHarmony_ProviderGetForsInfo_0400"); - formProvider.getFormsInfo(undefined, function(err, value) { + try { + formProvider.getFormsInfo(undefined, function(err, value) { + console.info("formProvider::GetFormsInfoTest err: " + JSON.stringify(err)); + console.info("formProvider::GetFormsInfoTest value: " + JSON.stringify(value)); + expect().assertFail(); + done(); + }) + } catch (err) { console.info("formProvider::GetFormsInfoTest err: " + JSON.stringify(err)); - console.info("formProvider::GetFormsInfoTest value: " + JSON.stringify(value)); - expect(err.code).assertEqual(formError.FormError.ERR_ADD_INVALID_PARAM); + expect(err.code).assertEqual(ERR_ADD_INVALID_PARAM); done(); - }); + } }); /** @@ -143,7 +150,7 @@ export default function abilityTest() { formProvider.getFormsInfo(filter, function(err, value) { console.info("formProvider::GetFormsInfoTest: " + JSON.stringify(err)); console.info("formProvider::GetFormsInfoTest: " + JSON.stringify(value)); - expect(err.code).assertEqual(0); + expect(err).assertEqual(null); expect(value.length).assertEqual(2); checkResultArray(expectResult, value); done(); @@ -163,7 +170,7 @@ export default function abilityTest() { formProvider.getFormsInfo(filter, function(err, value) { console.info("formProvider::GetFormsInfoTest err: " + JSON.stringify(err)); console.info("formProvider::GetFormsInfoTest value: " + JSON.stringify(value)); - expect(err.code).assertEqual(0); + expect(err).assertEqual(null); expect(value.length).assertEqual(2); checkResultArray(expectResult, value); done(); @@ -183,7 +190,7 @@ export default function abilityTest() { formProvider.getFormsInfo(filter, function(err, value) { console.info("formProvider::GetFormsInfoTest err: " + JSON.stringify(err)); console.info("formProvider::GetFormsInfoTest value: " + JSON.stringify(value)); - expect(err.code).assertEqual(0); + expect(err).assertEqual(null); expect(value.length).assertEqual(2); checkResultArray(expectResult, value); done(); @@ -203,7 +210,7 @@ export default function abilityTest() { formProvider.getFormsInfo(filter, function(err, value) { console.info("formProvider::GetFormsInfoTest err: " + JSON.stringify(err)); console.info("formProvider::GetFormsInfoTest value: " + JSON.stringify(value)); - expect(err.code).assertEqual(0); + expect(err).assertEqual(null); expect(value.length).assertEqual(0); done(); }); @@ -222,7 +229,7 @@ export default function abilityTest() { formProvider.getFormsInfo(filter, function(err, value) { console.info("formProvider::GetFormsInfoTest err: " + JSON.stringify(err)); console.info("formProvider::GetFormsInfoTest value: " + JSON.stringify(value)); - expect(err.code).assertEqual(0); + expect(err).assertEqual(null); expect(value.length).assertEqual(1); checkResult(module1FormInfo, value[0]); done(); @@ -241,7 +248,7 @@ export default function abilityTest() { formProvider.getFormsInfo(filter, function(err, value) { console.info("formProvider::GetFormsInfoTest err: " + JSON.stringify(err)); console.info("formProvider::GetFormsInfoTest value: " + JSON.stringify(value)); - expect(err.code).assertEqual(0); + expect(err).assertEqual(null); expect(value.length).assertEqual(0); done(); }); diff --git a/ability/ability_runtime/formmanager/stage/actsformprovidergetformsinfo/module1/src/main/ets/Application/AbilityStage.ts b/ability/ability_runtime/formmanager/stage/actsformprovidergetformsinfo/module1/src/main/ets/Application/AbilityStage.ts index 6ceb0c290ae831a45143a5e2b42d4351f2fc3d7e..3745b4557c4d87274ed1fd9e5efef51b63d4ceca 100644 --- a/ability/ability_runtime/formmanager/stage/actsformprovidergetformsinfo/module1/src/main/ets/Application/AbilityStage.ts +++ b/ability/ability_runtime/formmanager/stage/actsformprovidergetformsinfo/module1/src/main/ets/Application/AbilityStage.ts @@ -12,7 +12,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -import AbilityStage from "@ohos.application.AbilityStage" +import AbilityStage from "@ohos.app.ability.AbilityStage" export default class MyAbilityStage extends AbilityStage { onCreate() { diff --git a/ability/ability_runtime/formmanager/stage/actsformprovidergetformsinfo/module1/src/main/ets/FormAbility/FormAbility.ts b/ability/ability_runtime/formmanager/stage/actsformprovidergetformsinfo/module1/src/main/ets/FormAbility/FormAbility.ts index 2748635acfe5697f7a153fc0e98ea255714c84c7..68ad94558758d5183bf00b1c51d826191693989a 100644 --- a/ability/ability_runtime/formmanager/stage/actsformprovidergetformsinfo/module1/src/main/ets/FormAbility/FormAbility.ts +++ b/ability/ability_runtime/formmanager/stage/actsformprovidergetformsinfo/module1/src/main/ets/FormAbility/FormAbility.ts @@ -12,35 +12,35 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -import FormExtension from '@ohos.application.FormExtension'; +import FormExtension from '@ohos.app.form.FormExtensionAbility'; import formBindingData from '@ohos.application.formBindingData'; import formInfo from '@ohos.application.formInfo'; export default class FormAbility extends FormExtension { - onCreate(want) { + onAddForm(want) { // Called to return a FormBindingData object. let formData = {}; return formBindingData.createFormBindingData(formData); } - onCastToNormal(formId) { + onCastToNormalForm(formId) { // Called when the form provider is notified that a temporary form is successfully // converted to a normal form. } - onUpdate(formId) { + onUpdateForm(formId) { // Called to notify the form provider to update a specified form. } - onVisibilityChange(newStatus) { + onChangeFormVisibility(newStatus) { // Called when the form provider receives form events from the system. } - onEvent(formId, message) { + onFormEvent(formId, message) { // Called when a specified message event defined by the form provider is triggered. } - onDestroy(formId) { + onRemoveForm(formId) { // Called to notify the form provider that a specified form has been destroyed. } diff --git a/ability/ability_runtime/formmanager/stage/actsformprovidergetformsinfo/module1/src/main/ets/MainAbility/MainAbility.ts b/ability/ability_runtime/formmanager/stage/actsformprovidergetformsinfo/module1/src/main/ets/MainAbility/MainAbility.ts index 92e4e8922723c781776d205b211d999c61e96725..9008f995897f37773fbeb9ec3b3f6d47ae6601e0 100644 --- a/ability/ability_runtime/formmanager/stage/actsformprovidergetformsinfo/module1/src/main/ets/MainAbility/MainAbility.ts +++ b/ability/ability_runtime/formmanager/stage/actsformprovidergetformsinfo/module1/src/main/ets/MainAbility/MainAbility.ts @@ -12,7 +12,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -import Ability from '@ohos.application.Ability' +import Ability from '@ohos.app.ability.UIAbility' export default class MainAbility extends Ability { onCreate(want, launchParam) { diff --git a/ability/ability_runtime/formmanager/stage/actsformprovidergetformsinfo/module2/src/main/ets/Application/AbilityStage.ts b/ability/ability_runtime/formmanager/stage/actsformprovidergetformsinfo/module2/src/main/ets/Application/AbilityStage.ts index 6ceb0c290ae831a45143a5e2b42d4351f2fc3d7e..3745b4557c4d87274ed1fd9e5efef51b63d4ceca 100644 --- a/ability/ability_runtime/formmanager/stage/actsformprovidergetformsinfo/module2/src/main/ets/Application/AbilityStage.ts +++ b/ability/ability_runtime/formmanager/stage/actsformprovidergetformsinfo/module2/src/main/ets/Application/AbilityStage.ts @@ -12,7 +12,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -import AbilityStage from "@ohos.application.AbilityStage" +import AbilityStage from "@ohos.app.ability.AbilityStage" export default class MyAbilityStage extends AbilityStage { onCreate() { diff --git a/ability/ability_runtime/formmanager/stage/actsformprovidergetformsinfo/module2/src/main/ets/FormAbility/FormAbility.ts b/ability/ability_runtime/formmanager/stage/actsformprovidergetformsinfo/module2/src/main/ets/FormAbility/FormAbility.ts index 2748635acfe5697f7a153fc0e98ea255714c84c7..68ad94558758d5183bf00b1c51d826191693989a 100644 --- a/ability/ability_runtime/formmanager/stage/actsformprovidergetformsinfo/module2/src/main/ets/FormAbility/FormAbility.ts +++ b/ability/ability_runtime/formmanager/stage/actsformprovidergetformsinfo/module2/src/main/ets/FormAbility/FormAbility.ts @@ -12,35 +12,35 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -import FormExtension from '@ohos.application.FormExtension'; +import FormExtension from '@ohos.app.form.FormExtensionAbility'; import formBindingData from '@ohos.application.formBindingData'; import formInfo from '@ohos.application.formInfo'; export default class FormAbility extends FormExtension { - onCreate(want) { + onAddForm(want) { // Called to return a FormBindingData object. let formData = {}; return formBindingData.createFormBindingData(formData); } - onCastToNormal(formId) { + onCastToNormalForm(formId) { // Called when the form provider is notified that a temporary form is successfully // converted to a normal form. } - onUpdate(formId) { + onUpdateForm(formId) { // Called to notify the form provider to update a specified form. } - onVisibilityChange(newStatus) { + onChangeFormVisibility(newStatus) { // Called when the form provider receives form events from the system. } - onEvent(formId, message) { + onFormEvent(formId, message) { // Called when a specified message event defined by the form provider is triggered. } - onDestroy(formId) { + onRemoveForm(formId) { // Called to notify the form provider that a specified form has been destroyed. } diff --git a/ability/ability_runtime/formmanager/stage/actsformprovidergetformsinfo/module2/src/main/ets/MainAbility/MainAbility.ts b/ability/ability_runtime/formmanager/stage/actsformprovidergetformsinfo/module2/src/main/ets/MainAbility/MainAbility.ts index 92e4e8922723c781776d205b211d999c61e96725..9008f995897f37773fbeb9ec3b3f6d47ae6601e0 100644 --- a/ability/ability_runtime/formmanager/stage/actsformprovidergetformsinfo/module2/src/main/ets/MainAbility/MainAbility.ts +++ b/ability/ability_runtime/formmanager/stage/actsformprovidergetformsinfo/module2/src/main/ets/MainAbility/MainAbility.ts @@ -12,7 +12,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -import Ability from '@ohos.application.Ability' +import Ability from '@ohos.app.ability.UIAbility' export default class MainAbility extends Ability { onCreate(want, launchParam) { diff --git a/ability/ability_runtime/freeinstalltest/connectabilityfatest/actsfreeinstallconnectabilityfatest/entry/src/main/ets/MainAbility/test/ConnectAbilityTest.ets b/ability/ability_runtime/freeinstalltest/connectabilityfatest/actsfreeinstallconnectabilityfatest/entry/src/main/ets/MainAbility/test/ConnectAbilityTest.ets index 3d26b03273556a59ca9c9caa3ae2a53775cd2a30..bbc190f0d6cfb5d4a1c50c2aa8f384d48e091d95 100644 --- a/ability/ability_runtime/freeinstalltest/connectabilityfatest/actsfreeinstallconnectabilityfatest/entry/src/main/ets/MainAbility/test/ConnectAbilityTest.ets +++ b/ability/ability_runtime/freeinstalltest/connectabilityfatest/actsfreeinstallconnectabilityfatest/entry/src/main/ets/MainAbility/test/ConnectAbilityTest.ets @@ -20,7 +20,7 @@ import rpc from '@ohos.rpc'; import featureAbility from '@ohos.ability.featureAbility'; import wantConstant from '@ohos.ability.wantConstant' import Prompt from '@system.prompt'; -import abilityManager from '@ohos.application.abilityManager'; +import abilityManager from '@ohos.app.ability.abilityManager'; import AbilityDelegatorRegistry from '@ohos.application.abilityDelegatorRegistry' diff --git a/ability/ability_runtime/freeinstalltest/connectabilityfatest/connectdifferentapplication/entry/src/main/ets/Application/AbilityStage.ts b/ability/ability_runtime/freeinstalltest/connectabilityfatest/connectdifferentapplication/entry/src/main/ets/Application/AbilityStage.ts index 9090e1e7a8394d1a945a06bf33cd1931f5da367d..edfe8d7e07c454f659c1cea2713f3c13dae26b5f 100644 --- a/ability/ability_runtime/freeinstalltest/connectabilityfatest/connectdifferentapplication/entry/src/main/ets/Application/AbilityStage.ts +++ b/ability/ability_runtime/freeinstalltest/connectabilityfatest/connectdifferentapplication/entry/src/main/ets/Application/AbilityStage.ts @@ -13,7 +13,7 @@ * limitations under the License. */ -import AbilityStage from "@ohos.application.AbilityStage" +import AbilityStage from "@ohos.app.ability.AbilityStage" export default class MyAbilityStage extends AbilityStage { onCreate() { diff --git a/ability/ability_runtime/freeinstalltest/connectabilityfatest/connectdifferentapplication/entry/src/main/ets/MainAbility/MainAbility.ts b/ability/ability_runtime/freeinstalltest/connectabilityfatest/connectdifferentapplication/entry/src/main/ets/MainAbility/MainAbility.ts index a3b93f8a076da63136ae275c28ebec9ba032ddeb..61ee95bae89af46d2d25898f0bc9c713b39e0cc9 100644 --- a/ability/ability_runtime/freeinstalltest/connectabilityfatest/connectdifferentapplication/entry/src/main/ets/MainAbility/MainAbility.ts +++ b/ability/ability_runtime/freeinstalltest/connectabilityfatest/connectdifferentapplication/entry/src/main/ets/MainAbility/MainAbility.ts @@ -13,7 +13,7 @@ * limitations under the License. */ -import Ability from '@ohos.application.Ability' +import Ability from '@ohos.app.ability.UIAbility' export default class MainAbility extends Ability { onCreate(want, launchParam) { diff --git a/ability/ability_runtime/freeinstalltest/mockservice/entry/src/main/ets/Application/AbilityStage.ts b/ability/ability_runtime/freeinstalltest/mockservice/entry/src/main/ets/Application/AbilityStage.ts index b3f3c306081d07be09d4367c3aa27b13cf57f046..bcdd947686bff32663fc19386dc826e4dad19ceb 100644 --- a/ability/ability_runtime/freeinstalltest/mockservice/entry/src/main/ets/Application/AbilityStage.ts +++ b/ability/ability_runtime/freeinstalltest/mockservice/entry/src/main/ets/Application/AbilityStage.ts @@ -13,7 +13,7 @@ * limitations under the License. */ -import AbilityStage from "@ohos.application.AbilityStage" +import AbilityStage from "@ohos.app.ability.AbilityStage" export default class MyAbilityStage extends AbilityStage { onCreate() { diff --git a/ability/ability_runtime/freeinstalltest/mockservice/entry/src/main/ets/MainAbility/MainAbility.ts b/ability/ability_runtime/freeinstalltest/mockservice/entry/src/main/ets/MainAbility/MainAbility.ts index 1e29b8b56f5d88da231bf45e2e0a093ff4d8961d..6039469310ec5c9a6ab7e6ddededaf9a857d72d4 100644 --- a/ability/ability_runtime/freeinstalltest/mockservice/entry/src/main/ets/MainAbility/MainAbility.ts +++ b/ability/ability_runtime/freeinstalltest/mockservice/entry/src/main/ets/MainAbility/MainAbility.ts @@ -13,7 +13,7 @@ * limitations under the License. */ -import Ability from '@ohos.application.Ability' +import Ability from '@ohos.app.ability.UIAbility' export default class MainAbility extends Ability { onCreate(want, launchParam) { diff --git a/ability/ability_runtime/freeinstalltest/mockservicetimeout/entry/src/main/ets/Application/AbilityStage.ts b/ability/ability_runtime/freeinstalltest/mockservicetimeout/entry/src/main/ets/Application/AbilityStage.ts index b3f3c306081d07be09d4367c3aa27b13cf57f046..bcdd947686bff32663fc19386dc826e4dad19ceb 100644 --- a/ability/ability_runtime/freeinstalltest/mockservicetimeout/entry/src/main/ets/Application/AbilityStage.ts +++ b/ability/ability_runtime/freeinstalltest/mockservicetimeout/entry/src/main/ets/Application/AbilityStage.ts @@ -13,7 +13,7 @@ * limitations under the License. */ -import AbilityStage from "@ohos.application.AbilityStage" +import AbilityStage from "@ohos.app.ability.AbilityStage" export default class MyAbilityStage extends AbilityStage { onCreate() { diff --git a/ability/ability_runtime/freeinstalltest/mockservicetimeout/entry/src/main/ets/MainAbility/MainAbility.ts b/ability/ability_runtime/freeinstalltest/mockservicetimeout/entry/src/main/ets/MainAbility/MainAbility.ts index 1e29b8b56f5d88da231bf45e2e0a093ff4d8961d..6039469310ec5c9a6ab7e6ddededaf9a857d72d4 100644 --- a/ability/ability_runtime/freeinstalltest/mockservicetimeout/entry/src/main/ets/MainAbility/MainAbility.ts +++ b/ability/ability_runtime/freeinstalltest/mockservicetimeout/entry/src/main/ets/MainAbility/MainAbility.ts @@ -13,7 +13,7 @@ * limitations under the License. */ -import Ability from '@ohos.application.Ability' +import Ability from '@ohos.app.ability.UIAbility' export default class MainAbility extends Ability { onCreate(want, launchParam) { diff --git a/ability/ability_runtime/freeinstalltest/startabilityforresultstagetest/actsfreeinstallstartabilityforresultstagetest/entry/src/main/ets/Application/AbilityStage.ts b/ability/ability_runtime/freeinstalltest/startabilityforresultstagetest/actsfreeinstallstartabilityforresultstagetest/entry/src/main/ets/Application/AbilityStage.ts index 396606ff7396988f0849e54a294700ad86e22678..9ee1aa9fbe29ab663a8171935457969972573fca 100644 --- a/ability/ability_runtime/freeinstalltest/startabilityforresultstagetest/actsfreeinstallstartabilityforresultstagetest/entry/src/main/ets/Application/AbilityStage.ts +++ b/ability/ability_runtime/freeinstalltest/startabilityforresultstagetest/actsfreeinstallstartabilityforresultstagetest/entry/src/main/ets/Application/AbilityStage.ts @@ -13,7 +13,7 @@ * limitations under the License. */ -import AbilityStage from "@ohos.application.AbilityStage" +import AbilityStage from "@ohos.app.ability.AbilityStage" export default class MyAbilityStage extends AbilityStage { onCreate() { diff --git a/ability/ability_runtime/freeinstalltest/startabilityforresultstagetest/actsfreeinstallstartabilityforresultstagetest/entry/src/main/ets/MainAbility/MainAbility.ts b/ability/ability_runtime/freeinstalltest/startabilityforresultstagetest/actsfreeinstallstartabilityforresultstagetest/entry/src/main/ets/MainAbility/MainAbility.ts index 2879c19bb8224886f189e4cab1b57a99a1c97e9f..02a2a10958c5f513ed3c2002074e995d9981aa7d 100644 --- a/ability/ability_runtime/freeinstalltest/startabilityforresultstagetest/actsfreeinstallstartabilityforresultstagetest/entry/src/main/ets/MainAbility/MainAbility.ts +++ b/ability/ability_runtime/freeinstalltest/startabilityforresultstagetest/actsfreeinstallstartabilityforresultstagetest/entry/src/main/ets/MainAbility/MainAbility.ts @@ -13,7 +13,7 @@ * limitations under the License. */ -import Ability from '@ohos.application.Ability'; +import Ability from '@ohos.app.ability.UIAbility'; export default class MainAbility extends Ability { diff --git a/ability/ability_runtime/freeinstalltest/startabilityforresultstagetest/actsfreeinstallstartabilityforresultstagetest/entry/src/main/ets/test/StartAbilityForResult.ets b/ability/ability_runtime/freeinstalltest/startabilityforresultstagetest/actsfreeinstallstartabilityforresultstagetest/entry/src/main/ets/test/StartAbilityForResult.ets index 3eb0e037dfdecf1a7d97ccd5e52386db1bb649cc..bb7864f60bfa9de7c242d1c1acb827a6b7523850 100644 --- a/ability/ability_runtime/freeinstalltest/startabilityforresultstagetest/actsfreeinstallstartabilityforresultstagetest/entry/src/main/ets/test/StartAbilityForResult.ets +++ b/ability/ability_runtime/freeinstalltest/startabilityforresultstagetest/actsfreeinstallstartabilityforresultstagetest/entry/src/main/ets/test/StartAbilityForResult.ets @@ -15,11 +15,11 @@ */ import { describe, beforeAll, beforeEach, afterEach, afterAll, it, expect } from "@ohos/hypium" -import ability from '@ohos.application.Ability' +import ability from '@ohos.app.ability.UIAbility' import rpc from '@ohos.rpc'; import wantConstant from '@ohos.ability.wantConstant' import Prompt from '@system.prompt'; -import abilityManager from '@ohos.application.abilityManager'; +import abilityManager from '@ohos.app.ability.abilityManager'; export default function StartAbilityForResult(abilityContext) { diff --git a/ability/ability_runtime/freeinstalltest/startabilityforresultstagetest/actsstartabilityforresultnotargetbundleliststagetest/entry/src/main/ets/Application/AbilityStage.ts b/ability/ability_runtime/freeinstalltest/startabilityforresultstagetest/actsstartabilityforresultnotargetbundleliststagetest/entry/src/main/ets/Application/AbilityStage.ts index 396606ff7396988f0849e54a294700ad86e22678..9ee1aa9fbe29ab663a8171935457969972573fca 100644 --- a/ability/ability_runtime/freeinstalltest/startabilityforresultstagetest/actsstartabilityforresultnotargetbundleliststagetest/entry/src/main/ets/Application/AbilityStage.ts +++ b/ability/ability_runtime/freeinstalltest/startabilityforresultstagetest/actsstartabilityforresultnotargetbundleliststagetest/entry/src/main/ets/Application/AbilityStage.ts @@ -13,7 +13,7 @@ * limitations under the License. */ -import AbilityStage from "@ohos.application.AbilityStage" +import AbilityStage from "@ohos.app.ability.AbilityStage" export default class MyAbilityStage extends AbilityStage { onCreate() { diff --git a/ability/ability_runtime/freeinstalltest/startabilityforresultstagetest/actsstartabilityforresultnotargetbundleliststagetest/entry/src/main/ets/MainAbility/MainAbility.ts b/ability/ability_runtime/freeinstalltest/startabilityforresultstagetest/actsstartabilityforresultnotargetbundleliststagetest/entry/src/main/ets/MainAbility/MainAbility.ts index 2879c19bb8224886f189e4cab1b57a99a1c97e9f..02a2a10958c5f513ed3c2002074e995d9981aa7d 100644 --- a/ability/ability_runtime/freeinstalltest/startabilityforresultstagetest/actsstartabilityforresultnotargetbundleliststagetest/entry/src/main/ets/MainAbility/MainAbility.ts +++ b/ability/ability_runtime/freeinstalltest/startabilityforresultstagetest/actsstartabilityforresultnotargetbundleliststagetest/entry/src/main/ets/MainAbility/MainAbility.ts @@ -13,7 +13,7 @@ * limitations under the License. */ -import Ability from '@ohos.application.Ability'; +import Ability from '@ohos.app.ability.UIAbility'; export default class MainAbility extends Ability { diff --git a/ability/ability_runtime/freeinstalltest/startabilityforresultstagetest/actsstartabilityforresultnotargetbundleliststagetest/entry/src/main/ets/test/StartAbilityForResult.ets b/ability/ability_runtime/freeinstalltest/startabilityforresultstagetest/actsstartabilityforresultnotargetbundleliststagetest/entry/src/main/ets/test/StartAbilityForResult.ets index 1fec9b2bffedd6a754455c587879bf956e9fe7dc..bb18e341f133c11d6c6ec184b671a2318ccca1b0 100644 --- a/ability/ability_runtime/freeinstalltest/startabilityforresultstagetest/actsstartabilityforresultnotargetbundleliststagetest/entry/src/main/ets/test/StartAbilityForResult.ets +++ b/ability/ability_runtime/freeinstalltest/startabilityforresultstagetest/actsstartabilityforresultnotargetbundleliststagetest/entry/src/main/ets/test/StartAbilityForResult.ets @@ -15,7 +15,7 @@ */ import { describe, beforeAll, beforeEach, afterEach, afterAll, it, expect } from "@ohos/hypium" -import ability from '@ohos.application.Ability' +import ability from '@ohos.app.ability.UIAbility' import rpc from '@ohos.rpc'; import wantConstant from '@ohos.ability.wantConstant' import Prompt from '@system.prompt'; diff --git a/ability/ability_runtime/freeinstalltest/startabilityforresultstagetest/atomizationresultstageentry/entry/src/main/ets/Application/AbilityStage.ts b/ability/ability_runtime/freeinstalltest/startabilityforresultstagetest/atomizationresultstageentry/entry/src/main/ets/Application/AbilityStage.ts index 396606ff7396988f0849e54a294700ad86e22678..9ee1aa9fbe29ab663a8171935457969972573fca 100644 --- a/ability/ability_runtime/freeinstalltest/startabilityforresultstagetest/atomizationresultstageentry/entry/src/main/ets/Application/AbilityStage.ts +++ b/ability/ability_runtime/freeinstalltest/startabilityforresultstagetest/atomizationresultstageentry/entry/src/main/ets/Application/AbilityStage.ts @@ -13,7 +13,7 @@ * limitations under the License. */ -import AbilityStage from "@ohos.application.AbilityStage" +import AbilityStage from "@ohos.app.ability.AbilityStage" export default class MyAbilityStage extends AbilityStage { onCreate() { diff --git a/ability/ability_runtime/freeinstalltest/startabilityforresultstagetest/atomizationresultstageentry/entry/src/main/ets/MainAbility/MainAbility.ts b/ability/ability_runtime/freeinstalltest/startabilityforresultstagetest/atomizationresultstageentry/entry/src/main/ets/MainAbility/MainAbility.ts index 6a7c9df682d496822f9dc34ea86969f0d9dad119..91d72c9e1acd60ed4bdefacbd1fda6cca563debd 100644 --- a/ability/ability_runtime/freeinstalltest/startabilityforresultstagetest/atomizationresultstageentry/entry/src/main/ets/MainAbility/MainAbility.ts +++ b/ability/ability_runtime/freeinstalltest/startabilityforresultstagetest/atomizationresultstageentry/entry/src/main/ets/MainAbility/MainAbility.ts @@ -13,7 +13,7 @@ * limitations under the License. */ -import Ability from '@ohos.application.Ability' +import Ability from '@ohos.app.ability.UIAbility' export default class MainAbility extends Ability { onCreate(want, launchParam) { diff --git a/ability/ability_runtime/freeinstalltest/startabilityforresultstagetest/atomizationresultstagehm2/entry/src/main/ets/Application/AbilityStage.ts b/ability/ability_runtime/freeinstalltest/startabilityforresultstagetest/atomizationresultstagehm2/entry/src/main/ets/Application/AbilityStage.ts index 396606ff7396988f0849e54a294700ad86e22678..9ee1aa9fbe29ab663a8171935457969972573fca 100644 --- a/ability/ability_runtime/freeinstalltest/startabilityforresultstagetest/atomizationresultstagehm2/entry/src/main/ets/Application/AbilityStage.ts +++ b/ability/ability_runtime/freeinstalltest/startabilityforresultstagetest/atomizationresultstagehm2/entry/src/main/ets/Application/AbilityStage.ts @@ -13,7 +13,7 @@ * limitations under the License. */ -import AbilityStage from "@ohos.application.AbilityStage" +import AbilityStage from "@ohos.app.ability.AbilityStage" export default class MyAbilityStage extends AbilityStage { onCreate() { diff --git a/ability/ability_runtime/freeinstalltest/startabilityforresultstagetest/atomizationresultstagehm2/entry/src/main/ets/MainAbility/MainAbility.ts b/ability/ability_runtime/freeinstalltest/startabilityforresultstagetest/atomizationresultstagehm2/entry/src/main/ets/MainAbility/MainAbility.ts index 4efeca31a9e028332c29370a1f1c5d0e738f6af2..66b0642faff4c51aca2dbdbbe7fd0096f8da2850 100644 --- a/ability/ability_runtime/freeinstalltest/startabilityforresultstagetest/atomizationresultstagehm2/entry/src/main/ets/MainAbility/MainAbility.ts +++ b/ability/ability_runtime/freeinstalltest/startabilityforresultstagetest/atomizationresultstagehm2/entry/src/main/ets/MainAbility/MainAbility.ts @@ -13,7 +13,7 @@ * limitations under the License. */ -import Ability from '@ohos.application.Ability' +import Ability from '@ohos.app.ability.UIAbility' export default class MainAbility extends Ability { onCreate(want, launchParam) { diff --git a/ability/ability_runtime/freeinstalltest/startabilityforresultstagetest/atomizationresultstagehnm2/entry/src/main/ets/Application/AbilityStage.ts b/ability/ability_runtime/freeinstalltest/startabilityforresultstagetest/atomizationresultstagehnm2/entry/src/main/ets/Application/AbilityStage.ts index 396606ff7396988f0849e54a294700ad86e22678..9ee1aa9fbe29ab663a8171935457969972573fca 100644 --- a/ability/ability_runtime/freeinstalltest/startabilityforresultstagetest/atomizationresultstagehnm2/entry/src/main/ets/Application/AbilityStage.ts +++ b/ability/ability_runtime/freeinstalltest/startabilityforresultstagetest/atomizationresultstagehnm2/entry/src/main/ets/Application/AbilityStage.ts @@ -13,7 +13,7 @@ * limitations under the License. */ -import AbilityStage from "@ohos.application.AbilityStage" +import AbilityStage from "@ohos.app.ability.AbilityStage" export default class MyAbilityStage extends AbilityStage { onCreate() { diff --git a/ability/ability_runtime/freeinstalltest/startabilityforresultstagetest/atomizationresultstagehnm2/entry/src/main/ets/MainAbility/MainAbility.ts b/ability/ability_runtime/freeinstalltest/startabilityforresultstagetest/atomizationresultstagehnm2/entry/src/main/ets/MainAbility/MainAbility.ts index 4efeca31a9e028332c29370a1f1c5d0e738f6af2..66b0642faff4c51aca2dbdbbe7fd0096f8da2850 100644 --- a/ability/ability_runtime/freeinstalltest/startabilityforresultstagetest/atomizationresultstagehnm2/entry/src/main/ets/MainAbility/MainAbility.ts +++ b/ability/ability_runtime/freeinstalltest/startabilityforresultstagetest/atomizationresultstagehnm2/entry/src/main/ets/MainAbility/MainAbility.ts @@ -13,7 +13,7 @@ * limitations under the License. */ -import Ability from '@ohos.application.Ability' +import Ability from '@ohos.app.ability.UIAbility' export default class MainAbility extends Ability { onCreate(want, launchParam) { diff --git a/ability/ability_runtime/freeinstalltest/startabilityforresultstagetest/stageresultmyapplication1/entry/src/main/ets/Application/AbilityStage.ts b/ability/ability_runtime/freeinstalltest/startabilityforresultstagetest/stageresultmyapplication1/entry/src/main/ets/Application/AbilityStage.ts index b3f3c306081d07be09d4367c3aa27b13cf57f046..bcdd947686bff32663fc19386dc826e4dad19ceb 100644 --- a/ability/ability_runtime/freeinstalltest/startabilityforresultstagetest/stageresultmyapplication1/entry/src/main/ets/Application/AbilityStage.ts +++ b/ability/ability_runtime/freeinstalltest/startabilityforresultstagetest/stageresultmyapplication1/entry/src/main/ets/Application/AbilityStage.ts @@ -13,7 +13,7 @@ * limitations under the License. */ -import AbilityStage from "@ohos.application.AbilityStage" +import AbilityStage from "@ohos.app.ability.AbilityStage" export default class MyAbilityStage extends AbilityStage { onCreate() { diff --git a/ability/ability_runtime/freeinstalltest/startabilityforresultstagetest/stageresultmyapplication1/entry/src/main/ets/MainAbility1/MainAbility1.ts b/ability/ability_runtime/freeinstalltest/startabilityforresultstagetest/stageresultmyapplication1/entry/src/main/ets/MainAbility1/MainAbility1.ts index 1031a55f562925339bd4cdf6cec4e74ad14060ad..642d29d643b70fa531f3904900d466900b68c07f 100644 --- a/ability/ability_runtime/freeinstalltest/startabilityforresultstagetest/stageresultmyapplication1/entry/src/main/ets/MainAbility1/MainAbility1.ts +++ b/ability/ability_runtime/freeinstalltest/startabilityforresultstagetest/stageresultmyapplication1/entry/src/main/ets/MainAbility1/MainAbility1.ts @@ -13,7 +13,7 @@ * limitations under the License. */ -import Ability from '@ohos.application.Ability' +import Ability from '@ohos.app.ability.UIAbility' export default class MainAbility1 extends Ability { onCreate(want, launchParam) { diff --git a/ability/ability_runtime/freeinstalltest/startabilitystagetest/actsfreeinstallstartabilitystagetest/entry/src/main/ets/Application/AbilityStage.ts b/ability/ability_runtime/freeinstalltest/startabilitystagetest/actsfreeinstallstartabilitystagetest/entry/src/main/ets/Application/AbilityStage.ts index b3f3c306081d07be09d4367c3aa27b13cf57f046..bcdd947686bff32663fc19386dc826e4dad19ceb 100644 --- a/ability/ability_runtime/freeinstalltest/startabilitystagetest/actsfreeinstallstartabilitystagetest/entry/src/main/ets/Application/AbilityStage.ts +++ b/ability/ability_runtime/freeinstalltest/startabilitystagetest/actsfreeinstallstartabilitystagetest/entry/src/main/ets/Application/AbilityStage.ts @@ -13,7 +13,7 @@ * limitations under the License. */ -import AbilityStage from "@ohos.application.AbilityStage" +import AbilityStage from "@ohos.app.ability.AbilityStage" export default class MyAbilityStage extends AbilityStage { onCreate() { diff --git a/ability/ability_runtime/freeinstalltest/startabilitystagetest/actsfreeinstallstartabilitystagetest/entry/src/main/ets/FormAbility/FormAbility.ts b/ability/ability_runtime/freeinstalltest/startabilitystagetest/actsfreeinstallstartabilitystagetest/entry/src/main/ets/FormAbility/FormAbility.ts index f8c8f1dd9780f433952af29d2050109185fa2869..275cc016d2960d35b68edd0faefd7c94ad156fe4 100644 --- a/ability/ability_runtime/freeinstalltest/startabilitystagetest/actsfreeinstallstartabilitystagetest/entry/src/main/ets/FormAbility/FormAbility.ts +++ b/ability/ability_runtime/freeinstalltest/startabilitystagetest/actsfreeinstallstartabilitystagetest/entry/src/main/ets/FormAbility/FormAbility.ts @@ -13,35 +13,35 @@ * limitations under the License. */ -import FormExtension from '@ohos.application.FormExtension'; +import FormExtension from '@ohos.app.form.FormExtensionAbility'; import formBindingData from '@ohos.application.formBindingData'; import formInfo from '@ohos.application.formInfo'; export default class FormAbility extends FormExtension { - onCreate(want) { + onAddForm(want) { // Called to return a FormBindingData object. let formData = {}; return formBindingData.createFormBindingData(formData); } - onCastToNormal(formId) { + onCastToNormalForm(formId) { // Called when the form provider is notified that a temporary form is successfully // converted to a normal form. } - onUpdate(formId) { + onUpdateForm(formId) { // Called to notify the form provider to update a specified form. } - onVisibilityChange(newStatus) { + onChangeFormVisibility(newStatus) { // Called when the form provider receives form events from the system. } - onEvent(formId, message) { + onFormEvent(formId, message) { // Called when a specified message event defined by the form provider is triggered. } - onDestroy(formId) { + onRemoveForm(formId) { // Called to notify the form provider that a specified form has been destroyed. } diff --git a/ability/ability_runtime/freeinstalltest/startabilitystagetest/actsfreeinstallstartabilitystagetest/entry/src/main/ets/MainAbility/MainAbility.ts b/ability/ability_runtime/freeinstalltest/startabilitystagetest/actsfreeinstallstartabilitystagetest/entry/src/main/ets/MainAbility/MainAbility.ts index 9dca45fbb5d2120f45d00a5c542d6ca4139a5e12..f426ea529a903dfdc41e1b9819f0c1d08a2e5ed1 100644 --- a/ability/ability_runtime/freeinstalltest/startabilitystagetest/actsfreeinstallstartabilitystagetest/entry/src/main/ets/MainAbility/MainAbility.ts +++ b/ability/ability_runtime/freeinstalltest/startabilitystagetest/actsfreeinstallstartabilitystagetest/entry/src/main/ets/MainAbility/MainAbility.ts @@ -13,7 +13,7 @@ * limitations under the License. */ -import Ability from '@ohos.application.Ability' +import Ability from '@ohos.app.ability.UIAbility' export default class MainAbility extends Ability { onCreate(want, launchParam) { diff --git a/ability/ability_runtime/freeinstalltest/startabilitystagetest/actsfreeinstallstartabilitystagetest/entry/src/main/ets/MainAbility1/MainAbility1.ts b/ability/ability_runtime/freeinstalltest/startabilitystagetest/actsfreeinstallstartabilitystagetest/entry/src/main/ets/MainAbility1/MainAbility1.ts index a7b04f832a011809d9ef8a5f5d67c10d5951a3b8..334d785ab2e24d7b267ff5981505287c4a7f70c7 100644 --- a/ability/ability_runtime/freeinstalltest/startabilitystagetest/actsfreeinstallstartabilitystagetest/entry/src/main/ets/MainAbility1/MainAbility1.ts +++ b/ability/ability_runtime/freeinstalltest/startabilitystagetest/actsfreeinstallstartabilitystagetest/entry/src/main/ets/MainAbility1/MainAbility1.ts @@ -13,7 +13,7 @@ * limitations under the License. */ -import Ability from '@ohos.application.Ability' +import Ability from '@ohos.app.ability.UIAbility' export default class MainAbility1 extends Ability { onCreate(want, launchParam) { diff --git a/ability/ability_runtime/freeinstalltest/startabilitystagetest/actsfreeinstallstartabilitystagetest/entry/src/main/ets/test/StartAbilityTest.ets b/ability/ability_runtime/freeinstalltest/startabilitystagetest/actsfreeinstallstartabilitystagetest/entry/src/main/ets/test/StartAbilityTest.ets index 537d41391cbcfb41e475ceb559222b746e59c241..de3094a788a367b8211b6fff5152355e3b2bc63c 100644 --- a/ability/ability_runtime/freeinstalltest/startabilitystagetest/actsfreeinstallstartabilitystagetest/entry/src/main/ets/test/StartAbilityTest.ets +++ b/ability/ability_runtime/freeinstalltest/startabilitystagetest/actsfreeinstallstartabilitystagetest/entry/src/main/ets/test/StartAbilityTest.ets @@ -17,11 +17,11 @@ */ import { describe, beforeAll, beforeEach, afterEach, afterAll, it, expect } from "@ohos/hypium" -import ability from '@ohos.application.Ability' +import ability from '@ohos.app.ability.UIAbility' import rpc from '@ohos.rpc'; import wantConstant from '@ohos.ability.wantConstant' import Prompt from '@system.prompt'; -import abilityManager from '@ohos.application.abilityManager'; +import abilityManager from '@ohos.app.ability.abilityManager'; import commonEvent from '@ohos.commonEvent'; const SYSTEM_INNER_ERROR = 16000050 diff --git a/ability/ability_runtime/freeinstalltest/startabilitystagetest/actsstartabilitynotargetbundleliststagetest/entry/src/main/ets/Application/AbilityStage.ts b/ability/ability_runtime/freeinstalltest/startabilitystagetest/actsstartabilitynotargetbundleliststagetest/entry/src/main/ets/Application/AbilityStage.ts index b3f3c306081d07be09d4367c3aa27b13cf57f046..bcdd947686bff32663fc19386dc826e4dad19ceb 100644 --- a/ability/ability_runtime/freeinstalltest/startabilitystagetest/actsstartabilitynotargetbundleliststagetest/entry/src/main/ets/Application/AbilityStage.ts +++ b/ability/ability_runtime/freeinstalltest/startabilitystagetest/actsstartabilitynotargetbundleliststagetest/entry/src/main/ets/Application/AbilityStage.ts @@ -13,7 +13,7 @@ * limitations under the License. */ -import AbilityStage from "@ohos.application.AbilityStage" +import AbilityStage from "@ohos.app.ability.AbilityStage" export default class MyAbilityStage extends AbilityStage { onCreate() { diff --git a/ability/ability_runtime/freeinstalltest/startabilitystagetest/actsstartabilitynotargetbundleliststagetest/entry/src/main/ets/MainAbility/MainAbility.ts b/ability/ability_runtime/freeinstalltest/startabilitystagetest/actsstartabilitynotargetbundleliststagetest/entry/src/main/ets/MainAbility/MainAbility.ts index 9dca45fbb5d2120f45d00a5c542d6ca4139a5e12..f426ea529a903dfdc41e1b9819f0c1d08a2e5ed1 100644 --- a/ability/ability_runtime/freeinstalltest/startabilitystagetest/actsstartabilitynotargetbundleliststagetest/entry/src/main/ets/MainAbility/MainAbility.ts +++ b/ability/ability_runtime/freeinstalltest/startabilitystagetest/actsstartabilitynotargetbundleliststagetest/entry/src/main/ets/MainAbility/MainAbility.ts @@ -13,7 +13,7 @@ * limitations under the License. */ -import Ability from '@ohos.application.Ability' +import Ability from '@ohos.app.ability.UIAbility' export default class MainAbility extends Ability { onCreate(want, launchParam) { diff --git a/ability/ability_runtime/freeinstalltest/startabilitystagetest/actsstartabilitynotargetbundleliststagetest/entry/src/main/ets/test/StartAbilityTest.ets b/ability/ability_runtime/freeinstalltest/startabilitystagetest/actsstartabilitynotargetbundleliststagetest/entry/src/main/ets/test/StartAbilityTest.ets index 0885d2aca087546723948b822acf1904f1efe377..1f0e8793d2fe0ae636b57e06a0115556d1a168cd 100644 --- a/ability/ability_runtime/freeinstalltest/startabilitystagetest/actsstartabilitynotargetbundleliststagetest/entry/src/main/ets/test/StartAbilityTest.ets +++ b/ability/ability_runtime/freeinstalltest/startabilitystagetest/actsstartabilitynotargetbundleliststagetest/entry/src/main/ets/test/StartAbilityTest.ets @@ -16,7 +16,7 @@ */ import { describe, beforeAll, beforeEach, afterEach, afterAll, it, expect } from "@ohos/hypium" -import ability from '@ohos.application.Ability' +import ability from '@ohos.app.ability.UIAbility' import rpc from '@ohos.rpc'; import wantConstant from '@ohos.ability.wantConstant' import Prompt from '@system.prompt'; diff --git a/ability/ability_runtime/freeinstalltest/startabilitystagetest/atomizationstageentry/entry/src/main/ets/Application/AbilityStage.ts b/ability/ability_runtime/freeinstalltest/startabilitystagetest/atomizationstageentry/entry/src/main/ets/Application/AbilityStage.ts index b3f3c306081d07be09d4367c3aa27b13cf57f046..bcdd947686bff32663fc19386dc826e4dad19ceb 100644 --- a/ability/ability_runtime/freeinstalltest/startabilitystagetest/atomizationstageentry/entry/src/main/ets/Application/AbilityStage.ts +++ b/ability/ability_runtime/freeinstalltest/startabilitystagetest/atomizationstageentry/entry/src/main/ets/Application/AbilityStage.ts @@ -13,7 +13,7 @@ * limitations under the License. */ -import AbilityStage from "@ohos.application.AbilityStage" +import AbilityStage from "@ohos.app.ability.AbilityStage" export default class MyAbilityStage extends AbilityStage { onCreate() { diff --git a/ability/ability_runtime/freeinstalltest/startabilitystagetest/atomizationstageentry/entry/src/main/ets/MainAbility/MainAbility.ts b/ability/ability_runtime/freeinstalltest/startabilitystagetest/atomizationstageentry/entry/src/main/ets/MainAbility/MainAbility.ts index 1e29b8b56f5d88da231bf45e2e0a093ff4d8961d..6039469310ec5c9a6ab7e6ddededaf9a857d72d4 100644 --- a/ability/ability_runtime/freeinstalltest/startabilitystagetest/atomizationstageentry/entry/src/main/ets/MainAbility/MainAbility.ts +++ b/ability/ability_runtime/freeinstalltest/startabilitystagetest/atomizationstageentry/entry/src/main/ets/MainAbility/MainAbility.ts @@ -13,7 +13,7 @@ * limitations under the License. */ -import Ability from '@ohos.application.Ability' +import Ability from '@ohos.app.ability.UIAbility' export default class MainAbility extends Ability { onCreate(want, launchParam) { diff --git a/ability/ability_runtime/freeinstalltest/startabilitystagetest/atomizationstageentry/entry/src/main/ets/ServiceAbility/ServiceAbility.ts b/ability/ability_runtime/freeinstalltest/startabilitystagetest/atomizationstageentry/entry/src/main/ets/ServiceAbility/ServiceAbility.ts index a40c991d3b5480e8485abd1ca0a790154bf4c83b..0c81a9f8d43a70bb7613d3e86668ce231fc52e37 100644 --- a/ability/ability_runtime/freeinstalltest/startabilitystagetest/atomizationstageentry/entry/src/main/ets/ServiceAbility/ServiceAbility.ts +++ b/ability/ability_runtime/freeinstalltest/startabilitystagetest/atomizationstageentry/entry/src/main/ets/ServiceAbility/ServiceAbility.ts @@ -13,11 +13,11 @@ * limitations under the License. */ -import FormExtension from '@ohos.application.FormExtension'; +import FormExtension from '@ohos.app.form.FormExtensionAbility'; import formBindingData from '@ohos.application.formBindingData'; export default class ServiceAbility extends FormExtension { - onCreate(want) { + onAddForm(want) { console.info('qianyiyingyong ServiceAbility onCreate'); let formData = {}; return formBindingData.createFormBindingData(formData); @@ -27,7 +27,7 @@ export default class ServiceAbility extends FormExtension { console.info('qianyiyingyong ServiceAbility onRequest'); } - onDestroy(formId) { + onRemoveForm(formId) { console.info('qianyiyingyong ServiceAbility onDestroy'); } }; \ No newline at end of file diff --git a/ability/ability_runtime/freeinstalltest/startabilitystagetest/atomizationstagehm2/entry/src/main/ets/Application/AbilityStage.ts b/ability/ability_runtime/freeinstalltest/startabilitystagetest/atomizationstagehm2/entry/src/main/ets/Application/AbilityStage.ts index b3f3c306081d07be09d4367c3aa27b13cf57f046..bcdd947686bff32663fc19386dc826e4dad19ceb 100644 --- a/ability/ability_runtime/freeinstalltest/startabilitystagetest/atomizationstagehm2/entry/src/main/ets/Application/AbilityStage.ts +++ b/ability/ability_runtime/freeinstalltest/startabilitystagetest/atomizationstagehm2/entry/src/main/ets/Application/AbilityStage.ts @@ -13,7 +13,7 @@ * limitations under the License. */ -import AbilityStage from "@ohos.application.AbilityStage" +import AbilityStage from "@ohos.app.ability.AbilityStage" export default class MyAbilityStage extends AbilityStage { onCreate() { diff --git a/ability/ability_runtime/freeinstalltest/startabilitystagetest/atomizationstagehm2/entry/src/main/ets/MainAbility/MainAbility.ts b/ability/ability_runtime/freeinstalltest/startabilitystagetest/atomizationstagehm2/entry/src/main/ets/MainAbility/MainAbility.ts index 1e29b8b56f5d88da231bf45e2e0a093ff4d8961d..6039469310ec5c9a6ab7e6ddededaf9a857d72d4 100644 --- a/ability/ability_runtime/freeinstalltest/startabilitystagetest/atomizationstagehm2/entry/src/main/ets/MainAbility/MainAbility.ts +++ b/ability/ability_runtime/freeinstalltest/startabilitystagetest/atomizationstagehm2/entry/src/main/ets/MainAbility/MainAbility.ts @@ -13,7 +13,7 @@ * limitations under the License. */ -import Ability from '@ohos.application.Ability' +import Ability from '@ohos.app.ability.UIAbility' export default class MainAbility extends Ability { onCreate(want, launchParam) { diff --git a/ability/ability_runtime/freeinstalltest/startabilitystagetest/atomizationstagehm4/entry/src/main/ets/Application/AbilityStage.ts b/ability/ability_runtime/freeinstalltest/startabilitystagetest/atomizationstagehm4/entry/src/main/ets/Application/AbilityStage.ts index b3f3c306081d07be09d4367c3aa27b13cf57f046..bcdd947686bff32663fc19386dc826e4dad19ceb 100644 --- a/ability/ability_runtime/freeinstalltest/startabilitystagetest/atomizationstagehm4/entry/src/main/ets/Application/AbilityStage.ts +++ b/ability/ability_runtime/freeinstalltest/startabilitystagetest/atomizationstagehm4/entry/src/main/ets/Application/AbilityStage.ts @@ -13,7 +13,7 @@ * limitations under the License. */ -import AbilityStage from "@ohos.application.AbilityStage" +import AbilityStage from "@ohos.app.ability.AbilityStage" export default class MyAbilityStage extends AbilityStage { onCreate() { diff --git a/ability/ability_runtime/freeinstalltest/startabilitystagetest/atomizationstagehm4/entry/src/main/ets/MainAbility/MainAbility.ts b/ability/ability_runtime/freeinstalltest/startabilitystagetest/atomizationstagehm4/entry/src/main/ets/MainAbility/MainAbility.ts index 1e29b8b56f5d88da231bf45e2e0a093ff4d8961d..6039469310ec5c9a6ab7e6ddededaf9a857d72d4 100644 --- a/ability/ability_runtime/freeinstalltest/startabilitystagetest/atomizationstagehm4/entry/src/main/ets/MainAbility/MainAbility.ts +++ b/ability/ability_runtime/freeinstalltest/startabilitystagetest/atomizationstagehm4/entry/src/main/ets/MainAbility/MainAbility.ts @@ -13,7 +13,7 @@ * limitations under the License. */ -import Ability from '@ohos.application.Ability' +import Ability from '@ohos.app.ability.UIAbility' export default class MainAbility extends Ability { onCreate(want, launchParam) { diff --git a/ability/ability_runtime/freeinstalltest/startabilitystagetest/stagemyapplication1/entry/src/main/ets/Application/AbilityStage.ts b/ability/ability_runtime/freeinstalltest/startabilitystagetest/stagemyapplication1/entry/src/main/ets/Application/AbilityStage.ts index b3f3c306081d07be09d4367c3aa27b13cf57f046..bcdd947686bff32663fc19386dc826e4dad19ceb 100644 --- a/ability/ability_runtime/freeinstalltest/startabilitystagetest/stagemyapplication1/entry/src/main/ets/Application/AbilityStage.ts +++ b/ability/ability_runtime/freeinstalltest/startabilitystagetest/stagemyapplication1/entry/src/main/ets/Application/AbilityStage.ts @@ -13,7 +13,7 @@ * limitations under the License. */ -import AbilityStage from "@ohos.application.AbilityStage" +import AbilityStage from "@ohos.app.ability.AbilityStage" export default class MyAbilityStage extends AbilityStage { onCreate() { diff --git a/ability/ability_runtime/freeinstalltest/startabilitystagetest/stagemyapplication1/entry/src/main/ets/MainAbility/MainAbility.ts b/ability/ability_runtime/freeinstalltest/startabilitystagetest/stagemyapplication1/entry/src/main/ets/MainAbility/MainAbility.ts index 1e29b8b56f5d88da231bf45e2e0a093ff4d8961d..6039469310ec5c9a6ab7e6ddededaf9a857d72d4 100644 --- a/ability/ability_runtime/freeinstalltest/startabilitystagetest/stagemyapplication1/entry/src/main/ets/MainAbility/MainAbility.ts +++ b/ability/ability_runtime/freeinstalltest/startabilitystagetest/stagemyapplication1/entry/src/main/ets/MainAbility/MainAbility.ts @@ -13,7 +13,7 @@ * limitations under the License. */ -import Ability from '@ohos.application.Ability' +import Ability from '@ohos.app.ability.UIAbility' export default class MainAbility extends Ability { onCreate(want, launchParam) { diff --git a/ability/ability_runtime/killprocesswithaccountstage/ActsKillProcessWithAccountRelyHap/entry/src/main/ets/Application/AbilityStage.ts b/ability/ability_runtime/killprocesswithaccountstage/ActsKillProcessWithAccountRelyHap/entry/src/main/ets/Application/AbilityStage.ts index 98eb012db14b28a1f92522e305b9d4538e496dd3..a41751fb10f96d4103d1120e59c5c5f5aa089e72 100644 --- a/ability/ability_runtime/killprocesswithaccountstage/ActsKillProcessWithAccountRelyHap/entry/src/main/ets/Application/AbilityStage.ts +++ b/ability/ability_runtime/killprocesswithaccountstage/ActsKillProcessWithAccountRelyHap/entry/src/main/ets/Application/AbilityStage.ts @@ -12,7 +12,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -import AbilityStage from "@ohos.application.AbilityStage" +import AbilityStage from "@ohos.app.ability.AbilityStage" export default class MyAbilityStage extends AbilityStage { onCreate() { diff --git a/ability/ability_runtime/killprocesswithaccountstage/ActsKillProcessWithAccountRelyHap/entry/src/main/ets/MainAbility/MainAbility.ts b/ability/ability_runtime/killprocesswithaccountstage/ActsKillProcessWithAccountRelyHap/entry/src/main/ets/MainAbility/MainAbility.ts index c3dc930c509f1ef885ac4f9623d7e9585990fd5b..3857a6da8131b007104062b82b2a389544923360 100644 --- a/ability/ability_runtime/killprocesswithaccountstage/ActsKillProcessWithAccountRelyHap/entry/src/main/ets/MainAbility/MainAbility.ts +++ b/ability/ability_runtime/killprocesswithaccountstage/ActsKillProcessWithAccountRelyHap/entry/src/main/ets/MainAbility/MainAbility.ts @@ -12,7 +12,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -import Ability from '@ohos.application.Ability' +import Ability from '@ohos.app.ability.UIAbility' export default class MainAbility extends Ability { diff --git a/ability/ability_runtime/killprocesswithaccountstage/ActsKillProcessWithAccountTest/entry/src/main/ets/Application/AbilityStage.ts b/ability/ability_runtime/killprocesswithaccountstage/ActsKillProcessWithAccountTest/entry/src/main/ets/Application/AbilityStage.ts index 5e2915fe4fc033cd5c9bd579dc08fe7369e51016..953114c1b479f368cb6c6bd456f0a171a358d148 100644 --- a/ability/ability_runtime/killprocesswithaccountstage/ActsKillProcessWithAccountTest/entry/src/main/ets/Application/AbilityStage.ts +++ b/ability/ability_runtime/killprocesswithaccountstage/ActsKillProcessWithAccountTest/entry/src/main/ets/Application/AbilityStage.ts @@ -12,7 +12,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -import AbilityStage from "@ohos.application.AbilityStage" +import AbilityStage from "@ohos.app.ability.AbilityStage" export default class MyAbilityStage extends AbilityStage { onCreate() { diff --git a/ability/ability_runtime/killprocesswithaccountstage/ActsKillProcessWithAccountTest/entry/src/main/ets/MainAbility/MainAbility.ts b/ability/ability_runtime/killprocesswithaccountstage/ActsKillProcessWithAccountTest/entry/src/main/ets/MainAbility/MainAbility.ts index 717657a0c8f0bf4ccfb444169ff61435adc644aa..8ed0a149b34691c769fd2e5d9e7377fc5ef917b1 100644 --- a/ability/ability_runtime/killprocesswithaccountstage/ActsKillProcessWithAccountTest/entry/src/main/ets/MainAbility/MainAbility.ts +++ b/ability/ability_runtime/killprocesswithaccountstage/ActsKillProcessWithAccountTest/entry/src/main/ets/MainAbility/MainAbility.ts @@ -12,7 +12,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -import Ability from '@ohos.application.Ability' +import Ability from '@ohos.app.ability.UIAbility' import AbilityDelegatorRegistry from '@ohos.application.abilityDelegatorRegistry' import { Hypium } from '@ohos/hypium' import testsuite from '../test/List.test' diff --git a/ability/ability_runtime/killprocesswithaccountstage/ActsKillProcessWithAccountTest/entry/src/main/ets/TestAbility/TestAbility.ts b/ability/ability_runtime/killprocesswithaccountstage/ActsKillProcessWithAccountTest/entry/src/main/ets/TestAbility/TestAbility.ts index 89a84730505783ba229175ab4b55d37f91a16266..8028a70f8af44690b95a08bd177bca6b09f24687 100644 --- a/ability/ability_runtime/killprocesswithaccountstage/ActsKillProcessWithAccountTest/entry/src/main/ets/TestAbility/TestAbility.ts +++ b/ability/ability_runtime/killprocesswithaccountstage/ActsKillProcessWithAccountTest/entry/src/main/ets/TestAbility/TestAbility.ts @@ -12,7 +12,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -import Ability from '@ohos.application.Ability' +import Ability from '@ohos.app.ability.UIAbility' export default class TestAbility extends Ability { onCreate(want, launchParam) { diff --git a/ability/ability_runtime/newwant/actsnewwantarelyhap/entry/src/main/ets/Application/AbilityStage.ts b/ability/ability_runtime/newwant/actsnewwantarelyhap/entry/src/main/ets/Application/AbilityStage.ts index 110b635df49acfaea90f40fac2e11ba1730698f6..105d9ab56270a3fe6adf5b7eae87797b1f8de004 100644 --- a/ability/ability_runtime/newwant/actsnewwantarelyhap/entry/src/main/ets/Application/AbilityStage.ts +++ b/ability/ability_runtime/newwant/actsnewwantarelyhap/entry/src/main/ets/Application/AbilityStage.ts @@ -12,7 +12,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -import AbilityStage from "@ohos.application.AbilityStage" +import AbilityStage from "@ohos.app.ability.AbilityStage" export default class MyAbilityStage extends AbilityStage { onCreate() { diff --git a/ability/ability_runtime/newwant/actsnewwantarelyhap/entry/src/main/ets/MainAbility/MainAbility.ts b/ability/ability_runtime/newwant/actsnewwantarelyhap/entry/src/main/ets/MainAbility/MainAbility.ts index 9962ff55df8eeb24c19a5ff74a6f330b99f6bc6d..7fa34e4864f8bf96eaabf53c1f184834a173c67b 100644 --- a/ability/ability_runtime/newwant/actsnewwantarelyhap/entry/src/main/ets/MainAbility/MainAbility.ts +++ b/ability/ability_runtime/newwant/actsnewwantarelyhap/entry/src/main/ets/MainAbility/MainAbility.ts @@ -13,7 +13,7 @@ * limitations under the License. */ -import Ability from '@ohos.application.Ability' +import Ability from '@ohos.app.ability.UIAbility' import commonEvent from '@ohos.commonEvent' function sleep(delay) { diff --git a/ability/ability_runtime/newwant/actsnewwantbrelyhap/entry/src/main/ets/Application/AbilityStage.ts b/ability/ability_runtime/newwant/actsnewwantbrelyhap/entry/src/main/ets/Application/AbilityStage.ts index b44ce4627f394138ce64d0d042822a881b3bb9d2..ab70b5ad1d5cd0753ae11a6ae279e0fa711347b4 100644 --- a/ability/ability_runtime/newwant/actsnewwantbrelyhap/entry/src/main/ets/Application/AbilityStage.ts +++ b/ability/ability_runtime/newwant/actsnewwantbrelyhap/entry/src/main/ets/Application/AbilityStage.ts @@ -13,7 +13,7 @@ * limitations under the License. */ -import AbilityStage from "@ohos.application.AbilityStage" +import AbilityStage from "@ohos.app.ability.AbilityStage" export default class MyAbilityStage extends AbilityStage { onCreate() { diff --git a/ability/ability_runtime/newwant/actsnewwantbrelyhap/entry/src/main/ets/MainAbility/MainAbility.ts b/ability/ability_runtime/newwant/actsnewwantbrelyhap/entry/src/main/ets/MainAbility/MainAbility.ts index 8e74ecba1184139d319dcacccca2bf5f5f1bd501..fbb55ab160703c3992e081e1293de8cc49ed1a61 100644 --- a/ability/ability_runtime/newwant/actsnewwantbrelyhap/entry/src/main/ets/MainAbility/MainAbility.ts +++ b/ability/ability_runtime/newwant/actsnewwantbrelyhap/entry/src/main/ets/MainAbility/MainAbility.ts @@ -13,7 +13,7 @@ * limitations under the License. */ -import Ability from '@ohos.application.Ability' +import Ability from '@ohos.app.ability.UIAbility' import commonEvent from '@ohos.commonEvent' function sleep(delay) { diff --git a/ability/ability_runtime/newwant/actsnewwantrelyhap/entry/src/main/ets/Application/AbilityStage.ts b/ability/ability_runtime/newwant/actsnewwantrelyhap/entry/src/main/ets/Application/AbilityStage.ts index b44ce4627f394138ce64d0d042822a881b3bb9d2..ab70b5ad1d5cd0753ae11a6ae279e0fa711347b4 100644 --- a/ability/ability_runtime/newwant/actsnewwantrelyhap/entry/src/main/ets/Application/AbilityStage.ts +++ b/ability/ability_runtime/newwant/actsnewwantrelyhap/entry/src/main/ets/Application/AbilityStage.ts @@ -13,7 +13,7 @@ * limitations under the License. */ -import AbilityStage from "@ohos.application.AbilityStage" +import AbilityStage from "@ohos.app.ability.AbilityStage" export default class MyAbilityStage extends AbilityStage { onCreate() { diff --git a/ability/ability_runtime/newwant/actsnewwantrelyhap/entry/src/main/ets/MainAbility/MainAbility.ts b/ability/ability_runtime/newwant/actsnewwantrelyhap/entry/src/main/ets/MainAbility/MainAbility.ts index fa1d74c0f0161c19d89a72516300266ab0eaa6ae..0c6688dcc3ef7ca3085cd4d36ca3b31f0183d60e 100644 --- a/ability/ability_runtime/newwant/actsnewwantrelyhap/entry/src/main/ets/MainAbility/MainAbility.ts +++ b/ability/ability_runtime/newwant/actsnewwantrelyhap/entry/src/main/ets/MainAbility/MainAbility.ts @@ -13,7 +13,7 @@ * limitations under the License. */ -import Ability from '@ohos.application.Ability' +import Ability from '@ohos.app.ability.UIAbility' import commonEvent from '@ohos.commonEvent' function sleep(delay) { diff --git a/ability/ability_runtime/newwant/actsnewwantrelyhap/entry/src/main/ets/SecondAbility/SecondAbility.ts b/ability/ability_runtime/newwant/actsnewwantrelyhap/entry/src/main/ets/SecondAbility/SecondAbility.ts index 3faed4fc184b3e4259d26d18a1e86bb7ae43ac95..a262041cbf9de6048719c086ad72fce924410016 100644 --- a/ability/ability_runtime/newwant/actsnewwantrelyhap/entry/src/main/ets/SecondAbility/SecondAbility.ts +++ b/ability/ability_runtime/newwant/actsnewwantrelyhap/entry/src/main/ets/SecondAbility/SecondAbility.ts @@ -13,7 +13,7 @@ * limitations under the License. */ -import Ability from '@ohos.application.Ability' +import Ability from '@ohos.app.ability.UIAbility' import commonEvent from '@ohos.commonEvent' function sleep(delay) { diff --git a/ability/ability_runtime/newwant/actsnewwanttest/entry/src/main/ets/Application/AbilityStage.ts b/ability/ability_runtime/newwant/actsnewwanttest/entry/src/main/ets/Application/AbilityStage.ts index 6837617a9924633681df2961ba7c9a319bf431d8..b4110dd30fddfcb01c30695e5370355652996e13 100644 --- a/ability/ability_runtime/newwant/actsnewwanttest/entry/src/main/ets/Application/AbilityStage.ts +++ b/ability/ability_runtime/newwant/actsnewwanttest/entry/src/main/ets/Application/AbilityStage.ts @@ -13,7 +13,7 @@ * limitations under the License. */ -import AbilityStage from "@ohos.application.AbilityStage" +import AbilityStage from "@ohos.app.ability.AbilityStage" export default class MyAbilityStage extends AbilityStage { onCreate() { diff --git a/ability/ability_runtime/newwant/actsnewwanttest/entry/src/main/ets/MainAbility/MainAbility.ts b/ability/ability_runtime/newwant/actsnewwanttest/entry/src/main/ets/MainAbility/MainAbility.ts index f59e7275010954155d0cf84c42d690d9cb308f88..39fe1c406c8b1a1f7615ea8a95c602f2f96fa680 100644 --- a/ability/ability_runtime/newwant/actsnewwanttest/entry/src/main/ets/MainAbility/MainAbility.ts +++ b/ability/ability_runtime/newwant/actsnewwanttest/entry/src/main/ets/MainAbility/MainAbility.ts @@ -13,7 +13,7 @@ * limitations under the License. */ -import Ability from '@ohos.application.Ability' +import Ability from '@ohos.app.ability.UIAbility' import AbilityDelegatorRegistry from '@ohos.application.abilityDelegatorRegistry' import { Hypium } from '@ohos/hypium' import testsuite from '../test/List.test' diff --git a/ability/ability_runtime/newwant/actsnewwanttest/entry/src/main/ets/TestAbility/TestAbility.ts b/ability/ability_runtime/newwant/actsnewwanttest/entry/src/main/ets/TestAbility/TestAbility.ts index 89a84730505783ba229175ab4b55d37f91a16266..8028a70f8af44690b95a08bd177bca6b09f24687 100644 --- a/ability/ability_runtime/newwant/actsnewwanttest/entry/src/main/ets/TestAbility/TestAbility.ts +++ b/ability/ability_runtime/newwant/actsnewwanttest/entry/src/main/ets/TestAbility/TestAbility.ts @@ -12,7 +12,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -import Ability from '@ohos.application.Ability' +import Ability from '@ohos.app.ability.UIAbility' export default class TestAbility extends Ability { onCreate(want, launchParam) { diff --git a/ability/ability_runtime/non_concurrent/acts_systemappa_test/entry/src/main/ets/Application/AbilityStage.ts b/ability/ability_runtime/non_concurrent/acts_systemappa_test/entry/src/main/ets/Application/AbilityStage.ts index 98eb012db14b28a1f92522e305b9d4538e496dd3..a41751fb10f96d4103d1120e59c5c5f5aa089e72 100644 --- a/ability/ability_runtime/non_concurrent/acts_systemappa_test/entry/src/main/ets/Application/AbilityStage.ts +++ b/ability/ability_runtime/non_concurrent/acts_systemappa_test/entry/src/main/ets/Application/AbilityStage.ts @@ -12,7 +12,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -import AbilityStage from "@ohos.application.AbilityStage" +import AbilityStage from "@ohos.app.ability.AbilityStage" export default class MyAbilityStage extends AbilityStage { onCreate() { diff --git a/ability/ability_runtime/non_concurrent/acts_systemappa_test/entry/src/main/ets/MainAbility/MainAbility.ts b/ability/ability_runtime/non_concurrent/acts_systemappa_test/entry/src/main/ets/MainAbility/MainAbility.ts index 21042c6b3c94bde0fbbd9c9b9529eeca6f267c80..ac09453e21fed27b9747ee6f42f2a5e71d33a12a 100644 --- a/ability/ability_runtime/non_concurrent/acts_systemappa_test/entry/src/main/ets/MainAbility/MainAbility.ts +++ b/ability/ability_runtime/non_concurrent/acts_systemappa_test/entry/src/main/ets/MainAbility/MainAbility.ts @@ -12,7 +12,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -import Ability from '@ohos.application.Ability' +import Ability from '@ohos.app.ability.UIAbility' export default class MainAbility extends Ability { diff --git a/ability/ability_runtime/non_concurrent/acts_systemappa_test/entry/src/main/ets/MainAbility2/MainAbility2.ts b/ability/ability_runtime/non_concurrent/acts_systemappa_test/entry/src/main/ets/MainAbility2/MainAbility2.ts index e54a793c64342d9310f0210e7d4ce6e366b9509b..dc615727eddf9a326d381cab0ed2d65b4aaa13b9 100644 --- a/ability/ability_runtime/non_concurrent/acts_systemappa_test/entry/src/main/ets/MainAbility2/MainAbility2.ts +++ b/ability/ability_runtime/non_concurrent/acts_systemappa_test/entry/src/main/ets/MainAbility2/MainAbility2.ts @@ -12,7 +12,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -import Ability from '@ohos.application.Ability' +import Ability from '@ohos.app.ability.UIAbility' import commonEvent from '@ohos.commonEvent' function PublishCallBackOne1() { console.debug("====>Publish CallBack ACTS_ThirdPartyAbilityPermission_0100_CommonEvent====>"); diff --git a/ability/ability_runtime/non_concurrent/acts_systemappa_test/entry/src/main/ets/TestAbility/TestAbility.ts b/ability/ability_runtime/non_concurrent/acts_systemappa_test/entry/src/main/ets/TestAbility/TestAbility.ts index 89a84730505783ba229175ab4b55d37f91a16266..8028a70f8af44690b95a08bd177bca6b09f24687 100644 --- a/ability/ability_runtime/non_concurrent/acts_systemappa_test/entry/src/main/ets/TestAbility/TestAbility.ts +++ b/ability/ability_runtime/non_concurrent/acts_systemappa_test/entry/src/main/ets/TestAbility/TestAbility.ts @@ -12,7 +12,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -import Ability from '@ohos.application.Ability' +import Ability from '@ohos.app.ability.UIAbility' export default class TestAbility extends Ability { onCreate(want, launchParam) { diff --git a/ability/ability_runtime/non_concurrent/acts_systemappone_rely_test/entry/src/main/ets/Application/AbilityStage.ts b/ability/ability_runtime/non_concurrent/acts_systemappone_rely_test/entry/src/main/ets/Application/AbilityStage.ts index 98eb012db14b28a1f92522e305b9d4538e496dd3..a41751fb10f96d4103d1120e59c5c5f5aa089e72 100644 --- a/ability/ability_runtime/non_concurrent/acts_systemappone_rely_test/entry/src/main/ets/Application/AbilityStage.ts +++ b/ability/ability_runtime/non_concurrent/acts_systemappone_rely_test/entry/src/main/ets/Application/AbilityStage.ts @@ -12,7 +12,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -import AbilityStage from "@ohos.application.AbilityStage" +import AbilityStage from "@ohos.app.ability.AbilityStage" export default class MyAbilityStage extends AbilityStage { onCreate() { diff --git a/ability/ability_runtime/non_concurrent/acts_systemappone_rely_test/entry/src/main/ets/MainAbility/MainAbility.ts b/ability/ability_runtime/non_concurrent/acts_systemappone_rely_test/entry/src/main/ets/MainAbility/MainAbility.ts index 7335dbf497d3066e1a6d7fb6a9576e23a7e41f58..ffb2d64d5eab0a4bed80c28e29398c2bd7ff6afc 100644 --- a/ability/ability_runtime/non_concurrent/acts_systemappone_rely_test/entry/src/main/ets/MainAbility/MainAbility.ts +++ b/ability/ability_runtime/non_concurrent/acts_systemappone_rely_test/entry/src/main/ets/MainAbility/MainAbility.ts @@ -12,7 +12,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -import Ability from '@ohos.application.Ability' +import Ability from '@ohos.app.ability.UIAbility' import commonEvent from '@ohos.commonEvent' function PublishCallBackOne3() { console.debug("====>Publish CallBack ACTS_StartAbility_0300_CommonEvent====>"); diff --git a/ability/ability_runtime/non_concurrent/actsthirdappatest/entry/src/main/ets/Application/AbilityStage.ts b/ability/ability_runtime/non_concurrent/actsthirdappatest/entry/src/main/ets/Application/AbilityStage.ts index 579e885981d7f3e75f828cceb140beba39157699..518c7f953cd22b92ad31e3f8772a65d8d95b9de4 100755 --- a/ability/ability_runtime/non_concurrent/actsthirdappatest/entry/src/main/ets/Application/AbilityStage.ts +++ b/ability/ability_runtime/non_concurrent/actsthirdappatest/entry/src/main/ets/Application/AbilityStage.ts @@ -12,7 +12,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -import AbilityStage from "@ohos.application.AbilityStage" +import AbilityStage from "@ohos.app.ability.AbilityStage" export default class MyAbilityStage extends AbilityStage { onCreate() { diff --git a/ability/ability_runtime/non_concurrent/actsthirdappatest/entry/src/main/ets/MainAbility2/MainAbility2.ts b/ability/ability_runtime/non_concurrent/actsthirdappatest/entry/src/main/ets/MainAbility2/MainAbility2.ts index ad051678af8d86421dce671b378000c1cbeb6255..570d85445cb110a1817470d768a3c1a06768bee4 100755 --- a/ability/ability_runtime/non_concurrent/actsthirdappatest/entry/src/main/ets/MainAbility2/MainAbility2.ts +++ b/ability/ability_runtime/non_concurrent/actsthirdappatest/entry/src/main/ets/MainAbility2/MainAbility2.ts @@ -12,7 +12,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -import Ability from '@ohos.application.Ability' +import Ability from '@ohos.app.ability.UIAbility' import commonEvent from '@ohos.commonEvent' function PublishCallBackOne1() { console.debug("====>Publish CallBack ACTS_ThirdPartyAbilityPermission_0100_CommonEvent====>"); diff --git a/ability/ability_runtime/non_concurrent/actsthirdappatest/entry/src/main/ets/TestAbility/TestAbility.ts b/ability/ability_runtime/non_concurrent/actsthirdappatest/entry/src/main/ets/TestAbility/TestAbility.ts index b11ac50ea52339f4a58ef2964f34dee0cb36c426..d466fc86120520db850d208180f76c5303169f65 100755 --- a/ability/ability_runtime/non_concurrent/actsthirdappatest/entry/src/main/ets/TestAbility/TestAbility.ts +++ b/ability/ability_runtime/non_concurrent/actsthirdappatest/entry/src/main/ets/TestAbility/TestAbility.ts @@ -13,7 +13,7 @@ * limitations under the License. */ -import Ability from '@ohos.application.Ability' +import Ability from '@ohos.app.ability.UIAbility' import AbilityDelegatorRegistry from '@ohos.application.abilityDelegatorRegistry' import { Hypium } from '@ohos/hypium' import testsuite from '../test/List.test' diff --git a/ability/ability_runtime/non_concurrent/actsthirdapponerelytest/entry/src/main/ets/Application/AbilityStage.ts b/ability/ability_runtime/non_concurrent/actsthirdapponerelytest/entry/src/main/ets/Application/AbilityStage.ts index 98eb012db14b28a1f92522e305b9d4538e496dd3..a41751fb10f96d4103d1120e59c5c5f5aa089e72 100755 --- a/ability/ability_runtime/non_concurrent/actsthirdapponerelytest/entry/src/main/ets/Application/AbilityStage.ts +++ b/ability/ability_runtime/non_concurrent/actsthirdapponerelytest/entry/src/main/ets/Application/AbilityStage.ts @@ -12,7 +12,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -import AbilityStage from "@ohos.application.AbilityStage" +import AbilityStage from "@ohos.app.ability.AbilityStage" export default class MyAbilityStage extends AbilityStage { onCreate() { diff --git a/ability/ability_runtime/non_concurrent/actsthirdapponerelytest/entry/src/main/ets/MainAbility/MainAbility.ts b/ability/ability_runtime/non_concurrent/actsthirdapponerelytest/entry/src/main/ets/MainAbility/MainAbility.ts index 60a0edd4840369414a358765f1262f1b2e8b0825..1957f1056d8bc727d5613ee8930578fd09877f26 100755 --- a/ability/ability_runtime/non_concurrent/actsthirdapponerelytest/entry/src/main/ets/MainAbility/MainAbility.ts +++ b/ability/ability_runtime/non_concurrent/actsthirdapponerelytest/entry/src/main/ets/MainAbility/MainAbility.ts @@ -12,7 +12,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -import Ability from '@ohos.application.Ability' +import Ability from '@ohos.app.ability.UIAbility' import commonEvent from '@ohos.commonEvent' function PublishCallBackOne3() { console.debug("====>Publish CallBack ACTS_ThirdPartyAbilityPermission_0300_CommonEvent====>"); diff --git a/ability/ability_runtime/stage/actslifecyclemultihap2/entry/src/main/ets/Application/AbilityStage.ts b/ability/ability_runtime/stage/actslifecyclemultihap2/entry/src/main/ets/Application/AbilityStage.ts index 6ceb0c290ae831a45143a5e2b42d4351f2fc3d7e..3745b4557c4d87274ed1fd9e5efef51b63d4ceca 100644 --- a/ability/ability_runtime/stage/actslifecyclemultihap2/entry/src/main/ets/Application/AbilityStage.ts +++ b/ability/ability_runtime/stage/actslifecyclemultihap2/entry/src/main/ets/Application/AbilityStage.ts @@ -12,7 +12,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -import AbilityStage from "@ohos.application.AbilityStage" +import AbilityStage from "@ohos.app.ability.AbilityStage" export default class MyAbilityStage extends AbilityStage { onCreate() { diff --git a/ability/ability_runtime/stage/actslifecyclemultihap2/entry/src/main/ets/Hap2MainAbility1/Hap2MainAbility1.ts b/ability/ability_runtime/stage/actslifecyclemultihap2/entry/src/main/ets/Hap2MainAbility1/Hap2MainAbility1.ts index f203cde4e5b4d19aa3436a555512a3c117df33b1..3f69c6a93c57f7ab8c4d9caf77dc9d132324e7cb 100644 --- a/ability/ability_runtime/stage/actslifecyclemultihap2/entry/src/main/ets/Hap2MainAbility1/Hap2MainAbility1.ts +++ b/ability/ability_runtime/stage/actslifecyclemultihap2/entry/src/main/ets/Hap2MainAbility1/Hap2MainAbility1.ts @@ -12,7 +12,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -import Ability from '@ohos.application.Ability' +import Ability from '@ohos.app.ability.UIAbility' export default class Hap2MainAbility1 extends Ability { onCreate(want, launchParam) { diff --git a/ability/ability_runtime/stage/actslifecyclemultihap2/entry/src/main/ets/Hap2MainAbility10/Hap2MainAbility10.ts b/ability/ability_runtime/stage/actslifecyclemultihap2/entry/src/main/ets/Hap2MainAbility10/Hap2MainAbility10.ts index fe58d09124ff6a661e42c4350e39b43a513ce90b..891a505706e1f1e126bf336a6784b3dcc25cb1af 100644 --- a/ability/ability_runtime/stage/actslifecyclemultihap2/entry/src/main/ets/Hap2MainAbility10/Hap2MainAbility10.ts +++ b/ability/ability_runtime/stage/actslifecyclemultihap2/entry/src/main/ets/Hap2MainAbility10/Hap2MainAbility10.ts @@ -12,7 +12,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -import Ability from '@ohos.application.Ability' +import Ability from '@ohos.app.ability.UIAbility' export default class Hap2MainAbility10 extends Ability { onCreate(want, launchParam) { diff --git a/ability/ability_runtime/stage/actslifecyclemultihap2/entry/src/main/ets/Hap2MainAbility2/Hap2MainAbility2.ts b/ability/ability_runtime/stage/actslifecyclemultihap2/entry/src/main/ets/Hap2MainAbility2/Hap2MainAbility2.ts index a6b9102b9018a8c1309188dbe3d8a7d2f3e120c9..4880de1b814ebde3ada9d082cc232b3c181e6c10 100644 --- a/ability/ability_runtime/stage/actslifecyclemultihap2/entry/src/main/ets/Hap2MainAbility2/Hap2MainAbility2.ts +++ b/ability/ability_runtime/stage/actslifecyclemultihap2/entry/src/main/ets/Hap2MainAbility2/Hap2MainAbility2.ts @@ -12,7 +12,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -import Ability from '@ohos.application.Ability' +import Ability from '@ohos.app.ability.UIAbility' export default class Hap2MainAbility2 extends Ability { onCreate(want, launchParam) { diff --git a/ability/ability_runtime/stage/actslifecyclemultihap2/entry/src/main/ets/Hap2MainAbility3/Hap2MainAbility3.ts b/ability/ability_runtime/stage/actslifecyclemultihap2/entry/src/main/ets/Hap2MainAbility3/Hap2MainAbility3.ts index 4a6039a3a18df4f1d3ed90474307fe723f2ce952..0edbe564b73077af4d9363be8be227d25faedd47 100644 --- a/ability/ability_runtime/stage/actslifecyclemultihap2/entry/src/main/ets/Hap2MainAbility3/Hap2MainAbility3.ts +++ b/ability/ability_runtime/stage/actslifecyclemultihap2/entry/src/main/ets/Hap2MainAbility3/Hap2MainAbility3.ts @@ -12,7 +12,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -import Ability from '@ohos.application.Ability' +import Ability from '@ohos.app.ability.UIAbility' export default class Hap2MainAbility3 extends Ability { onCreate(want, launchParam) { diff --git a/ability/ability_runtime/stage/actslifecyclemultihap2/entry/src/main/ets/Hap2MainAbility4/Hap2MainAbility4.ts b/ability/ability_runtime/stage/actslifecyclemultihap2/entry/src/main/ets/Hap2MainAbility4/Hap2MainAbility4.ts index 266bf2aa2159f194c4bbd06ac7fd0f4f552b94d5..28d2f949bb7c6f7ea79defc84071c9df98199226 100644 --- a/ability/ability_runtime/stage/actslifecyclemultihap2/entry/src/main/ets/Hap2MainAbility4/Hap2MainAbility4.ts +++ b/ability/ability_runtime/stage/actslifecyclemultihap2/entry/src/main/ets/Hap2MainAbility4/Hap2MainAbility4.ts @@ -12,7 +12,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -import Ability from '@ohos.application.Ability' +import Ability from '@ohos.app.ability.UIAbility' export default class Hap2MainAbility4 extends Ability { onCreate(want, launchParam) { diff --git a/ability/ability_runtime/stage/actslifecyclemultihap2/entry/src/main/ets/Hap2MainAbility5/Hap2MainAbility5.ts b/ability/ability_runtime/stage/actslifecyclemultihap2/entry/src/main/ets/Hap2MainAbility5/Hap2MainAbility5.ts index 238a21eee19a477a07312c7838ec964c40f00585..9a5252af10f9b9b2c76a86f000a088d7f51135bb 100644 --- a/ability/ability_runtime/stage/actslifecyclemultihap2/entry/src/main/ets/Hap2MainAbility5/Hap2MainAbility5.ts +++ b/ability/ability_runtime/stage/actslifecyclemultihap2/entry/src/main/ets/Hap2MainAbility5/Hap2MainAbility5.ts @@ -12,7 +12,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -import Ability from '@ohos.application.Ability' +import Ability from '@ohos.app.ability.UIAbility' export default class Hap2MainAbility5 extends Ability { onCreate(want, launchParam) { diff --git a/ability/ability_runtime/stage/actslifecyclemultihap2/entry/src/main/ets/Hap2MainAbility6/Hap2MainAbility6.ts b/ability/ability_runtime/stage/actslifecyclemultihap2/entry/src/main/ets/Hap2MainAbility6/Hap2MainAbility6.ts index 50090b7b02379c82b1e93862d3aa9b6a75eb9753..a008ee2ba4d22f89b9a76bfa3c112597320d1e3e 100644 --- a/ability/ability_runtime/stage/actslifecyclemultihap2/entry/src/main/ets/Hap2MainAbility6/Hap2MainAbility6.ts +++ b/ability/ability_runtime/stage/actslifecyclemultihap2/entry/src/main/ets/Hap2MainAbility6/Hap2MainAbility6.ts @@ -12,7 +12,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -import Ability from '@ohos.application.Ability' +import Ability from '@ohos.app.ability.UIAbility' export default class Hap2MainAbility6 extends Ability { onCreate(want, launchParam) { diff --git a/ability/ability_runtime/stage/actslifecyclemultihap2/entry/src/main/ets/Hap2MainAbility7/Hap2MainAbility7.ts b/ability/ability_runtime/stage/actslifecyclemultihap2/entry/src/main/ets/Hap2MainAbility7/Hap2MainAbility7.ts index c2ceba50278f5dd9fd7f8ffc58c9c740e777b387..137841008970631be0b327c2e6cebd486cc6675c 100644 --- a/ability/ability_runtime/stage/actslifecyclemultihap2/entry/src/main/ets/Hap2MainAbility7/Hap2MainAbility7.ts +++ b/ability/ability_runtime/stage/actslifecyclemultihap2/entry/src/main/ets/Hap2MainAbility7/Hap2MainAbility7.ts @@ -12,7 +12,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -import Ability from '@ohos.application.Ability' +import Ability from '@ohos.app.ability.UIAbility' export default class Hap2MainAbility7 extends Ability { onCreate(want, launchParam) { diff --git a/ability/ability_runtime/stage/actslifecyclemultihap2/entry/src/main/ets/Hap2MainAbility8/Hap2MainAbility8.ts b/ability/ability_runtime/stage/actslifecyclemultihap2/entry/src/main/ets/Hap2MainAbility8/Hap2MainAbility8.ts index 8f7562032a9fb21a4f9e06a7e8a3d752b5cedf1b..0c3fb530307f38d10a9cb6d3ec67d02f55ca70e0 100644 --- a/ability/ability_runtime/stage/actslifecyclemultihap2/entry/src/main/ets/Hap2MainAbility8/Hap2MainAbility8.ts +++ b/ability/ability_runtime/stage/actslifecyclemultihap2/entry/src/main/ets/Hap2MainAbility8/Hap2MainAbility8.ts @@ -12,7 +12,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -import Ability from '@ohos.application.Ability' +import Ability from '@ohos.app.ability.UIAbility' export default class Hap2MainAbility8 extends Ability { onCreate(want, launchParam) { diff --git a/ability/ability_runtime/stage/actslifecyclemultihap2/entry/src/main/ets/Hap2MainAbility9/Hap2MainAbility9.ts b/ability/ability_runtime/stage/actslifecyclemultihap2/entry/src/main/ets/Hap2MainAbility9/Hap2MainAbility9.ts index 7ce1fe750422b8ac639a73d7809c3113e30f1c97..d9ae704e602362aac8a569d545c308ce2b6001d4 100644 --- a/ability/ability_runtime/stage/actslifecyclemultihap2/entry/src/main/ets/Hap2MainAbility9/Hap2MainAbility9.ts +++ b/ability/ability_runtime/stage/actslifecyclemultihap2/entry/src/main/ets/Hap2MainAbility9/Hap2MainAbility9.ts @@ -13,7 +13,7 @@ * limitations under the License. */ -import Ability from '@ohos.application.Ability' +import Ability from '@ohos.app.ability.UIAbility' export default class Hap2MainAbility9 extends Ability { onCreate(want, launchParam) { diff --git a/ability/ability_runtime/stage/actslifecyclemultihap3/entry/src/main/ets/Application/AbilityStage.ts b/ability/ability_runtime/stage/actslifecyclemultihap3/entry/src/main/ets/Application/AbilityStage.ts index 396606ff7396988f0849e54a294700ad86e22678..9ee1aa9fbe29ab663a8171935457969972573fca 100644 --- a/ability/ability_runtime/stage/actslifecyclemultihap3/entry/src/main/ets/Application/AbilityStage.ts +++ b/ability/ability_runtime/stage/actslifecyclemultihap3/entry/src/main/ets/Application/AbilityStage.ts @@ -13,7 +13,7 @@ * limitations under the License. */ -import AbilityStage from "@ohos.application.AbilityStage" +import AbilityStage from "@ohos.app.ability.AbilityStage" export default class MyAbilityStage extends AbilityStage { onCreate() { diff --git a/ability/ability_runtime/stage/actslifecyclemultihap3/entry/src/main/ets/Hap3MainAbility1/Hap3MainAbility1.ts b/ability/ability_runtime/stage/actslifecyclemultihap3/entry/src/main/ets/Hap3MainAbility1/Hap3MainAbility1.ts index c491aad5b7cb81c0ef4caf451dc70e5ce60d0293..29a01270540de0949c4cf8eac7560ea11ca5ee35 100644 --- a/ability/ability_runtime/stage/actslifecyclemultihap3/entry/src/main/ets/Hap3MainAbility1/Hap3MainAbility1.ts +++ b/ability/ability_runtime/stage/actslifecyclemultihap3/entry/src/main/ets/Hap3MainAbility1/Hap3MainAbility1.ts @@ -13,7 +13,7 @@ * limitations under the License. */ import commonEvent from '@ohos.commonEvent'; -import Ability from '@ohos.application.Ability' +import Ability from '@ohos.app.ability.UIAbility' export default class Hap3MainAbility1 extends Ability { onCreate(want, launchParam) { diff --git a/ability/ability_runtime/stage/actslifecyclemultihap3/entry/src/main/ets/Hap3MainAbility2/Hap3MainAbility2.ts b/ability/ability_runtime/stage/actslifecyclemultihap3/entry/src/main/ets/Hap3MainAbility2/Hap3MainAbility2.ts index 7916120e210c80b4f2479022d1b5c17a82b02636..4aa803ecf104cee87b7adb945266f2163784cab9 100644 --- a/ability/ability_runtime/stage/actslifecyclemultihap3/entry/src/main/ets/Hap3MainAbility2/Hap3MainAbility2.ts +++ b/ability/ability_runtime/stage/actslifecyclemultihap3/entry/src/main/ets/Hap3MainAbility2/Hap3MainAbility2.ts @@ -12,7 +12,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -import Ability from '@ohos.application.Ability' +import Ability from '@ohos.app.ability.UIAbility' export default class Hap3MainAbility2 extends Ability { onCreate(want, launchParam) { diff --git a/ability/ability_runtime/stage/actslifecyclemultihap3/entry/src/main/ets/Hap3MainAbility3/Hap3MainAbility3.ts b/ability/ability_runtime/stage/actslifecyclemultihap3/entry/src/main/ets/Hap3MainAbility3/Hap3MainAbility3.ts index b59387497ae4cef31db5a50a5276e66c3971d0fb..e5d06f663fcc100bf0e29bf4ab18d0408dd486ba 100644 --- a/ability/ability_runtime/stage/actslifecyclemultihap3/entry/src/main/ets/Hap3MainAbility3/Hap3MainAbility3.ts +++ b/ability/ability_runtime/stage/actslifecyclemultihap3/entry/src/main/ets/Hap3MainAbility3/Hap3MainAbility3.ts @@ -13,7 +13,7 @@ * limitations under the License. */ import commonEvent from '@ohos.commonEvent'; -import Ability from '@ohos.application.Ability' +import Ability from '@ohos.app.ability.UIAbility' export default class Hap3MainAbility3 extends Ability { onCreate(want, launchParam) { diff --git a/ability/ability_runtime/stage/actslifecyclemultihaptest/entry/src/main/ets/Application/AbilityStage.ts b/ability/ability_runtime/stage/actslifecyclemultihaptest/entry/src/main/ets/Application/AbilityStage.ts index 38a0705fc3c407a264814373bad832e0de5dc15c..07f5d29b9eecdd949990a221e969e3f51fcff747 100644 --- a/ability/ability_runtime/stage/actslifecyclemultihaptest/entry/src/main/ets/Application/AbilityStage.ts +++ b/ability/ability_runtime/stage/actslifecyclemultihaptest/entry/src/main/ets/Application/AbilityStage.ts @@ -13,7 +13,7 @@ * limitations under the License. */ -import AbilityStage from "@ohos.application.AbilityStage" +import AbilityStage from "@ohos.app.ability.AbilityStage" export default class MyAbilityStage extends AbilityStage { onCreate() { diff --git a/ability/ability_runtime/stage/actslifecyclemultihaptest/entry/src/main/ets/MainAbility/MainAbility.ts b/ability/ability_runtime/stage/actslifecyclemultihaptest/entry/src/main/ets/MainAbility/MainAbility.ts index 047c5575a74fdca6b2a5e9a019ace65b8638a607..b686f1a174c5ff9f26cde61122e57cbc0831cf95 100644 --- a/ability/ability_runtime/stage/actslifecyclemultihaptest/entry/src/main/ets/MainAbility/MainAbility.ts +++ b/ability/ability_runtime/stage/actslifecyclemultihaptest/entry/src/main/ets/MainAbility/MainAbility.ts @@ -12,7 +12,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -import Ability from '@ohos.application.Ability' +import Ability from '@ohos.app.ability.UIAbility' export default class MainAbility extends Ability { onCreate(want, launchParam) { diff --git a/ability/ability_runtime/stage/actslifecyclemultihaptest/entry/src/main/ets/MainAbility1/MainAbility1.ts b/ability/ability_runtime/stage/actslifecyclemultihaptest/entry/src/main/ets/MainAbility1/MainAbility1.ts index 9af9101ac823132af0446eef8d07d1995d5bf161..1fef23ae00a8d77e420f95ddec477bec1d12b14d 100644 --- a/ability/ability_runtime/stage/actslifecyclemultihaptest/entry/src/main/ets/MainAbility1/MainAbility1.ts +++ b/ability/ability_runtime/stage/actslifecyclemultihaptest/entry/src/main/ets/MainAbility1/MainAbility1.ts @@ -12,7 +12,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -import Ability from '@ohos.application.Ability' +import Ability from '@ohos.app.ability.UIAbility' export default class MainAbility1 extends Ability { onCreate(want, launchParam) { diff --git a/ability/ability_runtime/stage/actslifecyclemultihaptest/entry/src/main/ets/MainAbility2/MainAbility2.ts b/ability/ability_runtime/stage/actslifecyclemultihaptest/entry/src/main/ets/MainAbility2/MainAbility2.ts index 65fd8731292ec522d66146f533871d1d21bd0864..a82b5ea94427bde4ed8d6f6d0630dea5aa3fda14 100644 --- a/ability/ability_runtime/stage/actslifecyclemultihaptest/entry/src/main/ets/MainAbility2/MainAbility2.ts +++ b/ability/ability_runtime/stage/actslifecyclemultihaptest/entry/src/main/ets/MainAbility2/MainAbility2.ts @@ -12,7 +12,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -import Ability from '@ohos.application.Ability' +import Ability from '@ohos.app.ability.UIAbility' export default class MainAbility2 extends Ability { onCreate(want, launchParam) { diff --git a/ability/ability_runtime/stage/actslifecyclemultihaptest/entry/src/main/ets/MainAbility3/MainAbility3.ts b/ability/ability_runtime/stage/actslifecyclemultihaptest/entry/src/main/ets/MainAbility3/MainAbility3.ts index 33f456c7a929470a5cebdc5a418c77ecbddb24d4..7dc4350ce60a63bc226f68483a67ea01d41078e0 100644 --- a/ability/ability_runtime/stage/actslifecyclemultihaptest/entry/src/main/ets/MainAbility3/MainAbility3.ts +++ b/ability/ability_runtime/stage/actslifecyclemultihaptest/entry/src/main/ets/MainAbility3/MainAbility3.ts @@ -13,7 +13,7 @@ * limitations under the License. */ import commonEvent from '@ohos.commonEvent'; -import Ability from '@ohos.application.Ability' +import Ability from '@ohos.app.ability.UIAbility' export default class MainAbility3 extends Ability { onCreate(want, launchParam) { diff --git a/ability/ability_runtime/stage/actslifecyclemultihaptest/entry/src/main/ets/MainAbility4/MainAbility4.ts b/ability/ability_runtime/stage/actslifecyclemultihaptest/entry/src/main/ets/MainAbility4/MainAbility4.ts index 789378bea114c47400cfd389b06a73f742655f95..6b11ddecbb50c6ff1e3949d3f95e8aef78c8b480 100644 --- a/ability/ability_runtime/stage/actslifecyclemultihaptest/entry/src/main/ets/MainAbility4/MainAbility4.ts +++ b/ability/ability_runtime/stage/actslifecyclemultihaptest/entry/src/main/ets/MainAbility4/MainAbility4.ts @@ -12,7 +12,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -import Ability from '@ohos.application.Ability' +import Ability from '@ohos.app.ability.UIAbility' export default class MainAbility4 extends Ability { onCreate(want, launchParam) { diff --git a/ability/ability_runtime/stage/actslifecyclemultihaptest/entry/src/main/ets/MainAbility5/MainAbility5.ts b/ability/ability_runtime/stage/actslifecyclemultihaptest/entry/src/main/ets/MainAbility5/MainAbility5.ts index 5bac3c2e41518c7e5f0b3c66da21b1859b86e730..ff7b81b7fde4c14ac060648482b42abf278e50f6 100644 --- a/ability/ability_runtime/stage/actslifecyclemultihaptest/entry/src/main/ets/MainAbility5/MainAbility5.ts +++ b/ability/ability_runtime/stage/actslifecyclemultihaptest/entry/src/main/ets/MainAbility5/MainAbility5.ts @@ -13,7 +13,7 @@ * limitations under the License. */ -import Ability from '@ohos.application.Ability' +import Ability from '@ohos.app.ability.UIAbility' export default class MainAbility5 extends Ability { onCreate(want, launchParam) { diff --git a/ability/ability_runtime/stage/actslifecyclemultihaptest/entry/src/main/ets/MainAbility6/MainAbility6.ts b/ability/ability_runtime/stage/actslifecyclemultihaptest/entry/src/main/ets/MainAbility6/MainAbility6.ts index 08a80dd11e7ea3a124a5743bae1886b30a63287e..c0c14332a609b835fd6432f22fd9597f65d63ec9 100644 --- a/ability/ability_runtime/stage/actslifecyclemultihaptest/entry/src/main/ets/MainAbility6/MainAbility6.ts +++ b/ability/ability_runtime/stage/actslifecyclemultihaptest/entry/src/main/ets/MainAbility6/MainAbility6.ts @@ -13,7 +13,7 @@ * limitations under the License. */ -import Ability from '@ohos.application.Ability' +import Ability from '@ohos.app.ability.UIAbility' export default class MainAbility6 extends Ability { onCreate(want, launchParam) { diff --git a/ability/ability_runtime/stage/actslifecyclemultihaptest/entry/src/main/ets/MainAbility7/MainAbility7.ts b/ability/ability_runtime/stage/actslifecyclemultihaptest/entry/src/main/ets/MainAbility7/MainAbility7.ts index 2feeecd861ddfc9f02adb4fdefbfc78c160d79dd..d883d8e1b4ea2daea125a7dab184681b40709533 100644 --- a/ability/ability_runtime/stage/actslifecyclemultihaptest/entry/src/main/ets/MainAbility7/MainAbility7.ts +++ b/ability/ability_runtime/stage/actslifecyclemultihaptest/entry/src/main/ets/MainAbility7/MainAbility7.ts @@ -1,4 +1,4 @@ -import Ability from '@ohos.application.Ability' +import Ability from '@ohos.app.ability.UIAbility' export default class MainAbility7 extends Ability { onCreate(want, launchParam) { diff --git a/ability/ability_runtime/stage/actslifecyclemultihaptest/entry/src/main/ets/TestAbility/TestAbility.ts b/ability/ability_runtime/stage/actslifecyclemultihaptest/entry/src/main/ets/TestAbility/TestAbility.ts index 89a84730505783ba229175ab4b55d37f91a16266..8028a70f8af44690b95a08bd177bca6b09f24687 100644 --- a/ability/ability_runtime/stage/actslifecyclemultihaptest/entry/src/main/ets/TestAbility/TestAbility.ts +++ b/ability/ability_runtime/stage/actslifecyclemultihaptest/entry/src/main/ets/TestAbility/TestAbility.ts @@ -12,7 +12,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -import Ability from '@ohos.application.Ability' +import Ability from '@ohos.app.ability.UIAbility' export default class TestAbility extends Ability { onCreate(want, launchParam) { diff --git a/ability/ability_runtime/stage/actslifecyclemultihaptest/hap4/src/main/ets/Application/AbilityStage.ts b/ability/ability_runtime/stage/actslifecyclemultihaptest/hap4/src/main/ets/Application/AbilityStage.ts index 396606ff7396988f0849e54a294700ad86e22678..9ee1aa9fbe29ab663a8171935457969972573fca 100644 --- a/ability/ability_runtime/stage/actslifecyclemultihaptest/hap4/src/main/ets/Application/AbilityStage.ts +++ b/ability/ability_runtime/stage/actslifecyclemultihaptest/hap4/src/main/ets/Application/AbilityStage.ts @@ -13,7 +13,7 @@ * limitations under the License. */ -import AbilityStage from "@ohos.application.AbilityStage" +import AbilityStage from "@ohos.app.ability.AbilityStage" export default class MyAbilityStage extends AbilityStage { onCreate() { diff --git a/ability/ability_runtime/stage/actslifecyclemultihaptest/hap4/src/main/ets/Hap4MainAbility1/Hap4MainAbility1.ts b/ability/ability_runtime/stage/actslifecyclemultihaptest/hap4/src/main/ets/Hap4MainAbility1/Hap4MainAbility1.ts index 5669014b880b3ca3a57658c37e2c6b17db83e7d6..935ed22bee07a17223b327e7641730cfc49f5cad 100644 --- a/ability/ability_runtime/stage/actslifecyclemultihaptest/hap4/src/main/ets/Hap4MainAbility1/Hap4MainAbility1.ts +++ b/ability/ability_runtime/stage/actslifecyclemultihaptest/hap4/src/main/ets/Hap4MainAbility1/Hap4MainAbility1.ts @@ -13,7 +13,7 @@ * limitations under the License. */ -import Ability from '@ohos.application.Ability' +import Ability from '@ohos.app.ability.UIAbility' export default class Hap4MainAbility1 extends Ability { onCreate(want, launchParam) { diff --git a/ability/ability_runtime/stage/actslifecyclesinglehaptest/entry/src/main/ets/Application/AbilityStage.ts b/ability/ability_runtime/stage/actslifecyclesinglehaptest/entry/src/main/ets/Application/AbilityStage.ts index 95c0c9795cd1088654fe4f9ae5a397dab61ece3f..edf74a91ed46874e759569285676db374e1ef869 100644 --- a/ability/ability_runtime/stage/actslifecyclesinglehaptest/entry/src/main/ets/Application/AbilityStage.ts +++ b/ability/ability_runtime/stage/actslifecyclesinglehaptest/entry/src/main/ets/Application/AbilityStage.ts @@ -12,7 +12,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -import AbilityStage from "@ohos.application.AbilityStage"; +import AbilityStage from "@ohos.app.ability.AbilityStage"; export default class MyAbilityStage extends AbilityStage { onCreate() { diff --git a/ability/ability_runtime/stage/actslifecyclesinglehaptest/entry/src/main/ets/Hap1MainAbility1/Hap1MainAbility1.ts b/ability/ability_runtime/stage/actslifecyclesinglehaptest/entry/src/main/ets/Hap1MainAbility1/Hap1MainAbility1.ts index 0bd8bae9cf466315bddb9dcd0cd2bb977db55340..7ce8a676db3252111f5ffdbf2c6bb1078966796a 100644 --- a/ability/ability_runtime/stage/actslifecyclesinglehaptest/entry/src/main/ets/Hap1MainAbility1/Hap1MainAbility1.ts +++ b/ability/ability_runtime/stage/actslifecyclesinglehaptest/entry/src/main/ets/Hap1MainAbility1/Hap1MainAbility1.ts @@ -12,7 +12,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -import Ability from '@ohos.application.Ability' +import Ability from '@ohos.app.ability.UIAbility' export default class Hap1MainAbility1 extends Ability { onCreate(want, launchParam) { diff --git a/ability/ability_runtime/stage/actslifecyclesinglehaptest/entry/src/main/ets/Hap1MainAbility2/Hap1MainAbility2.ts b/ability/ability_runtime/stage/actslifecyclesinglehaptest/entry/src/main/ets/Hap1MainAbility2/Hap1MainAbility2.ts index 0827cc9ac6130e94f9b41009d09d439b9062898e..b641e36ef557fa3742ad2d2e2001f769e3788bd8 100644 --- a/ability/ability_runtime/stage/actslifecyclesinglehaptest/entry/src/main/ets/Hap1MainAbility2/Hap1MainAbility2.ts +++ b/ability/ability_runtime/stage/actslifecyclesinglehaptest/entry/src/main/ets/Hap1MainAbility2/Hap1MainAbility2.ts @@ -12,7 +12,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -import Ability from '@ohos.application.Ability' +import Ability from '@ohos.app.ability.UIAbility' export default class Hap1MainAbility2 extends Ability { onCreate(want, launchParam) { diff --git a/ability/ability_runtime/stage/actslifecyclesinglehaptest/entry/src/main/ets/MainAbility/MainAbility.ts b/ability/ability_runtime/stage/actslifecyclesinglehaptest/entry/src/main/ets/MainAbility/MainAbility.ts index 2f474d0bc3ef5bb5dbc351e345e2c690dfb26bd7..cee1378d92208d54d4719ba230723e4785c6b881 100644 --- a/ability/ability_runtime/stage/actslifecyclesinglehaptest/entry/src/main/ets/MainAbility/MainAbility.ts +++ b/ability/ability_runtime/stage/actslifecyclesinglehaptest/entry/src/main/ets/MainAbility/MainAbility.ts @@ -12,7 +12,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -import Ability from '@ohos.application.Ability'; +import Ability from '@ohos.app.ability.UIAbility'; export default class MainAbility extends Ability { onCreate(want, launchParam) { diff --git a/ability/ability_runtime/stage/actslifecyclesinglehaptest/entry/src/main/ets/MainAbility1/MainAbility1.ts b/ability/ability_runtime/stage/actslifecyclesinglehaptest/entry/src/main/ets/MainAbility1/MainAbility1.ts index bb7c243e067bdc717fe8e21797a9a4b97192832a..e970e2d51f9b6b4c07c96b52ac9ea88d004972bd 100644 --- a/ability/ability_runtime/stage/actslifecyclesinglehaptest/entry/src/main/ets/MainAbility1/MainAbility1.ts +++ b/ability/ability_runtime/stage/actslifecyclesinglehaptest/entry/src/main/ets/MainAbility1/MainAbility1.ts @@ -12,7 +12,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -import Ability from '@ohos.application.Ability' +import Ability from '@ohos.app.ability.UIAbility' export default class MainAbility1 extends Ability { onCreate(want, launchParam) { diff --git a/ability/ability_runtime/stage/actslifecyclesinglehaptest/entry/src/main/ets/MainAbility10/MainAbility10.ts b/ability/ability_runtime/stage/actslifecyclesinglehaptest/entry/src/main/ets/MainAbility10/MainAbility10.ts index 4c6405de0b5d648a536c6c89e5bf39dfa94825d6..2493d8f978fb02bbcf1e9a4b3e205cf6cb469e57 100644 --- a/ability/ability_runtime/stage/actslifecyclesinglehaptest/entry/src/main/ets/MainAbility10/MainAbility10.ts +++ b/ability/ability_runtime/stage/actslifecyclesinglehaptest/entry/src/main/ets/MainAbility10/MainAbility10.ts @@ -12,7 +12,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -import Ability from '@ohos.application.Ability' +import Ability from '@ohos.app.ability.UIAbility' export default class MainAbility10 extends Ability { onCreate(want, launchParam) { diff --git a/ability/ability_runtime/stage/actslifecyclesinglehaptest/entry/src/main/ets/MainAbility11/MainAbility11.ts b/ability/ability_runtime/stage/actslifecyclesinglehaptest/entry/src/main/ets/MainAbility11/MainAbility11.ts index 3887f3b5f99f588930b262117e3189c474a40367..f2428c6ead450f79abddc7033f8946f9bc926331 100644 --- a/ability/ability_runtime/stage/actslifecyclesinglehaptest/entry/src/main/ets/MainAbility11/MainAbility11.ts +++ b/ability/ability_runtime/stage/actslifecyclesinglehaptest/entry/src/main/ets/MainAbility11/MainAbility11.ts @@ -12,7 +12,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -import Ability from '@ohos.application.Ability' +import Ability from '@ohos.app.ability.UIAbility' export default class MainAbility11 extends Ability { onCreate(want, launchParam) { diff --git a/ability/ability_runtime/stage/actslifecyclesinglehaptest/entry/src/main/ets/MainAbility12/MainAbility12.ts b/ability/ability_runtime/stage/actslifecyclesinglehaptest/entry/src/main/ets/MainAbility12/MainAbility12.ts index c49d303ededbf5d74c8c621e4aee32f13816a93b..43bc4c405ccc9b3a631aaced268f485509f1cf03 100644 --- a/ability/ability_runtime/stage/actslifecyclesinglehaptest/entry/src/main/ets/MainAbility12/MainAbility12.ts +++ b/ability/ability_runtime/stage/actslifecyclesinglehaptest/entry/src/main/ets/MainAbility12/MainAbility12.ts @@ -12,7 +12,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -import Ability from '@ohos.application.Ability' +import Ability from '@ohos.app.ability.UIAbility' export default class MainAbility12 extends Ability { onCreate(want, launchParam) { diff --git a/ability/ability_runtime/stage/actslifecyclesinglehaptest/entry/src/main/ets/MainAbility2/MainAbility2.ts b/ability/ability_runtime/stage/actslifecyclesinglehaptest/entry/src/main/ets/MainAbility2/MainAbility2.ts index 075694f3511d0e2b3f863dff8c8fb8f6955d9fbc..e19e6b769b57c835cf63ec8d007d2afeeac93220 100644 --- a/ability/ability_runtime/stage/actslifecyclesinglehaptest/entry/src/main/ets/MainAbility2/MainAbility2.ts +++ b/ability/ability_runtime/stage/actslifecyclesinglehaptest/entry/src/main/ets/MainAbility2/MainAbility2.ts @@ -12,7 +12,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -import Ability from '@ohos.application.Ability' +import Ability from '@ohos.app.ability.UIAbility' export default class MainAbility2 extends Ability { onCreate(want, launchParam) { diff --git a/ability/ability_runtime/stage/actslifecyclesinglehaptest/entry/src/main/ets/MainAbility3/MainAbility3.ts b/ability/ability_runtime/stage/actslifecyclesinglehaptest/entry/src/main/ets/MainAbility3/MainAbility3.ts index 4820224da56666294d08846c5f88391a964bd01a..2e1cc20d718464c5edb7e821dbf1e6b81b950ef1 100644 --- a/ability/ability_runtime/stage/actslifecyclesinglehaptest/entry/src/main/ets/MainAbility3/MainAbility3.ts +++ b/ability/ability_runtime/stage/actslifecyclesinglehaptest/entry/src/main/ets/MainAbility3/MainAbility3.ts @@ -12,7 +12,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -import Ability from '@ohos.application.Ability' +import Ability from '@ohos.app.ability.UIAbility' export default class MainAbility3 extends Ability { onCreate(want, launchParam) { diff --git a/ability/ability_runtime/stage/actslifecyclesinglehaptest/entry/src/main/ets/MainAbility4/MainAbility4.ts b/ability/ability_runtime/stage/actslifecyclesinglehaptest/entry/src/main/ets/MainAbility4/MainAbility4.ts index 68c13255ee6e8b1e8514fc10131099b8d699134c..6ccd88c3ceb4123d1963f16cd0840a32ae0a39d2 100644 --- a/ability/ability_runtime/stage/actslifecyclesinglehaptest/entry/src/main/ets/MainAbility4/MainAbility4.ts +++ b/ability/ability_runtime/stage/actslifecyclesinglehaptest/entry/src/main/ets/MainAbility4/MainAbility4.ts @@ -12,7 +12,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -import Ability from '@ohos.application.Ability' +import Ability from '@ohos.app.ability.UIAbility' export default class MainAbility4 extends Ability { onCreate(want, launchParam) { diff --git a/ability/ability_runtime/stage/actslifecyclesinglehaptest/entry/src/main/ets/MainAbility5/MainAbility5.ts b/ability/ability_runtime/stage/actslifecyclesinglehaptest/entry/src/main/ets/MainAbility5/MainAbility5.ts index 490df759094f2aa85623e8ce8dd9fb4277c5440c..8c9e2ed666915434bf7a19792d85da7b12d3389b 100644 --- a/ability/ability_runtime/stage/actslifecyclesinglehaptest/entry/src/main/ets/MainAbility5/MainAbility5.ts +++ b/ability/ability_runtime/stage/actslifecyclesinglehaptest/entry/src/main/ets/MainAbility5/MainAbility5.ts @@ -12,7 +12,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -import Ability from '@ohos.application.Ability' +import Ability from '@ohos.app.ability.UIAbility' export default class MainAbility5 extends Ability { onCreate(want, launchParam) { diff --git a/ability/ability_runtime/stage/actslifecyclesinglehaptest/entry/src/main/ets/MainAbility6/MainAbility6.ts b/ability/ability_runtime/stage/actslifecyclesinglehaptest/entry/src/main/ets/MainAbility6/MainAbility6.ts index 77591a4370782bfe46befc3428d3b2e06a7aac7a..540f18106652bb7edcc5a5ed35b624d8a4fabb82 100644 --- a/ability/ability_runtime/stage/actslifecyclesinglehaptest/entry/src/main/ets/MainAbility6/MainAbility6.ts +++ b/ability/ability_runtime/stage/actslifecyclesinglehaptest/entry/src/main/ets/MainAbility6/MainAbility6.ts @@ -12,7 +12,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -import Ability from '@ohos.application.Ability' +import Ability from '@ohos.app.ability.UIAbility' export default class MainAbility6 extends Ability { onCreate(want, launchParam) { diff --git a/ability/ability_runtime/stage/actslifecyclesinglehaptest/entry/src/main/ets/MainAbility7/MainAbility7.ts b/ability/ability_runtime/stage/actslifecyclesinglehaptest/entry/src/main/ets/MainAbility7/MainAbility7.ts index 135c385527e66f0944932fb140af84e7be603262..8b004c16cb8507dcbc5ba175e196efd198dc7840 100644 --- a/ability/ability_runtime/stage/actslifecyclesinglehaptest/entry/src/main/ets/MainAbility7/MainAbility7.ts +++ b/ability/ability_runtime/stage/actslifecyclesinglehaptest/entry/src/main/ets/MainAbility7/MainAbility7.ts @@ -12,7 +12,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -import Ability from '@ohos.application.Ability' +import Ability from '@ohos.app.ability.UIAbility' export default class MainAbility7 extends Ability { onCreate(want, launchParam) { diff --git a/ability/ability_runtime/stage/actslifecyclesinglehaptest/entry/src/main/ets/MainAbility8/MainAbility8.ts b/ability/ability_runtime/stage/actslifecyclesinglehaptest/entry/src/main/ets/MainAbility8/MainAbility8.ts index a49fe06fe3720d1b9f3bf9892ed3262e32354261..d408d7c388f4f8ea0bec4423c7f92b3e4f774415 100644 --- a/ability/ability_runtime/stage/actslifecyclesinglehaptest/entry/src/main/ets/MainAbility8/MainAbility8.ts +++ b/ability/ability_runtime/stage/actslifecyclesinglehaptest/entry/src/main/ets/MainAbility8/MainAbility8.ts @@ -12,7 +12,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -import Ability from '@ohos.application.Ability' +import Ability from '@ohos.app.ability.UIAbility' export default class MainAbility8 extends Ability { onCreate(want, launchParam) { diff --git a/ability/ability_runtime/stage/actslifecyclesinglehaptest/entry/src/main/ets/MainAbility9/MainAbility9.ts b/ability/ability_runtime/stage/actslifecyclesinglehaptest/entry/src/main/ets/MainAbility9/MainAbility9.ts index 76e6fea160c3bbe634d429e1ae8bb39c2cea97eb..11584dba0269db78cf550dcd7573749b8a135604 100644 --- a/ability/ability_runtime/stage/actslifecyclesinglehaptest/entry/src/main/ets/MainAbility9/MainAbility9.ts +++ b/ability/ability_runtime/stage/actslifecyclesinglehaptest/entry/src/main/ets/MainAbility9/MainAbility9.ts @@ -12,7 +12,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -import Ability from '@ohos.application.Ability' +import Ability from '@ohos.app.ability.UIAbility' export default class MainAbility9 extends Ability { onCreate(want, launchParam) { diff --git a/ability/ability_runtime/stage/actslifecyclesinglehaptest/entry/src/main/ets/TestAbility/TestAbility.ts b/ability/ability_runtime/stage/actslifecyclesinglehaptest/entry/src/main/ets/TestAbility/TestAbility.ts index 89a84730505783ba229175ab4b55d37f91a16266..8028a70f8af44690b95a08bd177bca6b09f24687 100644 --- a/ability/ability_runtime/stage/actslifecyclesinglehaptest/entry/src/main/ets/TestAbility/TestAbility.ts +++ b/ability/ability_runtime/stage/actslifecyclesinglehaptest/entry/src/main/ets/TestAbility/TestAbility.ts @@ -12,7 +12,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -import Ability from '@ohos.application.Ability' +import Ability from '@ohos.app.ability.UIAbility' export default class TestAbility extends Ability { onCreate(want, launchParam) { diff --git a/ability/ability_runtime/stage/actswindowstagelifecyclemultihaptest/entry/src/main/ets/Application/AbilityStage.ts b/ability/ability_runtime/stage/actswindowstagelifecyclemultihaptest/entry/src/main/ets/Application/AbilityStage.ts index 38a0705fc3c407a264814373bad832e0de5dc15c..07f5d29b9eecdd949990a221e969e3f51fcff747 100755 --- a/ability/ability_runtime/stage/actswindowstagelifecyclemultihaptest/entry/src/main/ets/Application/AbilityStage.ts +++ b/ability/ability_runtime/stage/actswindowstagelifecyclemultihaptest/entry/src/main/ets/Application/AbilityStage.ts @@ -13,7 +13,7 @@ * limitations under the License. */ -import AbilityStage from "@ohos.application.AbilityStage" +import AbilityStage from "@ohos.app.ability.AbilityStage" export default class MyAbilityStage extends AbilityStage { onCreate() { diff --git a/ability/ability_runtime/stage/actswindowstagelifecyclemultihaptest/entry/src/main/ets/MainAbility/MainAbility.ts b/ability/ability_runtime/stage/actswindowstagelifecyclemultihaptest/entry/src/main/ets/MainAbility/MainAbility.ts index 047c5575a74fdca6b2a5e9a019ace65b8638a607..b686f1a174c5ff9f26cde61122e57cbc0831cf95 100755 --- a/ability/ability_runtime/stage/actswindowstagelifecyclemultihaptest/entry/src/main/ets/MainAbility/MainAbility.ts +++ b/ability/ability_runtime/stage/actswindowstagelifecyclemultihaptest/entry/src/main/ets/MainAbility/MainAbility.ts @@ -12,7 +12,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -import Ability from '@ohos.application.Ability' +import Ability from '@ohos.app.ability.UIAbility' export default class MainAbility extends Ability { onCreate(want, launchParam) { diff --git a/ability/ability_runtime/stage/actswindowstagelifecyclemultihaptest/entry/src/main/ets/MainAbility1/MainAbility1.ts b/ability/ability_runtime/stage/actswindowstagelifecyclemultihaptest/entry/src/main/ets/MainAbility1/MainAbility1.ts index 5c87a1b50bb61daf07f5740345b4677975db3fd8..37fa54777b8336d4b16e4dc355f3278f4912b274 100755 --- a/ability/ability_runtime/stage/actswindowstagelifecyclemultihaptest/entry/src/main/ets/MainAbility1/MainAbility1.ts +++ b/ability/ability_runtime/stage/actswindowstagelifecyclemultihaptest/entry/src/main/ets/MainAbility1/MainAbility1.ts @@ -12,7 +12,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -import Ability from '@ohos.application.Ability' +import Ability from '@ohos.app.ability.UIAbility' export default class MainAbility1 extends Ability { onCreate(want, launchParam) { diff --git a/ability/ability_runtime/stage/actswindowstagelifecyclemultihaptest/entry/src/main/ets/MainAbility2/MainAbility2.ts b/ability/ability_runtime/stage/actswindowstagelifecyclemultihaptest/entry/src/main/ets/MainAbility2/MainAbility2.ts index 5f018c44268889f55c9b6e01f9ff2deacf1806d3..ae2dc235237c6a4d71edd889feb4de65c5a65eb7 100755 --- a/ability/ability_runtime/stage/actswindowstagelifecyclemultihaptest/entry/src/main/ets/MainAbility2/MainAbility2.ts +++ b/ability/ability_runtime/stage/actswindowstagelifecyclemultihaptest/entry/src/main/ets/MainAbility2/MainAbility2.ts @@ -12,7 +12,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -import Ability from '@ohos.application.Ability' +import Ability from '@ohos.app.ability.UIAbility' export default class MainAbility2 extends Ability { onCreate(want, launchParam) { diff --git a/ability/ability_runtime/stage/actswindowstagelifecyclemultihaptest/entry/src/main/ets/MainAbility3/MainAbility3.ts b/ability/ability_runtime/stage/actswindowstagelifecyclemultihaptest/entry/src/main/ets/MainAbility3/MainAbility3.ts index 518d6118ff07ff28ea00e93f297cd359c0478e93..55a16bffd01d847ac709ea3e0008b8ae2c67ee98 100755 --- a/ability/ability_runtime/stage/actswindowstagelifecyclemultihaptest/entry/src/main/ets/MainAbility3/MainAbility3.ts +++ b/ability/ability_runtime/stage/actswindowstagelifecyclemultihaptest/entry/src/main/ets/MainAbility3/MainAbility3.ts @@ -13,7 +13,7 @@ * limitations under the License. */ import commonEvent from '@ohos.commonEvent'; -import Ability from '@ohos.application.Ability' +import Ability from '@ohos.app.ability.UIAbility' export default class MainAbility3 extends Ability { onCreate(want, launchParam) { diff --git a/ability/ability_runtime/stage/actswindowstagelifecyclemultihaptest/entry/src/main/ets/MainAbility4/MainAbility4.ts b/ability/ability_runtime/stage/actswindowstagelifecyclemultihaptest/entry/src/main/ets/MainAbility4/MainAbility4.ts index 29ef4b7916fec0722d356876bb4c5ee0cdfb530b..23ce92fa28d387dd054739d18b302425b6156e20 100755 --- a/ability/ability_runtime/stage/actswindowstagelifecyclemultihaptest/entry/src/main/ets/MainAbility4/MainAbility4.ts +++ b/ability/ability_runtime/stage/actswindowstagelifecyclemultihaptest/entry/src/main/ets/MainAbility4/MainAbility4.ts @@ -12,7 +12,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -import Ability from '@ohos.application.Ability' +import Ability from '@ohos.app.ability.UIAbility' export default class MainAbility4 extends Ability { onCreate(want, launchParam) { diff --git a/ability/ability_runtime/stage/actswindowstagelifecyclemultihaptest/entry/src/main/ets/MainAbility5/MainAbility5.ts b/ability/ability_runtime/stage/actswindowstagelifecyclemultihaptest/entry/src/main/ets/MainAbility5/MainAbility5.ts index 365e3faa100f28488fd6ae666547b6f9a9e40b98..6a86226b92a83425402bdaebee665295eccaa4b1 100755 --- a/ability/ability_runtime/stage/actswindowstagelifecyclemultihaptest/entry/src/main/ets/MainAbility5/MainAbility5.ts +++ b/ability/ability_runtime/stage/actswindowstagelifecyclemultihaptest/entry/src/main/ets/MainAbility5/MainAbility5.ts @@ -13,7 +13,7 @@ * limitations under the License. */ -import Ability from '@ohos.application.Ability' +import Ability from '@ohos.app.ability.UIAbility' export default class MainAbility5 extends Ability { onCreate(want, launchParam) { diff --git a/ability/ability_runtime/stage/actswindowstagelifecyclemultihaptest/entry/src/main/ets/MainAbility6/MainAbility6.ts b/ability/ability_runtime/stage/actswindowstagelifecyclemultihaptest/entry/src/main/ets/MainAbility6/MainAbility6.ts index 11d0f86075ff5ffe333fa116d3eeef3c4a303739..91f542b000fe8d1960e1494215cf84532a40d047 100755 --- a/ability/ability_runtime/stage/actswindowstagelifecyclemultihaptest/entry/src/main/ets/MainAbility6/MainAbility6.ts +++ b/ability/ability_runtime/stage/actswindowstagelifecyclemultihaptest/entry/src/main/ets/MainAbility6/MainAbility6.ts @@ -13,7 +13,7 @@ * limitations under the License. */ -import Ability from '@ohos.application.Ability' +import Ability from '@ohos.app.ability.UIAbility' export default class MainAbility6 extends Ability { onCreate(want, launchParam) { diff --git a/ability/ability_runtime/stage/actswindowstagelifecyclemultihaptest/entry/src/main/ets/MainAbility7/MainAbility7.ts b/ability/ability_runtime/stage/actswindowstagelifecyclemultihaptest/entry/src/main/ets/MainAbility7/MainAbility7.ts index 82ff894743b72566f522ea7c28e404c162932c4f..c402acca3456f1f01c931ef9ee9f7bdebc2c6422 100755 --- a/ability/ability_runtime/stage/actswindowstagelifecyclemultihaptest/entry/src/main/ets/MainAbility7/MainAbility7.ts +++ b/ability/ability_runtime/stage/actswindowstagelifecyclemultihaptest/entry/src/main/ets/MainAbility7/MainAbility7.ts @@ -1,4 +1,4 @@ -import Ability from '@ohos.application.Ability' +import Ability from '@ohos.app.ability.UIAbility' export default class MainAbility7 extends Ability { onCreate(want, launchParam) { diff --git a/ability/ability_runtime/stage/actswindowstagelifecyclemultihaptest/entry/src/main/ets/TestAbility/TestAbility.ts b/ability/ability_runtime/stage/actswindowstagelifecyclemultihaptest/entry/src/main/ets/TestAbility/TestAbility.ts index 89a84730505783ba229175ab4b55d37f91a16266..8028a70f8af44690b95a08bd177bca6b09f24687 100644 --- a/ability/ability_runtime/stage/actswindowstagelifecyclemultihaptest/entry/src/main/ets/TestAbility/TestAbility.ts +++ b/ability/ability_runtime/stage/actswindowstagelifecyclemultihaptest/entry/src/main/ets/TestAbility/TestAbility.ts @@ -12,7 +12,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -import Ability from '@ohos.application.Ability' +import Ability from '@ohos.app.ability.UIAbility' export default class TestAbility extends Ability { onCreate(want, launchParam) { diff --git a/ability/ability_runtime/stage/actswindowstagelifecyclemultihaptest/hap4/src/main/ets/Application/AbilityStage.ts b/ability/ability_runtime/stage/actswindowstagelifecyclemultihaptest/hap4/src/main/ets/Application/AbilityStage.ts index 396606ff7396988f0849e54a294700ad86e22678..9ee1aa9fbe29ab663a8171935457969972573fca 100755 --- a/ability/ability_runtime/stage/actswindowstagelifecyclemultihaptest/hap4/src/main/ets/Application/AbilityStage.ts +++ b/ability/ability_runtime/stage/actswindowstagelifecyclemultihaptest/hap4/src/main/ets/Application/AbilityStage.ts @@ -13,7 +13,7 @@ * limitations under the License. */ -import AbilityStage from "@ohos.application.AbilityStage" +import AbilityStage from "@ohos.app.ability.AbilityStage" export default class MyAbilityStage extends AbilityStage { onCreate() { diff --git a/ability/ability_runtime/stage/actswindowstagelifecyclemultihaptest/hap4/src/main/ets/Hap4MainAbility1/Hap4MainAbility1.ts b/ability/ability_runtime/stage/actswindowstagelifecyclemultihaptest/hap4/src/main/ets/Hap4MainAbility1/Hap4MainAbility1.ts index 5669014b880b3ca3a57658c37e2c6b17db83e7d6..935ed22bee07a17223b327e7641730cfc49f5cad 100755 --- a/ability/ability_runtime/stage/actswindowstagelifecyclemultihaptest/hap4/src/main/ets/Hap4MainAbility1/Hap4MainAbility1.ts +++ b/ability/ability_runtime/stage/actswindowstagelifecyclemultihaptest/hap4/src/main/ets/Hap4MainAbility1/Hap4MainAbility1.ts @@ -13,7 +13,7 @@ * limitations under the License. */ -import Ability from '@ohos.application.Ability' +import Ability from '@ohos.app.ability.UIAbility' export default class Hap4MainAbility1 extends Ability { onCreate(want, launchParam) { diff --git a/ability/ability_runtime/stage/actswindowstagelifecyclesinglehaptest/entry/src/main/ets/Application/AbilityStage.ts b/ability/ability_runtime/stage/actswindowstagelifecyclesinglehaptest/entry/src/main/ets/Application/AbilityStage.ts index 7bfbd67ed47217157bd0a7342a058e445d40a29f..60151aedef1209dde89705b2c736274a431971c5 100755 --- a/ability/ability_runtime/stage/actswindowstagelifecyclesinglehaptest/entry/src/main/ets/Application/AbilityStage.ts +++ b/ability/ability_runtime/stage/actswindowstagelifecyclesinglehaptest/entry/src/main/ets/Application/AbilityStage.ts @@ -12,7 +12,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -import AbilityStage from "@ohos.application.AbilityStage"; +import AbilityStage from "@ohos.app.ability.AbilityStage"; export default class MyAbilityStage extends AbilityStage { onCreate() { diff --git a/ability/ability_runtime/stage/actswindowstagelifecyclesinglehaptest/entry/src/main/ets/Hap1MainAbility1/Hap1MainAbility1.ts b/ability/ability_runtime/stage/actswindowstagelifecyclesinglehaptest/entry/src/main/ets/Hap1MainAbility1/Hap1MainAbility1.ts index 0bd8bae9cf466315bddb9dcd0cd2bb977db55340..7ce8a676db3252111f5ffdbf2c6bb1078966796a 100755 --- a/ability/ability_runtime/stage/actswindowstagelifecyclesinglehaptest/entry/src/main/ets/Hap1MainAbility1/Hap1MainAbility1.ts +++ b/ability/ability_runtime/stage/actswindowstagelifecyclesinglehaptest/entry/src/main/ets/Hap1MainAbility1/Hap1MainAbility1.ts @@ -12,7 +12,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -import Ability from '@ohos.application.Ability' +import Ability from '@ohos.app.ability.UIAbility' export default class Hap1MainAbility1 extends Ability { onCreate(want, launchParam) { diff --git a/ability/ability_runtime/stage/actswindowstagelifecyclesinglehaptest/entry/src/main/ets/Hap1MainAbility2/Hap1MainAbility2.ts b/ability/ability_runtime/stage/actswindowstagelifecyclesinglehaptest/entry/src/main/ets/Hap1MainAbility2/Hap1MainAbility2.ts index 0827cc9ac6130e94f9b41009d09d439b9062898e..b641e36ef557fa3742ad2d2e2001f769e3788bd8 100755 --- a/ability/ability_runtime/stage/actswindowstagelifecyclesinglehaptest/entry/src/main/ets/Hap1MainAbility2/Hap1MainAbility2.ts +++ b/ability/ability_runtime/stage/actswindowstagelifecyclesinglehaptest/entry/src/main/ets/Hap1MainAbility2/Hap1MainAbility2.ts @@ -12,7 +12,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -import Ability from '@ohos.application.Ability' +import Ability from '@ohos.app.ability.UIAbility' export default class Hap1MainAbility2 extends Ability { onCreate(want, launchParam) { diff --git a/ability/ability_runtime/stage/actswindowstagelifecyclesinglehaptest/entry/src/main/ets/MainAbility/MainAbility.ts b/ability/ability_runtime/stage/actswindowstagelifecyclesinglehaptest/entry/src/main/ets/MainAbility/MainAbility.ts index 2f474d0bc3ef5bb5dbc351e345e2c690dfb26bd7..cee1378d92208d54d4719ba230723e4785c6b881 100755 --- a/ability/ability_runtime/stage/actswindowstagelifecyclesinglehaptest/entry/src/main/ets/MainAbility/MainAbility.ts +++ b/ability/ability_runtime/stage/actswindowstagelifecyclesinglehaptest/entry/src/main/ets/MainAbility/MainAbility.ts @@ -12,7 +12,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -import Ability from '@ohos.application.Ability'; +import Ability from '@ohos.app.ability.UIAbility'; export default class MainAbility extends Ability { onCreate(want, launchParam) { diff --git a/ability/ability_runtime/stage/actswindowstagelifecyclesinglehaptest/entry/src/main/ets/MainAbility1/MainAbility1.ts b/ability/ability_runtime/stage/actswindowstagelifecyclesinglehaptest/entry/src/main/ets/MainAbility1/MainAbility1.ts index 3ed184640b5978af114d8ec247946a7573eede16..7aadcba72e1d2b610c0546dc92472c5cccbab2c0 100755 --- a/ability/ability_runtime/stage/actswindowstagelifecyclesinglehaptest/entry/src/main/ets/MainAbility1/MainAbility1.ts +++ b/ability/ability_runtime/stage/actswindowstagelifecyclesinglehaptest/entry/src/main/ets/MainAbility1/MainAbility1.ts @@ -12,7 +12,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -import Ability from '@ohos.application.Ability' +import Ability from '@ohos.app.ability.UIAbility' export default class MainAbility1 extends Ability { onCreate(want, launchParam) { diff --git a/ability/ability_runtime/stage/actswindowstagelifecyclesinglehaptest/entry/src/main/ets/MainAbility10/MainAbility10.ts b/ability/ability_runtime/stage/actswindowstagelifecyclesinglehaptest/entry/src/main/ets/MainAbility10/MainAbility10.ts index 113eddac3edf088de89be1288003a7ff3394313e..43b317b0aedf09c79bdf2e46aeef1a67a8bdae92 100755 --- a/ability/ability_runtime/stage/actswindowstagelifecyclesinglehaptest/entry/src/main/ets/MainAbility10/MainAbility10.ts +++ b/ability/ability_runtime/stage/actswindowstagelifecyclesinglehaptest/entry/src/main/ets/MainAbility10/MainAbility10.ts @@ -12,7 +12,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -import Ability from '@ohos.application.Ability' +import Ability from '@ohos.app.ability.UIAbility' export default class MainAbility10 extends Ability { onCreate(want, launchParam) { diff --git a/ability/ability_runtime/stage/actswindowstagelifecyclesinglehaptest/entry/src/main/ets/MainAbility11/MainAbility11.ts b/ability/ability_runtime/stage/actswindowstagelifecyclesinglehaptest/entry/src/main/ets/MainAbility11/MainAbility11.ts index 52724343dfca0cb100d6c7c7b7fe87c3eb407270..81d4157e9872140a8354037458071d8431491fcd 100755 --- a/ability/ability_runtime/stage/actswindowstagelifecyclesinglehaptest/entry/src/main/ets/MainAbility11/MainAbility11.ts +++ b/ability/ability_runtime/stage/actswindowstagelifecyclesinglehaptest/entry/src/main/ets/MainAbility11/MainAbility11.ts @@ -12,7 +12,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -import Ability from '@ohos.application.Ability' +import Ability from '@ohos.app.ability.UIAbility' export default class MainAbility11 extends Ability { onCreate(want, launchParam) { diff --git a/ability/ability_runtime/stage/actswindowstagelifecyclesinglehaptest/entry/src/main/ets/MainAbility12/MainAbility12.ts b/ability/ability_runtime/stage/actswindowstagelifecyclesinglehaptest/entry/src/main/ets/MainAbility12/MainAbility12.ts index 7b8c66d51ab046445efa3123907cc83f3dedca9c..ae270ee20e7742fd63a3333e1c96f81b97c22669 100755 --- a/ability/ability_runtime/stage/actswindowstagelifecyclesinglehaptest/entry/src/main/ets/MainAbility12/MainAbility12.ts +++ b/ability/ability_runtime/stage/actswindowstagelifecyclesinglehaptest/entry/src/main/ets/MainAbility12/MainAbility12.ts @@ -12,7 +12,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -import Ability from '@ohos.application.Ability' +import Ability from '@ohos.app.ability.UIAbility' export default class MainAbility12 extends Ability { onCreate(want, launchParam) { diff --git a/ability/ability_runtime/stage/actswindowstagelifecyclesinglehaptest/entry/src/main/ets/MainAbility2/MainAbility2.ts b/ability/ability_runtime/stage/actswindowstagelifecyclesinglehaptest/entry/src/main/ets/MainAbility2/MainAbility2.ts index 075694f3511d0e2b3f863dff8c8fb8f6955d9fbc..e19e6b769b57c835cf63ec8d007d2afeeac93220 100755 --- a/ability/ability_runtime/stage/actswindowstagelifecyclesinglehaptest/entry/src/main/ets/MainAbility2/MainAbility2.ts +++ b/ability/ability_runtime/stage/actswindowstagelifecyclesinglehaptest/entry/src/main/ets/MainAbility2/MainAbility2.ts @@ -12,7 +12,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -import Ability from '@ohos.application.Ability' +import Ability from '@ohos.app.ability.UIAbility' export default class MainAbility2 extends Ability { onCreate(want, launchParam) { diff --git a/ability/ability_runtime/stage/actswindowstagelifecyclesinglehaptest/entry/src/main/ets/MainAbility3/MainAbility3.ts b/ability/ability_runtime/stage/actswindowstagelifecyclesinglehaptest/entry/src/main/ets/MainAbility3/MainAbility3.ts index 5bebcb984502bf4f1aed85635ec8f09a83d53ba5..52e7ac3f3e9c91b538685da958bf7b4425238f4e 100755 --- a/ability/ability_runtime/stage/actswindowstagelifecyclesinglehaptest/entry/src/main/ets/MainAbility3/MainAbility3.ts +++ b/ability/ability_runtime/stage/actswindowstagelifecyclesinglehaptest/entry/src/main/ets/MainAbility3/MainAbility3.ts @@ -12,7 +12,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -import Ability from '@ohos.application.Ability' +import Ability from '@ohos.app.ability.UIAbility' export default class MainAbility3 extends Ability { onCreate(want, launchParam) { diff --git a/ability/ability_runtime/stage/actswindowstagelifecyclesinglehaptest/entry/src/main/ets/MainAbility4/MainAbility4.ts b/ability/ability_runtime/stage/actswindowstagelifecyclesinglehaptest/entry/src/main/ets/MainAbility4/MainAbility4.ts index 654590c7d003f3bacebfe56cd5e0c867fbdc65e5..c39238c8eba9780c4c406016118801fab80d53f0 100755 --- a/ability/ability_runtime/stage/actswindowstagelifecyclesinglehaptest/entry/src/main/ets/MainAbility4/MainAbility4.ts +++ b/ability/ability_runtime/stage/actswindowstagelifecyclesinglehaptest/entry/src/main/ets/MainAbility4/MainAbility4.ts @@ -12,7 +12,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -import Ability from '@ohos.application.Ability' +import Ability from '@ohos.app.ability.UIAbility' export default class MainAbility4 extends Ability { onCreate(want, launchParam) { diff --git a/ability/ability_runtime/stage/actswindowstagelifecyclesinglehaptest/entry/src/main/ets/MainAbility5/MainAbility5.ts b/ability/ability_runtime/stage/actswindowstagelifecyclesinglehaptest/entry/src/main/ets/MainAbility5/MainAbility5.ts index 490df759094f2aa85623e8ce8dd9fb4277c5440c..8c9e2ed666915434bf7a19792d85da7b12d3389b 100755 --- a/ability/ability_runtime/stage/actswindowstagelifecyclesinglehaptest/entry/src/main/ets/MainAbility5/MainAbility5.ts +++ b/ability/ability_runtime/stage/actswindowstagelifecyclesinglehaptest/entry/src/main/ets/MainAbility5/MainAbility5.ts @@ -12,7 +12,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -import Ability from '@ohos.application.Ability' +import Ability from '@ohos.app.ability.UIAbility' export default class MainAbility5 extends Ability { onCreate(want, launchParam) { diff --git a/ability/ability_runtime/stage/actswindowstagelifecyclesinglehaptest/entry/src/main/ets/MainAbility6/MainAbility6.ts b/ability/ability_runtime/stage/actswindowstagelifecyclesinglehaptest/entry/src/main/ets/MainAbility6/MainAbility6.ts index e3a1b85db4e8f29c848d6b02f958d8c6cf58102f..ca601c7dd2ebdf312ce9ac7a883e2d53e20919ee 100755 --- a/ability/ability_runtime/stage/actswindowstagelifecyclesinglehaptest/entry/src/main/ets/MainAbility6/MainAbility6.ts +++ b/ability/ability_runtime/stage/actswindowstagelifecyclesinglehaptest/entry/src/main/ets/MainAbility6/MainAbility6.ts @@ -12,7 +12,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -import Ability from '@ohos.application.Ability' +import Ability from '@ohos.app.ability.UIAbility' export default class MainAbility6 extends Ability { onCreate(want, launchParam) { diff --git a/ability/ability_runtime/stage/actswindowstagelifecyclesinglehaptest/entry/src/main/ets/MainAbility7/MainAbility7.ts b/ability/ability_runtime/stage/actswindowstagelifecyclesinglehaptest/entry/src/main/ets/MainAbility7/MainAbility7.ts index 8405125c1b0aba9980616d356739ba4d969dccf6..78411c87088dc569078fd8372470720648c422c5 100755 --- a/ability/ability_runtime/stage/actswindowstagelifecyclesinglehaptest/entry/src/main/ets/MainAbility7/MainAbility7.ts +++ b/ability/ability_runtime/stage/actswindowstagelifecyclesinglehaptest/entry/src/main/ets/MainAbility7/MainAbility7.ts @@ -12,7 +12,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -import Ability from '@ohos.application.Ability' +import Ability from '@ohos.app.ability.UIAbility' export default class MainAbility7 extends Ability { onCreate(want, launchParam) { diff --git a/ability/ability_runtime/stage/actswindowstagelifecyclesinglehaptest/entry/src/main/ets/MainAbility8/MainAbility8.ts b/ability/ability_runtime/stage/actswindowstagelifecyclesinglehaptest/entry/src/main/ets/MainAbility8/MainAbility8.ts index ede5afac6e966d0ff806304d10889af4bcfe05f8..0fa17a471ff24dffa5b3ecc0cda66a0893c9b219 100755 --- a/ability/ability_runtime/stage/actswindowstagelifecyclesinglehaptest/entry/src/main/ets/MainAbility8/MainAbility8.ts +++ b/ability/ability_runtime/stage/actswindowstagelifecyclesinglehaptest/entry/src/main/ets/MainAbility8/MainAbility8.ts @@ -12,7 +12,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -import Ability from '@ohos.application.Ability' +import Ability from '@ohos.app.ability.UIAbility' export default class MainAbility8 extends Ability { onCreate(want, launchParam) { diff --git a/ability/ability_runtime/stage/actswindowstagelifecyclesinglehaptest/entry/src/main/ets/MainAbility9/MainAbility9.ts b/ability/ability_runtime/stage/actswindowstagelifecyclesinglehaptest/entry/src/main/ets/MainAbility9/MainAbility9.ts index c191164700f84747ffcffafc677ecbb05a6f185b..4f430382b52eb8952e90362b540404477e356011 100755 --- a/ability/ability_runtime/stage/actswindowstagelifecyclesinglehaptest/entry/src/main/ets/MainAbility9/MainAbility9.ts +++ b/ability/ability_runtime/stage/actswindowstagelifecyclesinglehaptest/entry/src/main/ets/MainAbility9/MainAbility9.ts @@ -12,7 +12,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -import Ability from '@ohos.application.Ability' +import Ability from '@ohos.app.ability.UIAbility' export default class MainAbility9 extends Ability { onCreate(want, launchParam) { diff --git a/ability/ability_runtime/stage/actswindowstagelifecyclesinglehaptest/entry/src/main/ets/TestAbility/TestAbility.ts b/ability/ability_runtime/stage/actswindowstagelifecyclesinglehaptest/entry/src/main/ets/TestAbility/TestAbility.ts index 89a84730505783ba229175ab4b55d37f91a16266..8028a70f8af44690b95a08bd177bca6b09f24687 100644 --- a/ability/ability_runtime/stage/actswindowstagelifecyclesinglehaptest/entry/src/main/ets/TestAbility/TestAbility.ts +++ b/ability/ability_runtime/stage/actswindowstagelifecyclesinglehaptest/entry/src/main/ets/TestAbility/TestAbility.ts @@ -12,7 +12,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -import Ability from '@ohos.application.Ability' +import Ability from '@ohos.app.ability.UIAbility' export default class TestAbility extends Ability { onCreate(want, launchParam) { diff --git a/ability/ability_runtime/workercontextcover/workercontexttest/entry/src/main/ets/Application/AbilityStage.ts b/ability/ability_runtime/workercontextcover/workercontexttest/entry/src/main/ets/Application/AbilityStage.ts index e88c656f83a9dc1473ca16ad2fc15d0812ac64f1..2c9e6ad7710063e6e64a3e5b0a08d1bcb7cea9c6 100644 --- a/ability/ability_runtime/workercontextcover/workercontexttest/entry/src/main/ets/Application/AbilityStage.ts +++ b/ability/ability_runtime/workercontextcover/workercontexttest/entry/src/main/ets/Application/AbilityStage.ts @@ -12,7 +12,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -import AbilityStage from "@ohos.application.AbilityStage" +import AbilityStage from "@ohos.app.ability.AbilityStage" var printLog0 = 'Worker:AbilityStage:' export default class MyAbilityStage extends AbilityStage { diff --git a/ability/ability_runtime/workercontextcover/workercontexttest/entry/src/main/ets/MainAbility/MainAbility.ts b/ability/ability_runtime/workercontextcover/workercontexttest/entry/src/main/ets/MainAbility/MainAbility.ts index a6d9684bfb05d18fdaf65b3a97989d7f63f88378..2cb7f3fa8dbb8cca6b8ba4d78b9b91ce0966d116 100644 --- a/ability/ability_runtime/workercontextcover/workercontexttest/entry/src/main/ets/MainAbility/MainAbility.ts +++ b/ability/ability_runtime/workercontextcover/workercontexttest/entry/src/main/ets/MainAbility/MainAbility.ts @@ -12,7 +12,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -import Ability from '@ohos.application.Ability'; +import Ability from '@ohos.app.ability.UIAbility'; var printLog1 = 'Worker:MainAbility:' var listPush1 = 'Worker_MainAbility_' diff --git a/ability/ability_runtime/workercontextcover/workercontexttest/entry/src/main/ets/TestAbility/TestAbility.ts b/ability/ability_runtime/workercontextcover/workercontexttest/entry/src/main/ets/TestAbility/TestAbility.ts index 89a84730505783ba229175ab4b55d37f91a16266..8028a70f8af44690b95a08bd177bca6b09f24687 100644 --- a/ability/ability_runtime/workercontextcover/workercontexttest/entry/src/main/ets/TestAbility/TestAbility.ts +++ b/ability/ability_runtime/workercontextcover/workercontexttest/entry/src/main/ets/TestAbility/TestAbility.ts @@ -12,7 +12,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -import Ability from '@ohos.application.Ability' +import Ability from '@ohos.app.ability.UIAbility' export default class TestAbility extends Ability { onCreate(want, launchParam) { diff --git a/account/appaccount/actsaccounttstest/entry/src/main/ets/Application/AbilityStage.ts b/account/appaccount/actsaccounttstest/entry/src/main/ets/Application/AbilityStage.ts index 32dfe93ccff0375201857794de902cec4d239442..11200f672cfa3a981668dbdee5a700935bf7be99 100644 --- a/account/appaccount/actsaccounttstest/entry/src/main/ets/Application/AbilityStage.ts +++ b/account/appaccount/actsaccounttstest/entry/src/main/ets/Application/AbilityStage.ts @@ -1,4 +1,4 @@ -import AbilityStage from "@ohos.application.AbilityStage" +import AbilityStage from "@ohos.app.ability.AbilityStage" export default class MyAbilityStage extends AbilityStage { onCreate() { diff --git a/account/appaccount/actsaccounttstest/entry/src/main/ets/MainAbility/MainAbility.ts b/account/appaccount/actsaccounttstest/entry/src/main/ets/MainAbility/MainAbility.ts index cd47e022551551b3c393359b8cccafb7462c600a..8ac9f56fff00abca346f70501ca0e0e0775ad536 100644 --- a/account/appaccount/actsaccounttstest/entry/src/main/ets/MainAbility/MainAbility.ts +++ b/account/appaccount/actsaccounttstest/entry/src/main/ets/MainAbility/MainAbility.ts @@ -12,7 +12,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -import Ability from '@ohos.application.Ability' +import Ability from '@ohos.app.ability.UIAbility' import AbilityDelegatorRegistry from '@ohos.application.abilityDelegatorRegistry' import { Hypium } from '@ohos/hypium' import testsuite from '../test/List.test' diff --git a/account/appaccount/actsaccounttstest/entry/src/main/ets/TestAbility/TestAbility.ts b/account/appaccount/actsaccounttstest/entry/src/main/ets/TestAbility/TestAbility.ts index 89a84730505783ba229175ab4b55d37f91a16266..8028a70f8af44690b95a08bd177bca6b09f24687 100644 --- a/account/appaccount/actsaccounttstest/entry/src/main/ets/TestAbility/TestAbility.ts +++ b/account/appaccount/actsaccounttstest/entry/src/main/ets/TestAbility/TestAbility.ts @@ -12,7 +12,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -import Ability from '@ohos.application.Ability' +import Ability from '@ohos.app.ability.UIAbility' export default class TestAbility extends Ability { onCreate(want, launchParam) { diff --git a/arkui/ace_ets_web_dev/entry/src/main/ets/Application/AbilityStage.ts b/arkui/ace_ets_web_dev/entry/src/main/ets/Application/AbilityStage.ts index e3fdadfebeeeb676df2ce8f78f4b59e26fae9cf0..b0e0206ea9fb5ce94ef140d69510b6280969dd8e 100644 --- a/arkui/ace_ets_web_dev/entry/src/main/ets/Application/AbilityStage.ts +++ b/arkui/ace_ets_web_dev/entry/src/main/ets/Application/AbilityStage.ts @@ -1,4 +1,4 @@ -import AbilityStage from "@ohos.application.AbilityStage" +import AbilityStage from "@ohos.app.ability.AbilityStage" export default class MyAbilityStage extends AbilityStage { onCreate() { diff --git a/arkui/ace_ets_web_dev/entry/src/main/ets/MainAbility/MainAbility.ts b/arkui/ace_ets_web_dev/entry/src/main/ets/MainAbility/MainAbility.ts index 59523bc6f264d3bd1e38c03be90358e12f7f5c28..cfe7672698951a823ada425c9003f572e691f782 100644 --- a/arkui/ace_ets_web_dev/entry/src/main/ets/MainAbility/MainAbility.ts +++ b/arkui/ace_ets_web_dev/entry/src/main/ets/MainAbility/MainAbility.ts @@ -1,4 +1,4 @@ -import Ability from '@ohos.application.Ability' +import Ability from '@ohos.app.ability.UIAbility' export default class MainAbility extends Ability { onCreate(want,launchParam){ diff --git a/arkui/ace_ets_web_dev_three/entry/src/main/ets/Application/AbilityStage.ts b/arkui/ace_ets_web_dev_three/entry/src/main/ets/Application/AbilityStage.ts index e3fdadfebeeeb676df2ce8f78f4b59e26fae9cf0..b0e0206ea9fb5ce94ef140d69510b6280969dd8e 100644 --- a/arkui/ace_ets_web_dev_three/entry/src/main/ets/Application/AbilityStage.ts +++ b/arkui/ace_ets_web_dev_three/entry/src/main/ets/Application/AbilityStage.ts @@ -1,4 +1,4 @@ -import AbilityStage from "@ohos.application.AbilityStage" +import AbilityStage from "@ohos.app.ability.AbilityStage" export default class MyAbilityStage extends AbilityStage { onCreate() { diff --git a/arkui/ace_ets_web_dev_three/entry/src/main/ets/MainAbility/MainAbility.ts b/arkui/ace_ets_web_dev_three/entry/src/main/ets/MainAbility/MainAbility.ts index 59523bc6f264d3bd1e38c03be90358e12f7f5c28..cfe7672698951a823ada425c9003f572e691f782 100644 --- a/arkui/ace_ets_web_dev_three/entry/src/main/ets/MainAbility/MainAbility.ts +++ b/arkui/ace_ets_web_dev_three/entry/src/main/ets/MainAbility/MainAbility.ts @@ -1,4 +1,4 @@ -import Ability from '@ohos.application.Ability' +import Ability from '@ohos.app.ability.UIAbility' export default class MainAbility extends Ability { onCreate(want,launchParam){ diff --git a/arkui/ace_ets_web_dev_two/entry/src/main/ets/Application/AbilityStage.ts b/arkui/ace_ets_web_dev_two/entry/src/main/ets/Application/AbilityStage.ts index e3fdadfebeeeb676df2ce8f78f4b59e26fae9cf0..b0e0206ea9fb5ce94ef140d69510b6280969dd8e 100644 --- a/arkui/ace_ets_web_dev_two/entry/src/main/ets/Application/AbilityStage.ts +++ b/arkui/ace_ets_web_dev_two/entry/src/main/ets/Application/AbilityStage.ts @@ -1,4 +1,4 @@ -import AbilityStage from "@ohos.application.AbilityStage" +import AbilityStage from "@ohos.app.ability.AbilityStage" export default class MyAbilityStage extends AbilityStage { onCreate() { diff --git a/arkui/ace_ets_web_dev_two/entry/src/main/ets/MainAbility/MainAbility.ts b/arkui/ace_ets_web_dev_two/entry/src/main/ets/MainAbility/MainAbility.ts index 59523bc6f264d3bd1e38c03be90358e12f7f5c28..cfe7672698951a823ada425c9003f572e691f782 100644 --- a/arkui/ace_ets_web_dev_two/entry/src/main/ets/MainAbility/MainAbility.ts +++ b/arkui/ace_ets_web_dev_two/entry/src/main/ets/MainAbility/MainAbility.ts @@ -1,4 +1,4 @@ -import Ability from '@ohos.application.Ability' +import Ability from '@ohos.app.ability.UIAbility' export default class MainAbility extends Ability { onCreate(want,launchParam){ diff --git a/arkui/ace_js_attribute_api/src/main/js/MainAbility/pages/list/router/index.js b/arkui/ace_js_attribute_api/src/main/js/MainAbility/pages/list/router/index.js index c429c3de01c7234de49b40ff6995f791f8943c1c..0668cd3e9c891ec9fe2a3f44dec892c10dc7410b 100644 --- a/arkui/ace_js_attribute_api/src/main/js/MainAbility/pages/list/router/index.js +++ b/arkui/ace_js_attribute_api/src/main/js/MainAbility/pages/list/router/index.js @@ -12,7 +12,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -import Ability from '@ohos.application.Ability' +import Ability from '@ohos.app.ability.UIAbility' import ConfigurationConstant from '@ohos.application.ConfigurationConstant' export default { diff --git a/bundlemanager/bundle_standard/bundlemanager/actsbundlemanagerstagetest/entry/src/main/ets/FormAbility/FormAbility.ts b/bundlemanager/bundle_standard/bundlemanager/actsbundlemanagerstagetest/entry/src/main/ets/FormAbility/FormAbility.ts index 2f94ce17654ff7562d7bc9878961bbab2219fe92..d443631109f5f73817ec907b36c1b7a3d353d357 100755 --- a/bundlemanager/bundle_standard/bundlemanager/actsbundlemanagerstagetest/entry/src/main/ets/FormAbility/FormAbility.ts +++ b/bundlemanager/bundle_standard/bundlemanager/actsbundlemanagerstagetest/entry/src/main/ets/FormAbility/FormAbility.ts @@ -1,4 +1,4 @@ -import FormExtension from '@ohos.application.FormExtension'; +import FormExtension from '@ohos.app.form.FormExtensionAbility'; import formBindingData from '@ohos.application.formBindingData'; import formInfo from '@ohos.application.formInfo'; diff --git a/bundlemanager/bundle_standard/bundlemanager/actsbundlemanagerstagetest/entry/src/main/ets/ServiceAbility/FormAbility.ts b/bundlemanager/bundle_standard/bundlemanager/actsbundlemanagerstagetest/entry/src/main/ets/ServiceAbility/FormAbility.ts index 2f94ce17654ff7562d7bc9878961bbab2219fe92..d443631109f5f73817ec907b36c1b7a3d353d357 100755 --- a/bundlemanager/bundle_standard/bundlemanager/actsbundlemanagerstagetest/entry/src/main/ets/ServiceAbility/FormAbility.ts +++ b/bundlemanager/bundle_standard/bundlemanager/actsbundlemanagerstagetest/entry/src/main/ets/ServiceAbility/FormAbility.ts @@ -1,4 +1,4 @@ -import FormExtension from '@ohos.application.FormExtension'; +import FormExtension from '@ohos.app.form.FormExtensionAbility'; import formBindingData from '@ohos.application.formBindingData'; import formInfo from '@ohos.application.formInfo'; diff --git a/bundlemanager/bundle_standard/bundlemanager/sceneProject/bmsstagedemoone/entry/src/main/ets/FormAbility/FormAbility.ts b/bundlemanager/bundle_standard/bundlemanager/sceneProject/bmsstagedemoone/entry/src/main/ets/FormAbility/FormAbility.ts index 2f94ce17654ff7562d7bc9878961bbab2219fe92..d443631109f5f73817ec907b36c1b7a3d353d357 100644 --- a/bundlemanager/bundle_standard/bundlemanager/sceneProject/bmsstagedemoone/entry/src/main/ets/FormAbility/FormAbility.ts +++ b/bundlemanager/bundle_standard/bundlemanager/sceneProject/bmsstagedemoone/entry/src/main/ets/FormAbility/FormAbility.ts @@ -1,4 +1,4 @@ -import FormExtension from '@ohos.application.FormExtension'; +import FormExtension from '@ohos.app.form.FormExtensionAbility'; import formBindingData from '@ohos.application.formBindingData'; import formInfo from '@ohos.application.formInfo'; diff --git a/bundlemanager/bundle_standard/bundlemanager/sceneProject/bmsstagedemoone/entry/src/main/ets/ServiceAbility/FormAbility.ts b/bundlemanager/bundle_standard/bundlemanager/sceneProject/bmsstagedemoone/entry/src/main/ets/ServiceAbility/FormAbility.ts index 2f94ce17654ff7562d7bc9878961bbab2219fe92..d443631109f5f73817ec907b36c1b7a3d353d357 100644 --- a/bundlemanager/bundle_standard/bundlemanager/sceneProject/bmsstagedemoone/entry/src/main/ets/ServiceAbility/FormAbility.ts +++ b/bundlemanager/bundle_standard/bundlemanager/sceneProject/bmsstagedemoone/entry/src/main/ets/ServiceAbility/FormAbility.ts @@ -1,4 +1,4 @@ -import FormExtension from '@ohos.application.FormExtension'; +import FormExtension from '@ohos.app.form.FormExtensionAbility'; import formBindingData from '@ohos.application.formBindingData'; import formInfo from '@ohos.application.formInfo'; diff --git a/bundlemanager/bundle_standard/bundlemanager/sceneProject/bmsstagedemotwo/entry/src/main/ets/FormAbility/FormAbility.ts b/bundlemanager/bundle_standard/bundlemanager/sceneProject/bmsstagedemotwo/entry/src/main/ets/FormAbility/FormAbility.ts index 2f94ce17654ff7562d7bc9878961bbab2219fe92..d443631109f5f73817ec907b36c1b7a3d353d357 100644 --- a/bundlemanager/bundle_standard/bundlemanager/sceneProject/bmsstagedemotwo/entry/src/main/ets/FormAbility/FormAbility.ts +++ b/bundlemanager/bundle_standard/bundlemanager/sceneProject/bmsstagedemotwo/entry/src/main/ets/FormAbility/FormAbility.ts @@ -1,4 +1,4 @@ -import FormExtension from '@ohos.application.FormExtension'; +import FormExtension from '@ohos.app.form.FormExtensionAbility'; import formBindingData from '@ohos.application.formBindingData'; import formInfo from '@ohos.application.formInfo'; diff --git a/bundlemanager/bundle_standard/bundlemanager/sceneProject/bmsstagedemotwo/entry/src/main/ets/ServiceAbility/FormAbility.ts b/bundlemanager/bundle_standard/bundlemanager/sceneProject/bmsstagedemotwo/entry/src/main/ets/ServiceAbility/FormAbility.ts index 2f94ce17654ff7562d7bc9878961bbab2219fe92..d443631109f5f73817ec907b36c1b7a3d353d357 100644 --- a/bundlemanager/bundle_standard/bundlemanager/sceneProject/bmsstagedemotwo/entry/src/main/ets/ServiceAbility/FormAbility.ts +++ b/bundlemanager/bundle_standard/bundlemanager/sceneProject/bmsstagedemotwo/entry/src/main/ets/ServiceAbility/FormAbility.ts @@ -1,4 +1,4 @@ -import FormExtension from '@ohos.application.FormExtension'; +import FormExtension from '@ohos.app.form.FormExtensionAbility'; import formBindingData from '@ohos.application.formBindingData'; import formInfo from '@ohos.application.formInfo'; diff --git a/distributeddatamgr/relationalStoretest/relationalStoreStagetest/entry/src/main/ets/Application/AbilityStage.ts b/distributeddatamgr/relationalStoretest/relationalStoreStagetest/entry/src/main/ets/Application/AbilityStage.ts index 02ecba3c3e620207210edec3de91aa7191f6e8c7..582953b77acfea6ba949ddb2e4c378fd08d042a8 100644 --- a/distributeddatamgr/relationalStoretest/relationalStoreStagetest/entry/src/main/ets/Application/AbilityStage.ts +++ b/distributeddatamgr/relationalStoretest/relationalStoreStagetest/entry/src/main/ets/Application/AbilityStage.ts @@ -13,7 +13,7 @@ * limitations under the License. */ -import AbilityStage from "@ohos.application.AbilityStage" +import AbilityStage from "@ohos.app.ability.AbilityStage" export default class MyAbilityStage extends AbilityStage { onCreate() { diff --git a/distributeddatamgr/relationalStoretest/relationalStoreStagetest/entry/src/main/ets/MainAbility/MainAbility.ts b/distributeddatamgr/relationalStoretest/relationalStoreStagetest/entry/src/main/ets/MainAbility/MainAbility.ts index cc6fdc5ef88488efe7bb9715a0c385c4bc32ffd0..fb807f8be22a061626b54fe23ce5f17031b4cd78 100644 --- a/distributeddatamgr/relationalStoretest/relationalStoreStagetest/entry/src/main/ets/MainAbility/MainAbility.ts +++ b/distributeddatamgr/relationalStoretest/relationalStoreStagetest/entry/src/main/ets/MainAbility/MainAbility.ts @@ -13,7 +13,7 @@ * limitations under the License. */ -import Ability from '@ohos.application.Ability' +import Ability from '@ohos.app.ability.UIAbility' import dataShare from '@ohos.data.dataShare' import rpc from "@ohos.rpc"; @@ -111,7 +111,7 @@ export default class MainAbility extends Ability { console.log("[ttt] [DataShareTest] <> MainAbility onWindowStageCreate") globalThis.abilityContext = this.context; let context = this.context; - dseConnectionId = context.connectAbility(dseWant, dseConnect); + dseConnectionId = context.connectServiceExtensionAbility(dseWant, dseConnect); globalThis.connectDataShareExtAbility = (async () => { console.log("[ttt] [DataShareTest] <> connectDataShareExtAbility begin"); await dataShare.createDataShareHelper(globalThis.abilityContext, dseUri, (err,data)=>{ @@ -122,7 +122,7 @@ export default class MainAbility extends Ability { console.info("[ttt] [DataShareTest] <> ----- 3 -----, err = " + err); console.info("[ttt] [DataShareTest] <> ----- 4 -----, JSON.stringify(err) = " + JSON.stringify(err)); }); - dseConnectionId = await context.connectAbility(dseWant, dseConnect); + dseConnectionId = await context.connectServiceExtensionAbility(dseWant, dseConnect); }) windowStage.setUIContent(this.context, "MainAbility/pages/index", null) } diff --git a/distributeddatamgr/relationalStoretest/relationalStoreStagetest/entry/src/main/ets/TestAbility/TestAbility.ts b/distributeddatamgr/relationalStoretest/relationalStoreStagetest/entry/src/main/ets/TestAbility/TestAbility.ts index 89a84730505783ba229175ab4b55d37f91a16266..8028a70f8af44690b95a08bd177bca6b09f24687 100644 --- a/distributeddatamgr/relationalStoretest/relationalStoreStagetest/entry/src/main/ets/TestAbility/TestAbility.ts +++ b/distributeddatamgr/relationalStoretest/relationalStoreStagetest/entry/src/main/ets/TestAbility/TestAbility.ts @@ -12,7 +12,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -import Ability from '@ohos.application.Ability' +import Ability from '@ohos.app.ability.UIAbility' export default class TestAbility extends Ability { onCreate(want, launchParam) { diff --git a/graphic/effectKit/entry/src/main/ets/Application/AbilityStage.ts b/graphic/effectKit/entry/src/main/ets/Application/AbilityStage.ts index e3fdadfebeeeb676df2ce8f78f4b59e26fae9cf0..b0e0206ea9fb5ce94ef140d69510b6280969dd8e 100644 --- a/graphic/effectKit/entry/src/main/ets/Application/AbilityStage.ts +++ b/graphic/effectKit/entry/src/main/ets/Application/AbilityStage.ts @@ -1,4 +1,4 @@ -import AbilityStage from "@ohos.application.AbilityStage" +import AbilityStage from "@ohos.app.ability.AbilityStage" export default class MyAbilityStage extends AbilityStage { onCreate() { diff --git a/graphic/effectKit/entry/src/main/ets/MainAbility/MainAbility.ts b/graphic/effectKit/entry/src/main/ets/MainAbility/MainAbility.ts index 8b12c6e3cc0cd9d0bc26d566cf7435e68dc0f581..44e7f26fab743e1b44cdd6f493b4354b9d6e94c0 100644 --- a/graphic/effectKit/entry/src/main/ets/MainAbility/MainAbility.ts +++ b/graphic/effectKit/entry/src/main/ets/MainAbility/MainAbility.ts @@ -1,4 +1,4 @@ -import Ability from '@ohos.application.Ability' +import Ability from '@ohos.app.ability.UIAbility' export default class MainAbility extends Ability { onCreate(want,launchParam){ diff --git a/graphic/graphicColorSpace/entry/src/main/ets/Application/AbilityStage.ts b/graphic/graphicColorSpace/entry/src/main/ets/Application/AbilityStage.ts index e3fdadfebeeeb676df2ce8f78f4b59e26fae9cf0..b0e0206ea9fb5ce94ef140d69510b6280969dd8e 100644 --- a/graphic/graphicColorSpace/entry/src/main/ets/Application/AbilityStage.ts +++ b/graphic/graphicColorSpace/entry/src/main/ets/Application/AbilityStage.ts @@ -1,4 +1,4 @@ -import AbilityStage from "@ohos.application.AbilityStage" +import AbilityStage from "@ohos.app.ability.AbilityStage" export default class MyAbilityStage extends AbilityStage { onCreate() { diff --git a/graphic/graphicColorSpace/entry/src/main/ets/MainAbility/MainAbility.ts b/graphic/graphicColorSpace/entry/src/main/ets/MainAbility/MainAbility.ts index c3b2b245c4356ac17dd34e3ac70a144703cecfaa..4d66065e88c907379883364a43ec02989cfd626b 100644 --- a/graphic/graphicColorSpace/entry/src/main/ets/MainAbility/MainAbility.ts +++ b/graphic/graphicColorSpace/entry/src/main/ets/MainAbility/MainAbility.ts @@ -1,4 +1,4 @@ -import Ability from '@ohos.application.Ability' +import Ability from '@ohos.app.ability.UIAbility' export default class MainAbility extends Ability { onCreate(want,launchParam){ diff --git a/graphic/graphicColorSpace/entry/src/main/ets/TestAbility/TestAbility.ts b/graphic/graphicColorSpace/entry/src/main/ets/TestAbility/TestAbility.ts index 89a84730505783ba229175ab4b55d37f91a16266..8028a70f8af44690b95a08bd177bca6b09f24687 100644 --- a/graphic/graphicColorSpace/entry/src/main/ets/TestAbility/TestAbility.ts +++ b/graphic/graphicColorSpace/entry/src/main/ets/TestAbility/TestAbility.ts @@ -12,7 +12,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -import Ability from '@ohos.application.Ability' +import Ability from '@ohos.app.ability.UIAbility' export default class TestAbility extends Ability { onCreate(want, launchParam) { diff --git a/graphic/windowStage/entry/src/main/ets/Application/AbilityStage.ts b/graphic/windowStage/entry/src/main/ets/Application/AbilityStage.ts index e3fdadfebeeeb676df2ce8f78f4b59e26fae9cf0..b0e0206ea9fb5ce94ef140d69510b6280969dd8e 100644 --- a/graphic/windowStage/entry/src/main/ets/Application/AbilityStage.ts +++ b/graphic/windowStage/entry/src/main/ets/Application/AbilityStage.ts @@ -1,4 +1,4 @@ -import AbilityStage from "@ohos.application.AbilityStage" +import AbilityStage from "@ohos.app.ability.AbilityStage" export default class MyAbilityStage extends AbilityStage { onCreate() { diff --git a/graphic/windowStage/entry/src/main/ets/MainAbility/MainAbility.ts b/graphic/windowStage/entry/src/main/ets/MainAbility/MainAbility.ts index c3b2b245c4356ac17dd34e3ac70a144703cecfaa..4d66065e88c907379883364a43ec02989cfd626b 100644 --- a/graphic/windowStage/entry/src/main/ets/MainAbility/MainAbility.ts +++ b/graphic/windowStage/entry/src/main/ets/MainAbility/MainAbility.ts @@ -1,4 +1,4 @@ -import Ability from '@ohos.application.Ability' +import Ability from '@ohos.app.ability.UIAbility' export default class MainAbility extends Ability { onCreate(want,launchParam){ diff --git a/graphic/windowStage/entry/src/main/ets/TestAbility/TestAbility.ts b/graphic/windowStage/entry/src/main/ets/TestAbility/TestAbility.ts index 89a84730505783ba229175ab4b55d37f91a16266..8028a70f8af44690b95a08bd177bca6b09f24687 100644 --- a/graphic/windowStage/entry/src/main/ets/TestAbility/TestAbility.ts +++ b/graphic/windowStage/entry/src/main/ets/TestAbility/TestAbility.ts @@ -12,7 +12,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -import Ability from '@ohos.application.Ability' +import Ability from '@ohos.app.ability.UIAbility' export default class TestAbility extends Ability { onCreate(want, launchParam) { diff --git a/hiviewdfx/abilityconstanttest/src/main/js/test/abilityconstant_test.js b/hiviewdfx/abilityconstanttest/src/main/js/test/abilityconstant_test.js index ad2394a3719b99c3adf4b24c6aa001a65f09395a..06606ff0a7ca4260bcf93a891573039d7ab28629 100755 --- a/hiviewdfx/abilityconstanttest/src/main/js/test/abilityconstant_test.js +++ b/hiviewdfx/abilityconstanttest/src/main/js/test/abilityconstant_test.js @@ -12,8 +12,8 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -import AbilityConstant from "@ohos.application.AbilityConstant" -import Ability from "@ohos.application.Ability" +import AbilityConstant from "@ohos.app.ability.AbilityConstant" +import Ability from "@ohos.app.ability.UIAbility" import { describe, beforeAll, beforeEach, afterEach, afterAll, it, expect } from '@ohos/hypium' class AbilityTest extends Ability { diff --git a/hiviewdfx/apprecoverytest/src/main/js/test/apprecovery_test.js b/hiviewdfx/apprecoverytest/src/main/js/test/apprecovery_test.js index f5a5c13a677f53b49c70b59bcda43085ed304338..e09d30e862d14532935358cd2e9df5f5a36133c4 100755 --- a/hiviewdfx/apprecoverytest/src/main/js/test/apprecovery_test.js +++ b/hiviewdfx/apprecoverytest/src/main/js/test/apprecovery_test.js @@ -14,7 +14,7 @@ */ import appRecovery from "@ohos.app.ability.appRecovery" import AbilityConstant from "@ohos.app.ability.AbilityConstant" -import Ability from "@ohos.application.Ability" +import Ability from "@ohos.app.ability.UIAbility" import { describe, beforeAll, beforeEach, afterEach, afterAll, it, expect } from '@ohos/hypium' class AbilityTest extends Ability { diff --git a/inputmethod/InputMethodTest_Stage/entry/src/main/ets/Application/AbilityStage.ts b/inputmethod/InputMethodTest_Stage/entry/src/main/ets/Application/AbilityStage.ts index 36a8a495dd6e3323415a2787786eb52eb840a229..f5c927f73644c144b4f4d05b9d1bdee54c5fc8ca 100644 --- a/inputmethod/InputMethodTest_Stage/entry/src/main/ets/Application/AbilityStage.ts +++ b/inputmethod/InputMethodTest_Stage/entry/src/main/ets/Application/AbilityStage.ts @@ -12,7 +12,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -import AbilityStage from "@ohos.application.AbilityStage" +import AbilityStage from "@ohos.app.ability.AbilityStage" export default class MyAbilityStage extends AbilityStage { onCreate() { diff --git a/inputmethod/InputMethodTest_Stage/entry/src/main/ets/MainAbility/MainAbility.ts b/inputmethod/InputMethodTest_Stage/entry/src/main/ets/MainAbility/MainAbility.ts index 1ddf22a980cb10cd610cc35669519f20c21a59ef..ff7ec1c31b8842a64198b7dea08ca7b6a8c5c941 100644 --- a/inputmethod/InputMethodTest_Stage/entry/src/main/ets/MainAbility/MainAbility.ts +++ b/inputmethod/InputMethodTest_Stage/entry/src/main/ets/MainAbility/MainAbility.ts @@ -12,7 +12,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -import Ability from '@ohos.application.Ability' +import Ability from '@ohos.app.ability.UIAbility' export default class MainAbility extends Ability { onCreate(want,launchParam){ diff --git a/multimedia/medialibrary/mediaLibrary_base/entry/src/main/ets/Application/AbilityStage.ts b/multimedia/medialibrary/mediaLibrary_base/entry/src/main/ets/Application/AbilityStage.ts index e3fdadfebeeeb676df2ce8f78f4b59e26fae9cf0..b0e0206ea9fb5ce94ef140d69510b6280969dd8e 100644 --- a/multimedia/medialibrary/mediaLibrary_base/entry/src/main/ets/Application/AbilityStage.ts +++ b/multimedia/medialibrary/mediaLibrary_base/entry/src/main/ets/Application/AbilityStage.ts @@ -1,4 +1,4 @@ -import AbilityStage from "@ohos.application.AbilityStage" +import AbilityStage from "@ohos.app.ability.AbilityStage" export default class MyAbilityStage extends AbilityStage { onCreate() { diff --git a/multimedia/medialibrary/mediaLibrary_fileAsset/entry/src/main/ets/Application/AbilityStage.ts b/multimedia/medialibrary/mediaLibrary_fileAsset/entry/src/main/ets/Application/AbilityStage.ts index e3fdadfebeeeb676df2ce8f78f4b59e26fae9cf0..b0e0206ea9fb5ce94ef140d69510b6280969dd8e 100644 --- a/multimedia/medialibrary/mediaLibrary_fileAsset/entry/src/main/ets/Application/AbilityStage.ts +++ b/multimedia/medialibrary/mediaLibrary_fileAsset/entry/src/main/ets/Application/AbilityStage.ts @@ -1,4 +1,4 @@ -import AbilityStage from "@ohos.application.AbilityStage" +import AbilityStage from "@ohos.app.ability.AbilityStage" export default class MyAbilityStage extends AbilityStage { onCreate() { diff --git a/multimedia/medialibrary/mediaLibrary_fileAsset/entry/src/main/ets/MainAbility/MainAbility.ts b/multimedia/medialibrary/mediaLibrary_fileAsset/entry/src/main/ets/MainAbility/MainAbility.ts index 83c0cd68bb2c044c9b98d212a62851b32bd9af9a..df41851318f3385890e235a96dfbcc0441cb13f1 100644 --- a/multimedia/medialibrary/mediaLibrary_fileAsset/entry/src/main/ets/MainAbility/MainAbility.ts +++ b/multimedia/medialibrary/mediaLibrary_fileAsset/entry/src/main/ets/MainAbility/MainAbility.ts @@ -1,4 +1,4 @@ -import Ability from '@ohos.application.Ability' +import Ability from '@ohos.app.ability.UIAbility' export default class MainAbility extends Ability { onCreate(want, launchParam) { diff --git a/multimedia/medialibrary/mediaLibrary_fileKey/entry/src/main/ets/Application/AbilityStage.ts b/multimedia/medialibrary/mediaLibrary_fileKey/entry/src/main/ets/Application/AbilityStage.ts index e3fdadfebeeeb676df2ce8f78f4b59e26fae9cf0..b0e0206ea9fb5ce94ef140d69510b6280969dd8e 100644 --- a/multimedia/medialibrary/mediaLibrary_fileKey/entry/src/main/ets/Application/AbilityStage.ts +++ b/multimedia/medialibrary/mediaLibrary_fileKey/entry/src/main/ets/Application/AbilityStage.ts @@ -1,4 +1,4 @@ -import AbilityStage from "@ohos.application.AbilityStage" +import AbilityStage from "@ohos.app.ability.AbilityStage" export default class MyAbilityStage extends AbilityStage { onCreate() { diff --git a/multimedia/medialibrary/mediaLibrary_fileKey/entry/src/main/ets/MainAbility/MainAbility.ts b/multimedia/medialibrary/mediaLibrary_fileKey/entry/src/main/ets/MainAbility/MainAbility.ts index 83c0cd68bb2c044c9b98d212a62851b32bd9af9a..df41851318f3385890e235a96dfbcc0441cb13f1 100644 --- a/multimedia/medialibrary/mediaLibrary_fileKey/entry/src/main/ets/MainAbility/MainAbility.ts +++ b/multimedia/medialibrary/mediaLibrary_fileKey/entry/src/main/ets/MainAbility/MainAbility.ts @@ -1,4 +1,4 @@ -import Ability from '@ohos.application.Ability' +import Ability from '@ohos.app.ability.UIAbility' export default class MainAbility extends Ability { onCreate(want, launchParam) { diff --git a/multimedia/medialibrary/mediaLibrary_getThumbnail/entry/src/main/ets/Application/AbilityStage.ts b/multimedia/medialibrary/mediaLibrary_getThumbnail/entry/src/main/ets/Application/AbilityStage.ts index e3fdadfebeeeb676df2ce8f78f4b59e26fae9cf0..b0e0206ea9fb5ce94ef140d69510b6280969dd8e 100644 --- a/multimedia/medialibrary/mediaLibrary_getThumbnail/entry/src/main/ets/Application/AbilityStage.ts +++ b/multimedia/medialibrary/mediaLibrary_getThumbnail/entry/src/main/ets/Application/AbilityStage.ts @@ -1,4 +1,4 @@ -import AbilityStage from "@ohos.application.AbilityStage" +import AbilityStage from "@ohos.app.ability.AbilityStage" export default class MyAbilityStage extends AbilityStage { onCreate() { diff --git a/multimedia/medialibrary/mediaLibrary_getThumbnail/entry/src/main/ets/MainAbility/MainAbility.ts b/multimedia/medialibrary/mediaLibrary_getThumbnail/entry/src/main/ets/MainAbility/MainAbility.ts index 83c0cd68bb2c044c9b98d212a62851b32bd9af9a..df41851318f3385890e235a96dfbcc0441cb13f1 100644 --- a/multimedia/medialibrary/mediaLibrary_getThumbnail/entry/src/main/ets/MainAbility/MainAbility.ts +++ b/multimedia/medialibrary/mediaLibrary_getThumbnail/entry/src/main/ets/MainAbility/MainAbility.ts @@ -1,4 +1,4 @@ -import Ability from '@ohos.application.Ability' +import Ability from '@ohos.app.ability.UIAbility' export default class MainAbility extends Ability { onCreate(want, launchParam) { diff --git a/multimedia/medialibrary/mediaLibrary_mediafetchoptions/entry/src/main/ets/Application/AbilityStage.ts b/multimedia/medialibrary/mediaLibrary_mediafetchoptions/entry/src/main/ets/Application/AbilityStage.ts index e3fdadfebeeeb676df2ce8f78f4b59e26fae9cf0..b0e0206ea9fb5ce94ef140d69510b6280969dd8e 100644 --- a/multimedia/medialibrary/mediaLibrary_mediafetchoptions/entry/src/main/ets/Application/AbilityStage.ts +++ b/multimedia/medialibrary/mediaLibrary_mediafetchoptions/entry/src/main/ets/Application/AbilityStage.ts @@ -1,4 +1,4 @@ -import AbilityStage from "@ohos.application.AbilityStage" +import AbilityStage from "@ohos.app.ability.AbilityStage" export default class MyAbilityStage extends AbilityStage { onCreate() { diff --git a/multimedia/medialibrary/mediaLibrary_mediafetchoptions/entry/src/main/ets/MainAbility/MainAbility.ts b/multimedia/medialibrary/mediaLibrary_mediafetchoptions/entry/src/main/ets/MainAbility/MainAbility.ts index 83c0cd68bb2c044c9b98d212a62851b32bd9af9a..df41851318f3385890e235a96dfbcc0441cb13f1 100644 --- a/multimedia/medialibrary/mediaLibrary_mediafetchoptions/entry/src/main/ets/MainAbility/MainAbility.ts +++ b/multimedia/medialibrary/mediaLibrary_mediafetchoptions/entry/src/main/ets/MainAbility/MainAbility.ts @@ -1,4 +1,4 @@ -import Ability from '@ohos.application.Ability' +import Ability from '@ohos.app.ability.UIAbility' export default class MainAbility extends Ability { onCreate(want, launchParam) { diff --git a/multimedia/medialibrary/mediaLibrary_trash/entry/src/main/ets/Application/AbilityStage.ts b/multimedia/medialibrary/mediaLibrary_trash/entry/src/main/ets/Application/AbilityStage.ts index e3fdadfebeeeb676df2ce8f78f4b59e26fae9cf0..b0e0206ea9fb5ce94ef140d69510b6280969dd8e 100644 --- a/multimedia/medialibrary/mediaLibrary_trash/entry/src/main/ets/Application/AbilityStage.ts +++ b/multimedia/medialibrary/mediaLibrary_trash/entry/src/main/ets/Application/AbilityStage.ts @@ -1,4 +1,4 @@ -import AbilityStage from "@ohos.application.AbilityStage" +import AbilityStage from "@ohos.app.ability.AbilityStage" export default class MyAbilityStage extends AbilityStage { onCreate() { diff --git a/multimedia/medialibrary/mediaLibrary_trash/entry/src/main/ets/MainAbility/MainAbility.ts b/multimedia/medialibrary/mediaLibrary_trash/entry/src/main/ets/MainAbility/MainAbility.ts index 83c0cd68bb2c044c9b98d212a62851b32bd9af9a..df41851318f3385890e235a96dfbcc0441cb13f1 100644 --- a/multimedia/medialibrary/mediaLibrary_trash/entry/src/main/ets/MainAbility/MainAbility.ts +++ b/multimedia/medialibrary/mediaLibrary_trash/entry/src/main/ets/MainAbility/MainAbility.ts @@ -1,4 +1,4 @@ -import Ability from '@ohos.application.Ability' +import Ability from '@ohos.app.ability.UIAbility' export default class MainAbility extends Ability { onCreate(want, launchParam) { diff --git a/notification/ans_standard/actsNotificationSecondaryDirectory/entry/src/main/ets/Application/AbilityStage.ts b/notification/ans_standard/actsNotificationSecondaryDirectory/entry/src/main/ets/Application/AbilityStage.ts index a590b7d615d839ed6c67eced002d150020e300d5..7e917ee0f146b706fc264dfaac71ac33f8c513a0 100644 --- a/notification/ans_standard/actsNotificationSecondaryDirectory/entry/src/main/ets/Application/AbilityStage.ts +++ b/notification/ans_standard/actsNotificationSecondaryDirectory/entry/src/main/ets/Application/AbilityStage.ts @@ -13,7 +13,7 @@ * limitations under the License. */ -import AbilityStage from "@ohos.application.AbilityStage" +import AbilityStage from "@ohos.app.ability.AbilityStage" export default class MyAbilityStage extends AbilityStage { onCreate() { diff --git a/notification/ans_standard/actsNotificationSecondaryDirectory/entry/src/main/ets/MainAbility/MainAbility.ts b/notification/ans_standard/actsNotificationSecondaryDirectory/entry/src/main/ets/MainAbility/MainAbility.ts index 83be6c5a2a1cab94029e5a4ed20690d133a08f58..881e90c13c2404e167090ce55019ad24f8b4cc2b 100644 --- a/notification/ans_standard/actsNotificationSecondaryDirectory/entry/src/main/ets/MainAbility/MainAbility.ts +++ b/notification/ans_standard/actsNotificationSecondaryDirectory/entry/src/main/ets/MainAbility/MainAbility.ts @@ -12,7 +12,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -import Ability from '@ohos.application.Ability' +import Ability from '@ohos.app.ability.UIAbility' export default class MainAbility extends Ability { diff --git a/notification/ans_standard/actsNotificationWantAgentTest/src/main/js/test/ActsNotificationWantAgentTest.js b/notification/ans_standard/actsNotificationWantAgentTest/src/main/js/test/ActsNotificationWantAgentTest.js index e729c69ad2e579aee65c55525b4e8117a2937040..9bc97bd597eca14bb126ea79d13bbffb7d21ac75 100644 --- a/notification/ans_standard/actsNotificationWantAgentTest/src/main/js/test/ActsNotificationWantAgentTest.js +++ b/notification/ans_standard/actsNotificationWantAgentTest/src/main/js/test/ActsNotificationWantAgentTest.js @@ -779,72 +779,6 @@ export default function ActsNotificationWantAgentTest() { console.info(`${TAG} SUB_NOTIFICATION_ANS_GET_WANT_AGENT_TEST_2800 END`) }) - /* - * @tc.number : SUB_NOTIFICATION_ANS_GET_WANT_AGENT_TEST_2900 - * @tc.name : function getOperationType(agent: WantAgent, callback: AsyncCallback): void - * @tc.desc : Obtains the {@link OperationType} of a {@link WantAgent} - */ - it('SUB_NOTIFICATION_ANS_GET_WANT_AGENT_TEST_2900', 0, async function (done) { - console.info(`${TAG} SUB_NOTIFICATION_ANS_GET_WANT_AGENT_TEST_2900 START`) - WantAgentInfo.operationType = wantAgent.OperationType.START_ABILITY - WantAgentInfo.wantAgentFlags = [wantAgent.WantAgentFlags.UPDATE_PRESENT_FLAG] - wantAgent.getWantAgent(WantAgentInfo, (err, data) => { - if (err.code) { - console.info(`${TAG} getWantAgent AsyncCallback err: ${err.code}`) - expect(false).assertTrue() - done() - } else { - WantAgent = data - console.info(`${TAG} getWantAgent AsyncCallback success: ${JSON.stringify(data)}`) - wantAgent.getOperationType(WantAgent, (err, data) => { - if (err.code) { - console.info(`${TAG} getOperationType AsyncCallback err: ${err.code}`) - expect(false).assertTrue() - done() - } else { - console.info(`${TAG} getOperationType AsyncCallback success: ${JSON.stringify(data)}`) - expect(true).assertTrue() - done() - } - }) - } - }) - - console.info(`${TAG} SUB_NOTIFICATION_ANS_GET_WANT_AGENT_TEST_2900 END`) - }) - - /* - * @tc.number : SUB_NOTIFICATION_ANS_GET_WANT_AGENT_TEST_3000 - * @tc.name : function getOperationType(agent: WantAgent): Promise - * @tc.desc : Obtains the {@link OperationType} of a {@link WantAgent} - */ - it('SUB_NOTIFICATION_ANS_GET_WANT_AGENT_TEST_3000', 0, async function (done) { - console.info(`${TAG} SUB_NOTIFICATION_ANS_GET_WANT_AGENT_TEST_3000 START`) - WantAgentInfo.operationType = wantAgent.OperationType.START_ABILITY - WantAgentInfo.wantAgentFlags = [wantAgent.WantAgentFlags.UPDATE_PRESENT_FLAG] - wantAgent.getWantAgent(WantAgentInfo).then((data) => { - WantAgent = data - console.info(`${TAG} getWantAgent Promise success: ${JSON.stringify(data)}`) - wantAgent.getOperationType(WantAgent) - .then((data) => { - console.info(`${TAG} getOperationType Promise success: ${JSON.stringify(data)}`) - expect(true).assertTrue() - done() - }) - .catch((err) => { - console.info(`${TAG} getOperationType Promise err: ${err.code}`) - expect(false).assertTrue() - done() - }) - }).catch((err) => { - console.info(`${TAG} getWantAgent Promise err: ${err.code}`) - expect(false).assertTrue() - done() - }) - - console.info(`${TAG} SUB_NOTIFICATION_ANS_GET_WANT_AGENT_TEST_3000 END`) - }) - /* * @tc.number : SUB_NOTIFICATION_ANS_GET_WANT_AGENT_TEST_3100 * @tc.name : function trigger(agent: WantAgent, triggerInfo: TriggerInfo, callback?: AsyncCallback): void diff --git a/request/RequestTest_Stage/entry/src/main/ets/Application/MyAbilityStage.ts b/request/RequestTest_Stage/entry/src/main/ets/Application/MyAbilityStage.ts index 4bea34b35db86d55f1a555e4bfb97778968567d6..63c0efb17ceebd35073960da80893eb3040b0426 100644 --- a/request/RequestTest_Stage/entry/src/main/ets/Application/MyAbilityStage.ts +++ b/request/RequestTest_Stage/entry/src/main/ets/Application/MyAbilityStage.ts @@ -1,5 +1,5 @@ import hilog from '@ohos.hilog'; -import AbilityStage from "@ohos.application.AbilityStage" +import AbilityStage from "@ohos.app.ability.AbilityStage" export default class MyAbilityStage extends AbilityStage { onCreate() { diff --git a/request/RequestTest_Stage/entry/src/main/ets/MainAbility/MainAbility.ts b/request/RequestTest_Stage/entry/src/main/ets/MainAbility/MainAbility.ts index ad865b2b2787af7cc278153dbfc1ed070e59f09e..ef31b90804bc66568248b24b04826f672614b2f6 100644 --- a/request/RequestTest_Stage/entry/src/main/ets/MainAbility/MainAbility.ts +++ b/request/RequestTest_Stage/entry/src/main/ets/MainAbility/MainAbility.ts @@ -2,7 +2,7 @@ import hilog from '@ohos.hilog'; import Window from '@ohos.window'; import { Hypium } from '@ohos/hypium'; import testsuite from '../test/List.test'; -import Ability from '@ohos.application.Ability'; +import Ability from '@ohos.app.ability.UIAbility'; import AbilityDelegatorRegistry from '@ohos.application.abilityDelegatorRegistry'; export default class MainAbility extends Ability { diff --git a/storage/storagestatisticsjstest/entry/src/main/ets/Application/AbilityStage.ts b/storage/storagestatisticsjstest/entry/src/main/ets/Application/AbilityStage.ts index ab2682985f2ed3ade10aefeecb9501a67eb05fbc..297039e88322b9c0a0b3f321cd2a453a4d66d98b 100644 --- a/storage/storagestatisticsjstest/entry/src/main/ets/Application/AbilityStage.ts +++ b/storage/storagestatisticsjstest/entry/src/main/ets/Application/AbilityStage.ts @@ -13,7 +13,7 @@ * limitations under the License. */ -import AbilityStage from "@ohos.application.AbilityStage" +import AbilityStage from "@ohos.app.ability.AbilityStage" export default class MyAbilityStage extends AbilityStage { onCreate() { diff --git a/storage/storagestatisticsjstest/entry/src/main/ets/MainAbility/MainAbility.ts b/storage/storagestatisticsjstest/entry/src/main/ets/MainAbility/MainAbility.ts index 50fe24cd159e565e53e8c2d35d583b8249a43e45..11cc751376475749657fc0f23c088431b7d6f557 100644 --- a/storage/storagestatisticsjstest/entry/src/main/ets/MainAbility/MainAbility.ts +++ b/storage/storagestatisticsjstest/entry/src/main/ets/MainAbility/MainAbility.ts @@ -13,7 +13,7 @@ * limitations under the License. */ -import Ability from '@ohos.application.Ability' +import Ability from '@ohos.app.ability.UIAbility' export default class MainAbility extends Ability { onCreate(want, launchParam) { diff --git a/storage/storagestatisticsjstest/entry/src/main/ets/TestAbility/TestAbility.ts b/storage/storagestatisticsjstest/entry/src/main/ets/TestAbility/TestAbility.ts index 89a84730505783ba229175ab4b55d37f91a16266..8028a70f8af44690b95a08bd177bca6b09f24687 100644 --- a/storage/storagestatisticsjstest/entry/src/main/ets/TestAbility/TestAbility.ts +++ b/storage/storagestatisticsjstest/entry/src/main/ets/TestAbility/TestAbility.ts @@ -12,7 +12,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -import Ability from '@ohos.application.Ability' +import Ability from '@ohos.app.ability.UIAbility' export default class TestAbility extends Ability { onCreate(want, launchParam) { diff --git a/time/timeTest/entry/src/main/ets/Application/MyAbilityStage.ts b/time/timeTest/entry/src/main/ets/Application/MyAbilityStage.ts index 4bea34b35db86d55f1a555e4bfb97778968567d6..63c0efb17ceebd35073960da80893eb3040b0426 100644 --- a/time/timeTest/entry/src/main/ets/Application/MyAbilityStage.ts +++ b/time/timeTest/entry/src/main/ets/Application/MyAbilityStage.ts @@ -1,5 +1,5 @@ import hilog from '@ohos.hilog'; -import AbilityStage from "@ohos.application.AbilityStage" +import AbilityStage from "@ohos.app.ability.AbilityStage" export default class MyAbilityStage extends AbilityStage { onCreate() { diff --git a/time/timeTest/entry/src/main/ets/MainAbility/MainAbility.ts b/time/timeTest/entry/src/main/ets/MainAbility/MainAbility.ts index 9dc331bc8149d36521ac746384d6606c85bd7ee0..946c1d8885f831d10bf0d4f0835a7dbfd4aa22a3 100644 --- a/time/timeTest/entry/src/main/ets/MainAbility/MainAbility.ts +++ b/time/timeTest/entry/src/main/ets/MainAbility/MainAbility.ts @@ -2,7 +2,7 @@ import hilog from '@ohos.hilog'; import Window from '@ohos.window'; import { Hypium } from '@ohos/hypium'; import testsuite from '../test/List.test'; -import Ability from '@ohos.application.Ability'; +import Ability from '@ohos.app.ability.UIAbility'; import AbilityDelegatorRegistry from '@ohos.application.abilityDelegatorRegistry'; export default class MainAbility extends Ability { diff --git a/wukong/actswukongtest/entry/src/main/ets/Application/AbilityStage.ts b/wukong/actswukongtest/entry/src/main/ets/Application/AbilityStage.ts index 8d437d73a82bd94a6ef7c8a68a5b1e437ae41586..1d1d739c3fa2bd3ea97dcabfdeef7c850a96253e 100644 --- a/wukong/actswukongtest/entry/src/main/ets/Application/AbilityStage.ts +++ b/wukong/actswukongtest/entry/src/main/ets/Application/AbilityStage.ts @@ -13,7 +13,7 @@ * limitations under the License. */ -import AbilityStage from "@ohos.application.AbilityStage" +import AbilityStage from "@ohos.app.ability.AbilityStage" export default class MyAbilityStage extends AbilityStage { onCreate() { diff --git a/wukong/actswukongtest/entry/src/main/ets/MainAbility/MainAbility.ts b/wukong/actswukongtest/entry/src/main/ets/MainAbility/MainAbility.ts index eb03ab5e6d6eb668c4b9b09aabb2cd0b8cc98346..82fe2dfe3bdeda9ec3c73e2aed3d92140b94268f 100644 --- a/wukong/actswukongtest/entry/src/main/ets/MainAbility/MainAbility.ts +++ b/wukong/actswukongtest/entry/src/main/ets/MainAbility/MainAbility.ts @@ -15,7 +15,7 @@ import AbilityDelegatorRegistry from '@ohos.application.abilityDelegatorRegistry' import { Hypium } from '@ohos/hypium' import testsuite from '../test/List.test' -import Ability from '@ohos.application.Ability' +import Ability from '@ohos.app.ability.UIAbility' export default class MainAbility extends Ability { onCreate(want, launchParam) {