From 5a5bc0ad96c0fcb204577e54bcc0224b3ffe3195 Mon Sep 17 00:00:00 2001 From: yangzk Date: Thu, 3 Nov 2022 21:23:05 +0800 Subject: [PATCH] IssueNo: #I61QDL Description: replace ohos.application.Ability with ohos.app.ability.UIAbility Sig: SIG_ApplicationFramework Feature or Bugfix: Feature Binary Source: No Signed-off-by: yangzk Change-Id: I2249e8978ab7dafc6b7128f23471b27147763f82 --- README_zh.md | 2 +- .../src/main/ets/Application/AbilityStage.ts | 2 +- .../src/main/ets/MainAbility/MainAbility.ts | 2 +- .../src/main/ets/MainAbility2/MainAbility2.ts | 2 +- .../src/main/ets/MainAbility3/MainAbility3.ts | 2 +- .../src/main/ets/Application/AbilityStage.ts | 2 +- .../src/main/ets/MainAbility/MainAbility.ts | 2 +- .../src/main/ets/MainAbility2/MainAbility2.ts | 2 +- .../src/main/ets/MainAbility3/MainAbility3.ts | 2 +- .../src/main/ets/Application/AbilityStage.ts | 2 +- .../src/main/ets/MainAbility/MainAbility.ts | 2 +- .../src/main/ets/Application/AbilityStage.ts | 2 +- .../src/main/ets/MainAbility/MainAbility.ts | 2 +- .../src/main/ets/Application/AbilityStage.ts | 2 +- .../src/main/ets/MainAbility/MainAbility.ts | 2 +- .../src/main/ets/Application/AbilityStage.ts | 2 +- .../src/main/ets/MainAbility/MainAbility.ts | 2 +- .../src/main/ets/Application/AbilityStage.ts | 2 +- .../src/main/ets/MainAbility/MainAbility.ts | 2 +- .../src/main/ets/Application/AbilityStage.ts | 2 +- .../src/main/ets/MainAbility/MainAbility.ts | 2 +- .../src/main/ets/Application/AbilityStage.ts | 2 +- .../src/main/ets/MainAbility/MainAbility.ts | 2 +- .../src/main/ets/MainAbility2/MainAbility2.ts | 2 +- .../src/main/ets/MainAbility3/MainAbility3.ts | 2 +- .../src/main/ets/MainAbility4/MainAbility4.ts | 2 +- .../src/main/ets/Application/AbilityStage.ts | 2 +- .../src/main/ets/MainAbility/MainAbility.ts | 2 +- .../src/main/ets/Application/AbilityStage.ts | 2 +- .../src/main/ets/MainAbility/MainAbility.ts | 2 +- .../src/main/ets/Application/AbilityStage.ts | 2 +- .../src/main/ets/MainAbility/MainAbility.ts | 2 +- .../src/main/ets/Application/AbilityStage.ts | 2 +- .../src/main/ets/MainAbility/MainAbility.ts | 2 +- .../main/ets/SecondAbility/SecondAbility.ts | 2 +- .../src/main/ets/ThirdAbility/ThirdAbility.ts | 2 +- .../src/main/ets/Application/AbilityStage.ts | 2 +- .../src/main/ets/MainAbility/MainAbility.ts | 2 +- .../main/ets/Application/MyAbilityStage.ts | 2 +- .../src/main/ets/MainAbility/MainAbility.ts | 2 +- .../main/ets/Application/MyAbilityStage.ts | 2 +- .../src/main/ets/MainAbility/MainAbility.ts | 2 +- .../main/ets/Application/MyAbilityStage.ts | 2 +- .../src/main/ets/MainAbility/MainAbility.ts | 2 +- .../main/ets/Application/MyAbilityStage.ts | 2 +- .../src/main/ets/MainAbility/MainAbility.ts | 2 +- .../main/ets/Application/MyAbilityStage.ts | 2 +- .../src/main/ets/MainAbility/MainAbility.ts | 2 +- .../main/ets/Application/MyAbilityStage.ts | 2 +- .../src/main/ets/MainAbility/MainAbility.ts | 2 +- .../main/ets/Application/MyAbilityStage.ts | 2 +- .../src/main/ets/MainAbility/MainAbility.ts | 2 +- .../main/ets/Application/TestAbilityStage.ts | 2 +- .../src/main/ets/TestAbility/TestAbility.ts | 2 +- .../src/main/ets/Application/AbilityStage.ts | 2 +- .../src/main/ets/MainAbility/MainAbility.ts | 2 +- .../src/main/ets/MainAbility2/MainAbility2.ts | 2 +- .../src/main/ets/MainAbility3/MainAbility3.ts | 2 +- .../src/main/ets/Application/AbilityStage.ts | 2 +- .../src/main/ets/MainAbility/MainAbility.ts | 2 +- .../main/ets/SecondAbility/SecondAbility.ts | 2 +- .../src/main/ets/ThirdAbility/ThirdAbility.ts | 2 +- .../src/main/ets/Application/AbilityStage.ts | 2 +- .../src/main/ets/MainAbility/MainAbility.ts | 2 +- .../main/ets/SecondAbility/SecondAbility.ts | 2 +- .../src/main/ets/ThirdAbility/ThirdAbility.ts | 2 +- .../src/main/ets/Application/AbilityStage.ts | 2 +- .../src/main/ets/MainAbility/MainAbility.ts | 2 +- .../src/main/ets/Application/AbilityStage.ts | 2 +- .../src/main/ets/MainAbility/MainAbility.ts | 2 +- .../src/main/ets/Application/AbilityStage.ts | 2 +- .../src/main/ets/MainAbility/MainAbility.ts | 2 +- .../main/ets/SecondAbility/SecondAbility.ts | 2 +- .../src/main/ets/TestAbility/TestAbility.ts | 2 +- .../src/main/ets/Application/AbilityStage.ts | 2 +- .../src/main/ets/MainAbility/MainAbility.ts | 2 +- .../src/main/ets/Application/AbilityStage.ts | 2 +- .../src/main/ets/MainAbility/MainAbility.ts | 2 +- .../src/main/ets/Application/AbilityStage.ts | 2 +- .../src/main/ets/FifthAbility/FifthAbility.ts | 2 +- .../src/main/ets/ForthAbility/ForthAbility.ts | 2 +- .../src/main/ets/MainAbility/MainAbility.ts | 2 +- .../main/ets/SecondAbility/SecondAbility.ts | 2 +- .../src/main/ets/TestAbility/TestAbility.ts | 2 +- .../src/main/ets/ThirdAbility/ThirdAbility.ts | 2 +- .../main/ets/Application/MyAbilityStage.ts | 2 +- .../src/main/ets/MainAbility/MainAbility.ts | 2 +- .../entry/src/main/ets/AbilityStage.ts | 2 +- .../src/main/ets/MainAbility/MainAbility.ts | 2 +- .../src/main/ets/Application/AbilityStage.ts | 2 +- .../src/main/ets/MainAbility/MainAbility.ts | 2 +- .../src/main/ets/MainAbility2/MainAbility2.ts | 2 +- .../src/main/ets/MainAbility3/MainAbility3.ts | 2 +- .../src/main/ets/MainAbility4/MainAbility4.ts | 2 +- .../src/main/ets/Application/AbilityStage.ts | 2 +- .../src/main/ets/MainAbility/MainAbility.ts | 2 +- .../src/main/ets/MainAbility1/MainAbility1.ts | 2 +- .../src/main/ets/Application/AbilityStage.ts | 2 +- .../src/main/ets/MainAbility/MainAbility.ts | 2 +- .../src/main/ets/MainAbility1/MainAbility1.ts | 2 +- .../src/main/ets/Application/AbilityStage.ts | 2 +- .../src/main/ets/MainAbility/MainAbility.ts | 2 +- .../src/main/ets/MainAbility1/MainAbility1.ts | 2 +- .../entry/src/main/ets/Ability1/Ability1.ts | 2 +- .../entry/src/main/ets/Ability2/Ability2.ts | 2 +- .../src/main/ets/Application/AbilityStage.ts | 2 +- .../src/main/ets/MainAbility/MainAbility.ts | 2 +- .../entry/src/main/ets/Ability1/Ability1.ts | 2 +- .../entry/src/main/ets/Ability2/Ability2.ts | 2 +- .../src/main/ets/Application/AbilityStage.ts | 2 +- .../src/main/ets/MainAbility/MainAbility.ts | 2 +- .../entry/src/main/ets/AbilityStage.ts | 2 +- .../src/main/ets/MainAbility/MainAbility.ts | 2 +- .../entry/src/main/ets/AbilityStage.ts | 2 +- .../src/main/ets/MainAbility/MainAbility.ts | 2 +- .../src/main/ets/Application/AbilityStage.ts | 2 +- .../src/main/ets/MainAbility/MainAbility.ts | 2 +- .../src/main/ets/Application/AbilityStage.ts | 2 +- .../src/main/ets/MainAbility/MainAbility.ts | 2 +- .../src/main/ets/Application/AbilityStage.ts | 2 +- .../src/main/ets/MainAbility/MainAbility.ts | 2 +- .../SingleUserModel1400.ts | 2 +- .../SingleUserModel1500.ts | 2 +- .../SingleUserModel1600.ts | 2 +- .../SingleUserModel1700.ts | 2 +- .../SingleUserModel1800.ts | 2 +- .../src/main/ets/Application/AbilityStage.ts | 2 +- .../src/main/ets/MainAbility/MainAbility.ts | 2 +- .../src/main/ets/Application/AbilityStage.ts | 2 +- .../src/main/ets/MainAbility/MainAbility.ts | 2 +- .../entry/src/main/ets/test/Ability.test.ets | 2 +- .../src/main/ets/Application/AbilityStage.ts | 2 +- .../src/main/ets/MainAbility/MainAbility.ts | 2 +- .../SingleUserModel0500.ts | 2 +- .../SingleUserModel0600.ts | 2 +- .../SingleUserModel0700.ts | 2 +- .../SingleUserModel0800.ts | 2 +- .../SingleUserModel1300.ts | 2 +- .../src/main/ets/Application/AbilityStage.ts | 2 +- .../src/main/ets/MainAbility/MainAbility.ts | 2 +- .../SingleUserModel1900.ts | 2 +- .../src/main/ets/Application/AbilityStage.ts | 2 +- .../src/main/ets/MainAbility/MainAbility.ts | 2 +- .../entry/src/main/ets/test/Ability.test.ets | 2 +- .../src/main/ets/Application/AbilityStage.ts | 2 +- .../src/main/ets/MainAbility/MainAbility.ts | 2 +- .../entry/src/main/ets/test/Ability.test.ets | 2 +- .../src/main/ets/Application/AbilityStage.ts | 2 +- .../src/main/ets/MainAbility/MainAbility.ts | 2 +- .../SingleUserModel1000.ts | 2 +- .../src/main/ets/Application/AbilityStage.ts | 2 +- .../src/main/ets/MainAbility/MainAbility.ts | 2 +- .../src/main/ets/MainAbility2/MainAbility2.ts | 2 +- .../src/main/ets/MainAbility3/MainAbility3.ts | 2 +- .../main/ets/Application/MyAbilityStage.ts | 2 +- .../src/main/ets/MainAbility/MainAbility.ts | 2 +- .../main/ets/Application/MyAbilityStage.ts | 2 +- .../src/main/ets/MainAbility/MainAbility.ts | 2 +- .../main/ets/Application/MyAbilityStage.ts | 2 +- .../src/main/ets/MainAbility/MainAbility.ts | 2 +- .../src/main/ets/MainAbility2/MainAbility2.ts | 2 +- .../src/main/ets/MainAbility3/MainAbility3.ts | 2 +- .../main/ets/Application/MyAbilityStage.ts | 2 +- .../src/main/ets/MainAbility/MainAbility.ts | 2 +- .../entry/src/main/ets/AbilityStage.ts | 2 +- .../src/main/ets/MainAbility/MainAbility.ts | 2 +- .../src/main/ets/Application/AbilityStage.ts | 2 +- .../src/main/ets/MainAbility/MainAbility.ts | 2 +- .../src/main/ets/MainAbility2/MainAbility2.ts | 2 +- .../entry/src/main/ets/test/Ability.test.ets | 56 +++++++-------- .../src/main/ets/Application/AbilityStage.ts | 2 +- .../src/main/ets/MainAbility/MainAbility.ts | 2 +- .../src/main/ets/MainAbility2/MainAbility2.ts | 2 +- .../src/main/ets/TestAbility/TestAbility.ts | 2 +- .../entry/src/main/ets/test/Ability.test.ets | 48 ++++++------- .../src/main/ets/Application/AbilityStage.ts | 2 +- .../src/main/ets/MainAbility/MainAbility.ts | 2 +- .../src/main/ets/Application/AbilityStage.ts | 2 +- .../src/main/ets/MainAbility/MainAbility.ts | 2 +- .../src/main/ets/Application/AbilityStage.ts | 2 +- .../src/main/ets/MainAbility/MainAbility.ts | 2 +- .../src/main/ets/Application/AbilityStage.ts | 2 +- .../src/main/ets/MainAbility/MainAbility.ts | 2 +- .../src/main/ets/MainAbility2/MainAbility2.ts | 2 +- .../src/main/ets/MainAbility3/MainAbility3.ts | 2 +- .../src/main/ets/Application/AbilityStage.ts | 2 +- .../src/main/ets/MainAbility/MainAbility.ts | 2 +- .../src/main/ets/MainAbility2/MainAbility2.ts | 2 +- .../src/main/ets/MainAbility3/MainAbility3.ts | 2 +- .../src/main/ets/TestAbility/TestAbility.ts | 2 +- .../src/main/ets/Application/AbilityStage.ts | 2 +- .../src/main/ets/MainAbility/MainAbility.ts | 2 +- .../src/main/ets/TestAbility/TestAbility.ts | 2 +- .../ets/test/manyusersabilitytest.test.ets | 62 ++++++++--------- .../src/main/ets/Application/AbilityStage.ts | 2 +- .../src/main/ets/MainAbility/MainAbility.ts | 2 +- .../src/main/ets/TestAbility/TestAbility.ts | 2 +- .../ets/test/manyusersabilitytest.test.ets | 68 +++++++++---------- .../src/main/ets/Application/AbilityStage.ts | 2 +- .../src/main/ets/MainAbility/MainAbility.ts | 6 +- .../src/main/ets/Application/AbilityStage.ts | 2 +- .../src/main/ets/MainAbility/MainAbility.ts | 2 +- .../src/main/ets/TestAbility/TestAbility.ts | 2 +- .../src/main/ets/Application/AbilityStage.ts | 2 +- .../src/main/ets/MainAbility/MainAbility.ts | 2 +- .../src/main/ets/Application/AbilityStage.ts | 2 +- .../src/main/ets/MainAbility/MainAbility.ts | 2 +- .../src/main/ets/TestAbility/TestAbility.ts | 2 +- .../entry/src/main/ets/test/Ability.test.ets | 8 +-- .../src/main/ets/Application/AbilityStage.ts | 2 +- .../src/main/ets/MainAbility/MainAbility.ts | 2 +- .../src/main/ets/Application/AbilityStage.ts | 2 +- .../src/main/ets/MainAbility/MainAbility.ts | 2 +- .../src/main/ets/Application/AbilityStage.ts | 2 +- .../src/main/ets/MainAbility/MainAbility.ts | 2 +- .../src/main/ets/TestAbility/TestAbility.ts | 2 +- .../src/main/ets/Application/AbilityStage.ts | 2 +- .../src/main/ets/MainAbility/MainAbility.ts | 2 +- .../src/main/ets/TestAbility/TestAbility.ts | 2 +- .../src/main/ets/Application/AbilityStage.ts | 2 +- .../src/main/ets/MainAbility/MainAbility.ts | 2 +- .../src/main/ets/TestAbility/TestAbility.ts | 2 +- .../src/main/ets/Application/AbilityStage.ts | 2 +- .../src/main/ets/MainAbility/MainAbility.ts | 2 +- .../SecondMainAbility/SecondMainAbility.ts | 2 +- .../src/main/ets/Application/AbilityStage.ts | 2 +- .../src/main/ets/MainAbility/MainAbility.ts | 2 +- .../src/main/ets/Application/AbilityStage.ts | 2 +- .../src/main/ets/MainAbility/MainAbility.ts | 2 +- .../src/main/ets/MainAbility2/MainAbility2.ts | 2 +- .../src/main/ets/TestAbility/TestAbility.ts | 2 +- .../entry/src/main/ets/test/Ability.test.ets | 6 +- .../src/main/ets/Application/AbilityStage.ts | 2 +- .../src/main/ets/MainAbility/MainAbility.ts | 2 +- .../src/main/ets/Application/AbilityStage.ts | 2 +- .../CreateFormAbility/CreateFormAbility.ts | 2 +- .../ets/FormHostAbility/FormHostAbility.ts | 2 +- .../src/main/ets/MainAbility/MainAbility.ts | 2 +- .../main/ets/SecondAbility/SecondAbility.ts | 2 +- .../src/main/ets/TestAbility/TestAbility.ts | 2 +- .../main/ets/test/ApiCoverAbility.test.ets | 2 +- .../src/main/ets/test/VerificationTest.ets | 2 +- .../src/main/ets/Application/AbilityStage.ts | 2 +- .../src/main/ets/MainAbility/MainAbility.ts | 2 +- .../main/ets/MainAbility10/MainAbility10.ts | 2 +- .../src/main/ets/MainAbility3/MainAbility3.ts | 2 +- .../src/main/ets/MainAbility4/MainAbility4.ts | 2 +- .../src/main/ets/MainAbility5/MainAbility5.ts | 2 +- .../src/main/ets/MainAbility9/MainAbility9.ts | 4 +- .../src/main/ets/Application/AbilityStage.ts | 2 +- .../src/main/ets/MainAbility/MainAbility.ts | 2 +- .../src/main/ets/MainAbility2/MainAbility2.ts | 2 +- .../src/main/ets/MainAbility3/MainAbility3.ts | 2 +- .../src/main/ets/MainAbility4/MainAbility4.ts | 2 +- .../src/main/ets/MainAbility5/MainAbility5.ts | 2 +- .../src/main/ets/Application/AbilityStage.ts | 2 +- .../src/main/ets/MainAbility/MainAbility.ts | 2 +- .../src/main/ets/Application/AbilityStage.ts | 2 +- .../src/main/ets/MainAbility/MainAbility.ts | 2 +- .../src/main/ets/Application/AbilityStage.ts | 2 +- .../src/main/ets/MainAbility/MainAbility.ts | 2 +- .../main/ets/Application/MyAbilityStage.ts | 2 +- .../src/main/ets/MainAbility/MainAbility.ts | 2 +- .../main/ets/Application/MyAbilityStage.ts | 2 +- .../src/main/ets/MainAbility/MainAbility.ts | 2 +- .../main/ets/Application/MyAbilityStage.ts | 2 +- .../src/main/ets/MainAbility/MainAbility.ts | 2 +- .../src/main/ets/MainAbility2/MainAbility2.ts | 2 +- .../src/main/ets/Application/AbilityStage.ts | 2 +- .../src/main/ets/MainAbility/MainAbility.ts | 2 +- .../src/main/ets/TestAbility/TestAbility.ts | 2 +- .../src/main/ets/Application/AbilityStage.ts | 2 +- .../src/main/ets/MainAbility/MainAbility.ts | 2 +- .../src/main/ets/Application/AbilityStage.ts | 2 +- .../src/main/ets/MainAbility/MainAbility.ts | 2 +- .../src/main/ets/Application/AbilityStage.ts | 2 +- .../src/main/ets/MainAbility/MainAbility.ts | 2 +- .../src/main/ets/Application/AbilityStage.ts | 2 +- .../src/main/ets/MainAbility/MainAbility.ts | 2 +- .../src/main/ets/MainAbility2/MainAbility2.ts | 2 +- .../src/main/ets/test/ConnectAbilityTest.ets | 2 +- .../src/main/ets/Application/AbilityStage.ts | 2 +- .../src/main/ets/MainAbility/MainAbility.ts | 2 +- .../src/main/ets/Application/AbilityStage.ts | 2 +- .../src/main/ets/MainAbility/MainAbility.ts | 2 +- .../src/main/ets/Application/AbilityStage.ts | 2 +- .../src/main/ets/MainAbility/MainAbility.ts | 2 +- .../src/main/ets/Application/AbilityStage.ts | 2 +- .../src/main/ets/MainAbility/MainAbility.ts | 2 +- .../src/main/ets/Application/AbilityStage.ts | 2 +- .../src/main/ets/MainAbility/MainAbility.ts | 2 +- .../src/main/ets/Application/AbilityStage.ts | 2 +- .../src/main/ets/MainAbility/MainAbility.ts | 2 +- .../src/main/ets/Application/AbilityStage.ts | 2 +- .../src/main/ets/MainAbility/MainAbility.ts | 2 +- .../src/main/ets/Application/AbilityStage.ts | 2 +- .../src/main/ets/MainAbility/MainAbility.ts | 2 +- .../src/main/ets/Application/AbilityStage.ts | 2 +- .../src/main/ets/MainAbility/MainAbility.ts | 2 +- .../src/main/ets/Application/AbilityStage.ts | 2 +- .../src/main/ets/MainAbility/MainAbility.ts | 2 +- .../src/main/ets/Application/AbilityStage.ts | 2 +- .../src/main/ets/MainAbility/MainAbility.ts | 2 +- .../src/main/ets/Application/AbilityStage.ts | 2 +- .../src/main/ets/MainAbility/MainAbility.ts | 2 +- .../main/ets/test/StartAbilityForResult.ets | 2 +- .../src/main/ets/Application/AbilityStage.ts | 2 +- .../src/main/ets/MainAbility/MainAbility.ts | 2 +- .../main/ets/test/StartAbilityForResult.ets | 2 +- .../src/main/ets/Application/AbilityStage.ts | 2 +- .../src/main/ets/MainAbility/MainAbility.ts | 2 +- .../src/main/ets/Application/AbilityStage.ts | 2 +- .../src/main/ets/MainAbility/MainAbility.ts | 2 +- .../src/main/ets/Application/AbilityStage.ts | 2 +- .../src/main/ets/MainAbility/MainAbility.ts | 2 +- .../src/main/ets/Application/AbilityStage.ts | 2 +- .../src/main/ets/MainAbility1/MainAbility1.ts | 2 +- .../src/main/ets/Application/AbilityStage.ts | 2 +- .../src/main/ets/MainAbility/MainAbility.ts | 2 +- .../src/main/ets/MainAbility1/MainAbility1.ts | 2 +- .../src/main/ets/test/StartAbilityTest.ets | 2 +- .../src/main/ets/Application/AbilityStage.ts | 2 +- .../src/main/ets/MainAbility/MainAbility.ts | 2 +- .../src/main/ets/test/StartAbilityTest.ets | 2 +- .../src/main/ets/Application/AbilityStage.ts | 2 +- .../src/main/ets/MainAbility/MainAbility.ts | 2 +- .../src/main/ets/Application/AbilityStage.ts | 2 +- .../src/main/ets/MainAbility/MainAbility.ts | 2 +- .../src/main/ets/Application/AbilityStage.ts | 2 +- .../src/main/ets/MainAbility/MainAbility.ts | 2 +- .../src/main/ets/Application/AbilityStage.ts | 2 +- .../src/main/ets/MainAbility/MainAbility.ts | 2 +- .../src/main/ets/Application/AbilityStage.ts | 2 +- .../src/main/ets/MainAbility/MainAbility.ts | 2 +- .../src/main/ets/Application/AbilityStage.ts | 2 +- .../src/main/ets/MainAbility/MainAbility.ts | 2 +- .../src/main/ets/TestAbility/TestAbility.ts | 2 +- .../src/main/ets/Application/AbilityStage.ts | 2 +- .../src/main/ets/MainAbility/MainAbility.ts | 2 +- .../src/main/ets/Application/AbilityStage.ts | 2 +- .../src/main/ets/MainAbility/MainAbility.ts | 2 +- .../src/main/ets/Application/AbilityStage.ts | 2 +- .../src/main/ets/MainAbility/MainAbility.ts | 4 +- .../main/ets/SecondAbility/SecondAbility.ts | 2 +- .../src/main/ets/Application/AbilityStage.ts | 2 +- .../src/main/ets/MainAbility/MainAbility.ts | 2 +- .../src/main/ets/TestAbility/TestAbility.ts | 2 +- .../src/main/ets/Application/AbilityStage.ts | 2 +- .../src/main/ets/MainAbility/MainAbility.ts | 2 +- .../src/main/ets/MainAbility2/MainAbility2.ts | 2 +- .../src/main/ets/TestAbility/TestAbility.ts | 2 +- .../main/ets/test/AbilityPermission.test.ets | 2 +- .../src/main/ets/Application/AbilityStage.ts | 2 +- .../src/main/ets/MainAbility/MainAbility.ts | 2 +- .../src/main/ets/Application/AbilityStage.ts | 2 +- .../src/main/ets/MainAbility2/MainAbility2.ts | 2 +- .../src/main/ets/TestAbility/TestAbility.ts | 2 +- .../main/ets/test/AbilityPermission.test.ets | 2 +- .../src/main/ets/Application/AbilityStage.ts | 2 +- .../src/main/ets/MainAbility/MainAbility.ts | 2 +- .../src/main/ets/Application/AbilityStage.ts | 2 +- .../src/main/ets/MainAbility/MainAbility.ts | 2 +- .../src/main/ets/Application/AbilityStage.ts | 2 +- .../src/main/ets/MainAbility/MainAbility.ts | 2 +- .../src/main/ets/Application/AbilityStage.ts | 2 +- .../src/main/ets/MainAbility/MainAbility.ts | 2 +- .../src/main/ets/Application/AbilityStage.ts | 2 +- .../src/main/ets/MainAbility/MainAbility.ts | 2 +- .../src/main/ets/Application/AbilityStage.ts | 2 +- .../src/main/ets/MainAbility/MainAbility.ts | 2 +- .../src/main/ets/Application/AbilityStage.ts | 2 +- .../src/main/ets/MainAbility/MainAbility.ts | 2 +- .../src/main/ets/Application/AbilityStage.ts | 2 +- .../src/main/ets/MainAbility/MainAbility.ts | 2 +- .../src/main/ets/Application/AbilityStage.ts | 2 +- .../src/main/ets/MainAbility/MainAbility.ts | 2 +- .../src/main/ets/Application/AbilityStage.ts | 2 +- .../src/main/ets/MainAbility/MainAbility.ts | 2 +- .../src/main/ets/TestAbility/TestAbility.ts | 2 +- .../src/main/ets/Application/AbilityStage.ts | 2 +- .../ets/Hap2MainAbility1/Hap2MainAbility1.ts | 2 +- .../Hap2MainAbility10/Hap2MainAbility10.ts | 2 +- .../ets/Hap2MainAbility2/Hap2MainAbility2.ts | 2 +- .../ets/Hap2MainAbility3/Hap2MainAbility3.ts | 2 +- .../ets/Hap2MainAbility4/Hap2MainAbility4.ts | 2 +- .../ets/Hap2MainAbility5/Hap2MainAbility5.ts | 2 +- .../ets/Hap2MainAbility6/Hap2MainAbility6.ts | 2 +- .../ets/Hap2MainAbility7/Hap2MainAbility7.ts | 2 +- .../ets/Hap2MainAbility8/Hap2MainAbility8.ts | 2 +- .../ets/Hap2MainAbility9/Hap2MainAbility9.ts | 2 +- .../src/main/ets/Application/AbilityStage.ts | 2 +- .../ets/Hap3MainAbility1/Hap3MainAbility1.ts | 2 +- .../ets/Hap3MainAbility2/Hap3MainAbility2.ts | 2 +- .../ets/Hap3MainAbility3/Hap3MainAbility3.ts | 2 +- .../src/main/ets/Application/AbilityStage.ts | 2 +- .../src/main/ets/MainAbility/MainAbility.ts | 2 +- .../src/main/ets/MainAbility1/MainAbility1.ts | 2 +- .../src/main/ets/MainAbility2/MainAbility2.ts | 2 +- .../src/main/ets/MainAbility3/MainAbility3.ts | 2 +- .../src/main/ets/MainAbility4/MainAbility4.ts | 2 +- .../src/main/ets/MainAbility5/MainAbility5.ts | 2 +- .../src/main/ets/MainAbility6/MainAbility6.ts | 2 +- .../src/main/ets/MainAbility7/MainAbility7.ts | 2 +- .../src/main/ets/TestAbility/TestAbility.ts | 2 +- .../src/main/ets/Application/AbilityStage.ts | 2 +- .../ets/Hap4MainAbility1/Hap4MainAbility1.ts | 2 +- .../src/main/ets/Application/AbilityStage.ts | 2 +- .../ets/Hap1MainAbility1/Hap1MainAbility1.ts | 2 +- .../ets/Hap1MainAbility2/Hap1MainAbility2.ts | 2 +- .../src/main/ets/MainAbility/MainAbility.ts | 2 +- .../src/main/ets/MainAbility1/MainAbility1.ts | 2 +- .../main/ets/MainAbility10/MainAbility10.ts | 2 +- .../main/ets/MainAbility11/MainAbility11.ts | 2 +- .../main/ets/MainAbility12/MainAbility12.ts | 2 +- .../src/main/ets/MainAbility2/MainAbility2.ts | 2 +- .../src/main/ets/MainAbility3/MainAbility3.ts | 2 +- .../src/main/ets/MainAbility4/MainAbility4.ts | 2 +- .../src/main/ets/MainAbility5/MainAbility5.ts | 2 +- .../src/main/ets/MainAbility6/MainAbility6.ts | 2 +- .../src/main/ets/MainAbility7/MainAbility7.ts | 2 +- .../src/main/ets/MainAbility8/MainAbility8.ts | 2 +- .../src/main/ets/MainAbility9/MainAbility9.ts | 2 +- .../src/main/ets/TestAbility/TestAbility.ts | 2 +- .../src/main/ets/Application/AbilityStage.ts | 2 +- .../src/main/ets/MainAbility/MainAbility.ts | 2 +- .../src/main/ets/MainAbility1/MainAbility1.ts | 2 +- .../src/main/ets/MainAbility2/MainAbility2.ts | 2 +- .../src/main/ets/MainAbility3/MainAbility3.ts | 2 +- .../src/main/ets/MainAbility4/MainAbility4.ts | 2 +- .../src/main/ets/MainAbility5/MainAbility5.ts | 2 +- .../src/main/ets/MainAbility6/MainAbility6.ts | 2 +- .../src/main/ets/MainAbility7/MainAbility7.ts | 2 +- .../src/main/ets/TestAbility/TestAbility.ts | 2 +- .../src/main/ets/Application/AbilityStage.ts | 2 +- .../ets/Hap4MainAbility1/Hap4MainAbility1.ts | 2 +- .../src/main/ets/Application/AbilityStage.ts | 2 +- .../ets/Hap1MainAbility1/Hap1MainAbility1.ts | 2 +- .../ets/Hap1MainAbility2/Hap1MainAbility2.ts | 2 +- .../src/main/ets/MainAbility/MainAbility.ts | 2 +- .../src/main/ets/MainAbility1/MainAbility1.ts | 2 +- .../main/ets/MainAbility10/MainAbility10.ts | 2 +- .../main/ets/MainAbility11/MainAbility11.ts | 2 +- .../main/ets/MainAbility12/MainAbility12.ts | 2 +- .../src/main/ets/MainAbility2/MainAbility2.ts | 2 +- .../src/main/ets/MainAbility3/MainAbility3.ts | 2 +- .../src/main/ets/MainAbility4/MainAbility4.ts | 2 +- .../src/main/ets/MainAbility5/MainAbility5.ts | 2 +- .../src/main/ets/MainAbility6/MainAbility6.ts | 2 +- .../src/main/ets/MainAbility7/MainAbility7.ts | 2 +- .../src/main/ets/MainAbility8/MainAbility8.ts | 2 +- .../src/main/ets/MainAbility9/MainAbility9.ts | 2 +- .../src/main/ets/TestAbility/TestAbility.ts | 2 +- .../src/main/ets/Application/AbilityStage.ts | 2 +- .../src/main/ets/MainAbility/MainAbility.ts | 2 +- .../src/main/ets/TestAbility/TestAbility.ts | 2 +- .../src/main/ets/Application/AbilityStage.ts | 2 +- .../src/main/ets/MainAbility/MainAbility.ts | 2 +- .../entry/src/main/ets/test/Ability.test.ets | 16 ++--- .../src/main/ets/Application/AbilityStage.ts | 2 +- .../src/main/ets/MainAbility/MainAbility.ts | 2 +- .../src/main/ets/Application/AbilityStage.ts | 2 +- .../src/main/ets/MainAbility/MainAbility.ts | 2 +- .../src/main/ets/TestAbility/TestAbility.ts | 2 +- .../main/ets/MainAbility/pages/storage.ets | 2 +- .../src/main/ets/Application/AbilityStage.ts | 2 +- .../src/main/ets/MainAbility/MainAbility.ts | 2 +- .../src/main/ets/Application/AbilityStage.ts | 2 +- .../src/main/ets/MainAbility/MainAbility.ts | 2 +- .../src/main/ets/Application/AbilityStage.ts | 2 +- .../src/main/ets/MainAbility/MainAbility.ts | 2 +- .../js/MainAbility/pages/list/router/index.js | 2 +- .../src/main/ets/Application/AbilityStage.ts | 2 +- .../src/main/ets/MainAbility/MainAbility.ts | 2 +- .../src/main/ets/TestAbility/TestAbility.ts | 2 +- .../src/main/ets/Application/AbilityStage.ts | 2 +- .../src/main/ets/MainAbility/MainAbility.ts | 2 +- .../src/main/ets/TestAbility/TestAbility.ts | 2 +- .../src/main/ets/Application/AbilityStage.ts | 2 +- .../src/main/ets/MainAbility/MainAbility.ts | 2 +- .../src/main/ets/TestAbility/TestAbility.ts | 2 +- .../src/main/ets/Application/AbilityStage.ts | 2 +- .../src/main/ets/MainAbility/MainAbility.ts | 2 +- .../src/main/ets/TestAbility/TestAbility.ts | 2 +- .../src/main/ets/Application/AbilityStage.ts | 2 +- .../src/main/ets/MainAbility/MainAbility.ts | 2 +- .../src/main/ets/TestAbility/TestAbility.ts | 2 +- .../src/main/ets/Application/AbilityStage.ts | 2 +- .../src/main/ets/MainAbility/MainAbility.ts | 2 +- .../src/main/ets/TestAbility/TestAbility.ts | 2 +- .../src/main/ets/Application/AbilityStage.ts | 2 +- .../src/main/ets/MainAbility/MainAbility.ts | 2 +- .../src/main/ets/TestAbility/TestAbility.ts | 2 +- .../src/main/ets/Application/AbilityStage.ts | 2 +- .../src/main/ets/MainAbility/MainAbility.ts | 2 +- .../src/main/ets/TestAbility/TestAbility.ts | 2 +- .../src/main/ets/Application/AbilityStage.ts | 2 +- .../src/main/ets/MainAbility/MainAbility.ts | 2 +- .../src/main/ets/TestAbility/TestAbility.ts | 2 +- .../src/main/ets/Application/AbilityStage.ts | 2 +- .../src/main/ets/MainAbility/MainAbility.ts | 2 +- .../src/main/ets/TestAbility/TestAbility.ts | 2 +- .../src/main/ets/Application/AbilityStage.ts | 2 +- .../src/main/ets/MainAbility/MainAbility.ts | 2 +- .../src/main/ets/TestAbility/TestAbility.ts | 2 +- .../src/main/ets/Application/AbilityStage.ts | 2 +- .../src/main/ets/MainAbility/MainAbility.ts | 2 +- .../src/main/ets/TestAbility/TestAbility.ts | 2 +- .../src/main/ets/Application/AbilityStage.ts | 2 +- .../src/main/ets/MainAbility/MainAbility.ts | 2 +- .../src/main/ets/TestAbility/TestAbility.ts | 2 +- .../src/main/ets/Application/AbilityStage.ts | 2 +- .../src/main/ets/MainAbility/MainAbility.ts | 2 +- .../src/main/ets/TestAbility/TestAbility.ts | 2 +- .../src/main/ets/Application/AbilityStage.ts | 2 +- .../src/main/ets/MainAbility/MainAbility.ts | 2 +- .../src/main/ets/Application/AbilityStage.ts | 2 +- .../src/main/ets/MainAbility/MainAbility.ts | 2 +- .../src/main/ets/Application/AbilityStage.ts | 2 +- .../src/main/ets/MainAbility/MainAbility.ts | 2 +- .../src/main/ets/Application/AbilityStage.ts | 2 +- .../src/main/ets/MainAbility/MainAbility.ts | 2 +- .../src/main/ets/Application/AbilityStage.ts | 2 +- .../src/main/ets/MainAbility/MainAbility.ts | 2 +- .../src/main/ets/Application/AbilityStage.ts | 2 +- .../src/main/ets/MainAbility/MainAbility.ts | 2 +- .../src/main/ets/Application/AbilityStage.ts | 2 +- .../src/main/ets/MainAbility/MainAbility.ts | 2 +- .../src/main/ets/TestAbility/TestAbility.ts | 2 +- .../src/main/ets/Application/AbilityStage.ts | 2 +- .../src/main/ets/MainAbility/MainAbility.ts | 2 +- .../src/main/ets/Application/AbilityStage.ts | 2 +- .../src/main/ets/MainAbility/MainAbility.ts | 2 +- .../src/main/ets/Application/AbilityStage.ts | 2 +- .../src/main/ets/MainAbility/MainAbility.ts | 6 +- .../src/main/ets/TestAbility/TestAbility.ts | 2 +- .../src/main/ets/Application/AbilityStage.ts | 2 +- .../src/main/ets/MainAbility/MainAbility.ts | 2 +- .../src/main/ets/Application/AbilityStage.ts | 2 +- .../src/main/ets/MainAbility/MainAbility.ts | 2 +- .../src/main/ets/TestAbility/TestAbility.ts | 2 +- .../src/main/ets/Application/AbilityStage.ts | 2 +- .../src/main/ets/MainAbility/MainAbility.ts | 2 +- .../src/main/ets/TestAbility/TestAbility.ts | 2 +- .../src/main/js/test/abilityconstant_test.js | 4 +- .../src/main/js/test/apprecovery_test.js | 2 +- .../src/main/ets/Application/AbilityStage.ts | 2 +- .../src/main/ets/MainAbility/MainAbility.ts | 2 +- .../src/main/ets/Application/AbilityStage.ts | 2 +- .../src/main/ets/MainAbility/MainAbility.ts | 2 +- .../src/main/ets/Application/AbilityStage.ts | 2 +- .../src/main/ets/MainAbility/MainAbility.ts | 2 +- .../src/main/ets/Application/AbilityStage.ts | 2 +- .../src/main/ets/MainAbility/MainAbility.ts | 2 +- .../src/main/ets/Application/AbilityStage.ts | 2 +- .../src/main/ets/MainAbility/MainAbility.ts | 2 +- .../src/main/ets/Application/AbilityStage.ts | 2 +- .../src/main/ets/MainAbility/MainAbility.ts | 2 +- .../src/main/ets/Application/AbilityStage.ts | 2 +- .../src/main/ets/MainAbility/MainAbility.ts | 2 +- .../src/main/ets/Application/AbilityStage.ts | 2 +- .../src/main/ets/MainAbility/MainAbility.ts | 2 +- .../src/main/ets/Application/AbilityStage.ts | 2 +- .../src/main/ets/MainAbility/MainAbility.ts | 2 +- .../src/main/ets/Application/AbilityStage.ts | 2 +- .../src/main/ets/MainAbility/MainAbility.ts | 2 +- .../src/main/ets/Application/AbilityStage.ts | 2 +- .../src/main/ets/MainAbility/MainAbility.ts | 2 +- .../src/main/ets/Application/AbilityStage.ts | 2 +- .../src/main/ets/MainAbility/MainAbility.ts | 2 +- .../src/main/ets/Application/AbilityStage.ts | 2 +- .../src/main/ets/MainAbility/MainAbility.ts | 2 +- .../src/main/ets/Application/AbilityStage.ts | 2 +- .../src/main/ets/MainAbility/MainAbility.ts | 2 +- .../src/main/ets/Application/AbilityStage.ts | 2 +- .../src/main/ets/MainAbility/MainAbility.ts | 2 +- .../src/main/ets/Application/AbilityStage.ts | 2 +- .../src/main/ets/MainAbility/MainAbility.ts | 2 +- .../main/ets/Application/MyAbilityStage.ts | 2 +- .../src/main/ets/MainAbility/MainAbility.ts | 2 +- .../src/main/ets/Application/AbilityStage.ts | 2 +- .../src/main/ets/MainAbility/MainAbility.ts | 2 +- .../src/main/ets/TestAbility/TestAbility.ts | 2 +- .../main/ets/Application/MyAbilityStage.ts | 2 +- .../src/main/ets/MainAbility/MainAbility.ts | 2 +- 584 files changed, 716 insertions(+), 716 deletions(-) diff --git a/README_zh.md b/README_zh.md index 9cd99b05e..eb51bc838 100755 --- a/README_zh.md +++ b/README_zh.md @@ -872,7 +872,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 6ceb0c290..3745b4557 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 e7e16a3bb..74bcd6262 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 21fb01472..ffab0864c 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 94f44e976..a68bdd46e 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 @@ -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' 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 5073f0743..a31d98d3a 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 48e2332d0..f30966b58 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 6d7fb9f2e..a95e04425 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 3bb29f831..5ce50fe93 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 @@ -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' 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 5073f0743..a31d98d3a 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 4e22e378b..36effb03f 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 5073f0743..a31d98d3a 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 13f0e00fb..5f598413d 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 5073f0743..a31d98d3a 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 744320137..f21525988 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 5073f0743..a31d98d3a 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 880ca3fa4..6e7dd0e7d 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 5073f0743..a31d98d3a 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 880ca3fa4..6e7dd0e7d 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 5073f0743..a31d98d3a 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 7d4790bc0..8bb40cb12 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 2ae1bf3ce..f851e3de0 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 f0f006478..e3e7c0ce4 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 f2ddb735e..490f66fd2 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 8951a5ee4..95f0598fb 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 cd3a47d65..6589226bb 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 2bd862c50..a1432b767 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 6b6bf1feb..c37109ee5 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 08dee1230..8a81cf4b3 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 ddc665609..7d0aec329 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 08dee1230..8a81cf4b3 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 7df7ebd16..64b71689d 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 c7e4a876d..bb453afb1 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 f95a89421..9b93f421e 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 297ab5482..015a64945 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 2b5c594f7..fcea4946e 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 5e2915fe4..953114c1b 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 a7588ad77..4f2222fe1 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 e51ff9632..85d57c876 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 1c0b9c74e..0572bdb85 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 e51ff9632..85d57c876 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 54fb016cf..8e80db433 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 e51ff9632..85d57c876 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 54fb016cf..8e80db433 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 e51ff9632..85d57c876 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 54fb016cf..8e80db433 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 e51ff9632..85d57c876 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 54fb016cf..8e80db433 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 e51ff9632..85d57c876 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 54fb016cf..8e80db433 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 e51ff9632..85d57c876 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 54fb016cf..8e80db433 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 e51ff9632..85d57c876 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 d1317f99b..aaeed2f56 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 32dfe93cc..11200f672 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 22217570e..a9df91683 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 0c1e446dc..1e23214f1 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 @@ -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_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 e9055fc2d..bdda4acba 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 @@ -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_Start_CommonEvent====>"); diff --git a/ability/ability_runtime/actscalltest/systemappcalleea/entry/src/main/ets/Application/AbilityStage.ts b/ability/ability_runtime/actscalltest/systemappcalleea/entry/src/main/ets/Application/AbilityStage.ts index 21606483f..3e3eaea51 100644 --- a/ability/ability_runtime/actscalltest/systemappcalleea/entry/src/main/ets/Application/AbilityStage.ts +++ b/ability/ability_runtime/actscalltest/systemappcalleea/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/actscalltest/systemappcalleea/entry/src/main/ets/MainAbility/MainAbility.ts b/ability/ability_runtime/actscalltest/systemappcalleea/entry/src/main/ets/MainAbility/MainAbility.ts index f5ab8d609..2da9cd0e5 100644 --- a/ability/ability_runtime/actscalltest/systemappcalleea/entry/src/main/ets/MainAbility/MainAbility.ts +++ b/ability/ability_runtime/actscalltest/systemappcalleea/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' class MySequenceable { diff --git a/ability/ability_runtime/actscalltest/systemappcalleea/entry/src/main/ets/SecondAbility/SecondAbility.ts b/ability/ability_runtime/actscalltest/systemappcalleea/entry/src/main/ets/SecondAbility/SecondAbility.ts index b0f77555b..dcfe22f36 100644 --- a/ability/ability_runtime/actscalltest/systemappcalleea/entry/src/main/ets/SecondAbility/SecondAbility.ts +++ b/ability/ability_runtime/actscalltest/systemappcalleea/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' class MySequenceable { diff --git a/ability/ability_runtime/actscalltest/systemappcalleea/entry/src/main/ets/ThirdAbility/ThirdAbility.ts b/ability/ability_runtime/actscalltest/systemappcalleea/entry/src/main/ets/ThirdAbility/ThirdAbility.ts index 5fe516ffb..1d7f01a13 100644 --- a/ability/ability_runtime/actscalltest/systemappcalleea/entry/src/main/ets/ThirdAbility/ThirdAbility.ts +++ b/ability/ability_runtime/actscalltest/systemappcalleea/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' class MySequenceable { diff --git a/ability/ability_runtime/actscalltest/systemappcallera/entry/src/main/ets/Application/AbilityStage.ts b/ability/ability_runtime/actscalltest/systemappcallera/entry/src/main/ets/Application/AbilityStage.ts index 21606483f..3e3eaea51 100644 --- a/ability/ability_runtime/actscalltest/systemappcallera/entry/src/main/ets/Application/AbilityStage.ts +++ b/ability/ability_runtime/actscalltest/systemappcallera/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/actscalltest/systemappcallera/entry/src/main/ets/MainAbility/MainAbility.ts b/ability/ability_runtime/actscalltest/systemappcallera/entry/src/main/ets/MainAbility/MainAbility.ts index 00f76f112..7a5b184ae 100644 --- a/ability/ability_runtime/actscalltest/systemappcallera/entry/src/main/ets/MainAbility/MainAbility.ts +++ b/ability/ability_runtime/actscalltest/systemappcallera/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 bundleNameCallee = "com.example.systemcalltest"; diff --git a/ability/ability_runtime/actscalltest/systemappcallera/entry/src/main/ets/SecondAbility/SecondAbility.ts b/ability/ability_runtime/actscalltest/systemappcallera/entry/src/main/ets/SecondAbility/SecondAbility.ts index f341cffce..8fdbab4bb 100644 --- a/ability/ability_runtime/actscalltest/systemappcallera/entry/src/main/ets/SecondAbility/SecondAbility.ts +++ b/ability/ability_runtime/actscalltest/systemappcallera/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' class MySequenceable { diff --git a/ability/ability_runtime/actscalltest/systemappcallera/entry/src/main/ets/ThirdAbility/ThirdAbility.ts b/ability/ability_runtime/actscalltest/systemappcallera/entry/src/main/ets/ThirdAbility/ThirdAbility.ts index 5f17f742f..685423324 100644 --- a/ability/ability_runtime/actscalltest/systemappcallera/entry/src/main/ets/ThirdAbility/ThirdAbility.ts +++ b/ability/ability_runtime/actscalltest/systemappcallera/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' class MySequenceable { diff --git a/ability/ability_runtime/actscalltest/systemappcallerb/entry/src/main/ets/Application/AbilityStage.ts b/ability/ability_runtime/actscalltest/systemappcallerb/entry/src/main/ets/Application/AbilityStage.ts index 21606483f..3e3eaea51 100644 --- a/ability/ability_runtime/actscalltest/systemappcallerb/entry/src/main/ets/Application/AbilityStage.ts +++ b/ability/ability_runtime/actscalltest/systemappcallerb/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/actscalltest/systemappcallerb/entry/src/main/ets/MainAbility/MainAbility.ts b/ability/ability_runtime/actscalltest/systemappcallerb/entry/src/main/ets/MainAbility/MainAbility.ts index d11d7350b..2ae3700cb 100644 --- a/ability/ability_runtime/actscalltest/systemappcallerb/entry/src/main/ets/MainAbility/MainAbility.ts +++ b/ability/ability_runtime/actscalltest/systemappcallerb/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 bundleNameCallee = "com.example.systemcalltest"; diff --git a/ability/ability_runtime/actscalltest/systemappcallerc/entry/src/main/ets/Application/AbilityStage.ts b/ability/ability_runtime/actscalltest/systemappcallerc/entry/src/main/ets/Application/AbilityStage.ts index 21606483f..3e3eaea51 100644 --- a/ability/ability_runtime/actscalltest/systemappcallerc/entry/src/main/ets/Application/AbilityStage.ts +++ b/ability/ability_runtime/actscalltest/systemappcallerc/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/actscalltest/systemappcallerc/entry/src/main/ets/MainAbility/MainAbility.ts b/ability/ability_runtime/actscalltest/systemappcallerc/entry/src/main/ets/MainAbility/MainAbility.ts index cc055a484..3ccf4b12b 100644 --- a/ability/ability_runtime/actscalltest/systemappcallerc/entry/src/main/ets/MainAbility/MainAbility.ts +++ b/ability/ability_runtime/actscalltest/systemappcallerc/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 bundleNameCallee = "com.example.systemcalltest"; diff --git a/ability/ability_runtime/actscalltest/systemcallentrytest/entry/src/main/ets/Application/AbilityStage.ts b/ability/ability_runtime/actscalltest/systemcallentrytest/entry/src/main/ets/Application/AbilityStage.ts index 21606483f..3e3eaea51 100644 --- a/ability/ability_runtime/actscalltest/systemcallentrytest/entry/src/main/ets/Application/AbilityStage.ts +++ b/ability/ability_runtime/actscalltest/systemcallentrytest/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/actscalltest/systemcallentrytest/entry/src/main/ets/MainAbility/MainAbility.ts b/ability/ability_runtime/actscalltest/systemcallentrytest/entry/src/main/ets/MainAbility/MainAbility.ts index e8ec2b0a6..d02afb321 100644 --- a/ability/ability_runtime/actscalltest/systemcallentrytest/entry/src/main/ets/MainAbility/MainAbility.ts +++ b/ability/ability_runtime/actscalltest/systemcallentrytest/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' class MySequenceable { num: number = 0; diff --git a/ability/ability_runtime/actscalltest/systemcallentrytest/entry/src/main/ets/SecondAbility/SecondAbility.ts b/ability/ability_runtime/actscalltest/systemcallentrytest/entry/src/main/ets/SecondAbility/SecondAbility.ts index 9ea84282b..482044516 100644 --- a/ability/ability_runtime/actscalltest/systemcallentrytest/entry/src/main/ets/SecondAbility/SecondAbility.ts +++ b/ability/ability_runtime/actscalltest/systemcallentrytest/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 callerA = "SystemAppCallerA" diff --git a/ability/ability_runtime/actscalltest/systemcallentrytest/entry/src/main/ets/TestAbility/TestAbility.ts b/ability/ability_runtime/actscalltest/systemcallentrytest/entry/src/main/ets/TestAbility/TestAbility.ts index 083827445..12a6e8ac3 100644 --- a/ability/ability_runtime/actscalltest/systemcallentrytest/entry/src/main/ets/TestAbility/TestAbility.ts +++ b/ability/ability_runtime/actscalltest/systemcallentrytest/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/actscalltest/systemcallfeature/entry/src/main/ets/Application/AbilityStage.ts b/ability/ability_runtime/actscalltest/systemcallfeature/entry/src/main/ets/Application/AbilityStage.ts index ebc3c7643..e63c6cc3c 100644 --- a/ability/ability_runtime/actscalltest/systemcallfeature/entry/src/main/ets/Application/AbilityStage.ts +++ b/ability/ability_runtime/actscalltest/systemcallfeature/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/actscalltest/systemcallfeature/entry/src/main/ets/MainAbility/MainAbility.ts b/ability/ability_runtime/actscalltest/systemcallfeature/entry/src/main/ets/MainAbility/MainAbility.ts index f9945fc72..7dc1ceee6 100644 --- a/ability/ability_runtime/actscalltest/systemcallfeature/entry/src/main/ets/MainAbility/MainAbility.ts +++ b/ability/ability_runtime/actscalltest/systemcallfeature/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' class MySequenceable { num: number = 0; diff --git a/ability/ability_runtime/actscalltest/thirdappa/entry/src/main/ets/Application/AbilityStage.ts b/ability/ability_runtime/actscalltest/thirdappa/entry/src/main/ets/Application/AbilityStage.ts index 21606483f..3e3eaea51 100644 --- a/ability/ability_runtime/actscalltest/thirdappa/entry/src/main/ets/Application/AbilityStage.ts +++ b/ability/ability_runtime/actscalltest/thirdappa/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/actscalltest/thirdappa/entry/src/main/ets/MainAbility/MainAbility.ts b/ability/ability_runtime/actscalltest/thirdappa/entry/src/main/ets/MainAbility/MainAbility.ts index d6587c63e..8d69a168f 100644 --- a/ability/ability_runtime/actscalltest/thirdappa/entry/src/main/ets/MainAbility/MainAbility.ts +++ b/ability/ability_runtime/actscalltest/thirdappa/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' class MySequenceable { diff --git a/ability/ability_runtime/actscalltest/thirdcalltest/entry/src/main/ets/Application/AbilityStage.ts b/ability/ability_runtime/actscalltest/thirdcalltest/entry/src/main/ets/Application/AbilityStage.ts index 21606483f..3e3eaea51 100644 --- a/ability/ability_runtime/actscalltest/thirdcalltest/entry/src/main/ets/Application/AbilityStage.ts +++ b/ability/ability_runtime/actscalltest/thirdcalltest/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/actscalltest/thirdcalltest/entry/src/main/ets/FifthAbility/FifthAbility.ts b/ability/ability_runtime/actscalltest/thirdcalltest/entry/src/main/ets/FifthAbility/FifthAbility.ts index 291bc68b3..4338b5545 100644 --- a/ability/ability_runtime/actscalltest/thirdcalltest/entry/src/main/ets/FifthAbility/FifthAbility.ts +++ b/ability/ability_runtime/actscalltest/thirdcalltest/entry/src/main/ets/FifthAbility/FifthAbility.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' class MySequenceable { diff --git a/ability/ability_runtime/actscalltest/thirdcalltest/entry/src/main/ets/ForthAbility/ForthAbility.ts b/ability/ability_runtime/actscalltest/thirdcalltest/entry/src/main/ets/ForthAbility/ForthAbility.ts index e431367ed..63e121410 100644 --- a/ability/ability_runtime/actscalltest/thirdcalltest/entry/src/main/ets/ForthAbility/ForthAbility.ts +++ b/ability/ability_runtime/actscalltest/thirdcalltest/entry/src/main/ets/ForthAbility/ForthAbility.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' class MySequenceable { diff --git a/ability/ability_runtime/actscalltest/thirdcalltest/entry/src/main/ets/MainAbility/MainAbility.ts b/ability/ability_runtime/actscalltest/thirdcalltest/entry/src/main/ets/MainAbility/MainAbility.ts index adcdc096b..9e1977f8d 100644 --- a/ability/ability_runtime/actscalltest/thirdcalltest/entry/src/main/ets/MainAbility/MainAbility.ts +++ b/ability/ability_runtime/actscalltest/thirdcalltest/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/actscalltest/thirdcalltest/entry/src/main/ets/SecondAbility/SecondAbility.ts b/ability/ability_runtime/actscalltest/thirdcalltest/entry/src/main/ets/SecondAbility/SecondAbility.ts index f774b0d28..336860705 100644 --- a/ability/ability_runtime/actscalltest/thirdcalltest/entry/src/main/ets/SecondAbility/SecondAbility.ts +++ b/ability/ability_runtime/actscalltest/thirdcalltest/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' class MySequenceable { diff --git a/ability/ability_runtime/actscalltest/thirdcalltest/entry/src/main/ets/TestAbility/TestAbility.ts b/ability/ability_runtime/actscalltest/thirdcalltest/entry/src/main/ets/TestAbility/TestAbility.ts index 0ab4ba7a8..db14f9875 100644 --- a/ability/ability_runtime/actscalltest/thirdcalltest/entry/src/main/ets/TestAbility/TestAbility.ts +++ b/ability/ability_runtime/actscalltest/thirdcalltest/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/actscalltest/thirdcalltest/entry/src/main/ets/ThirdAbility/ThirdAbility.ts b/ability/ability_runtime/actscalltest/thirdcalltest/entry/src/main/ets/ThirdAbility/ThirdAbility.ts index fa352fee5..ae1568ceb 100644 --- a/ability/ability_runtime/actscalltest/thirdcalltest/entry/src/main/ets/ThirdAbility/ThirdAbility.ts +++ b/ability/ability_runtime/actscalltest/thirdcalltest/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' class MySequenceable { 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 94c3b4421..71c4a3fe1 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 618bcd06d..7c0e1c8cf 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 07ad14f5f..397f53c99 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 5f8551ea9..0aa7fed2f 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 5073f0743..a31d98d3a 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 4a255b15a..db1617895 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 48e2332d0..f30966b58 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 7e4b57e67..3686c2262 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 @@ -13,7 +13,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 dd7e032b6..16982b8a7 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 @@ -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 { 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 32dfe93cc..11200f672 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 880ca3fa4..6e7dd0e7d 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 7212a06e9..988730610 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 5073f0743..a31d98d3a 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 880ca3fa4..6e7dd0e7d 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 7212a06e9..988730610 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 5073f0743..a31d98d3a 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 880ca3fa4..6e7dd0e7d 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 7212a06e9..988730610 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 99cabae59..5273ef86f 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 c3309b102..b756a6eb5 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 5073f0743..a31d98d3a 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 09c6f0bfa..674e179eb 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 23999d3bc..bb7ab2379 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 5b20afc40..a7a001f4b 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 5073f0743..a31d98d3a 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 880ca3fa4..6e7dd0e7d 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 07ad14f5f..397f53c99 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 5f8551ea9..0aa7fed2f 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 07ad14f5f..397f53c99 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 1dbbb8be4..0457c24cd 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/ActsExecuteShellCommandTest/entry/src/main/ets/Application/AbilityStage.ts b/ability/ability_runtime/actsshellcommandfunctionalitytest/ActsExecuteShellCommandTest/entry/src/main/ets/Application/AbilityStage.ts index 2ae1bf3ce..f851e3de0 100755 --- a/ability/ability_runtime/actsshellcommandfunctionalitytest/ActsExecuteShellCommandTest/entry/src/main/ets/Application/AbilityStage.ts +++ b/ability/ability_runtime/actsshellcommandfunctionalitytest/ActsExecuteShellCommandTest/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/ActsExecuteShellCommandTest/entry/src/main/ets/MainAbility/MainAbility.ts b/ability/ability_runtime/actsshellcommandfunctionalitytest/ActsExecuteShellCommandTest/entry/src/main/ets/MainAbility/MainAbility.ts index 68728e971..4f0da52d7 100755 --- a/ability/ability_runtime/actsshellcommandfunctionalitytest/ActsExecuteShellCommandTest/entry/src/main/ets/MainAbility/MainAbility.ts +++ b/ability/ability_runtime/actsshellcommandfunctionalitytest/ActsExecuteShellCommandTest/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/ActsKillProcessWithAccountCloseRelyHap/entry/src/main/ets/Application/AbilityStage.ts b/ability/ability_runtime/actsshellcommandfunctionalitytest/ActsKillProcessWithAccountCloseRelyHap/entry/src/main/ets/Application/AbilityStage.ts index 2ae1bf3ce..f851e3de0 100755 --- a/ability/ability_runtime/actsshellcommandfunctionalitytest/ActsKillProcessWithAccountCloseRelyHap/entry/src/main/ets/Application/AbilityStage.ts +++ b/ability/ability_runtime/actsshellcommandfunctionalitytest/ActsKillProcessWithAccountCloseRelyHap/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/ActsKillProcessWithAccountCloseRelyHap/entry/src/main/ets/MainAbility/MainAbility.ts b/ability/ability_runtime/actsshellcommandfunctionalitytest/ActsKillProcessWithAccountCloseRelyHap/entry/src/main/ets/MainAbility/MainAbility.ts index bdb5195c5..244f70b57 100755 --- a/ability/ability_runtime/actsshellcommandfunctionalitytest/ActsKillProcessWithAccountCloseRelyHap/entry/src/main/ets/MainAbility/MainAbility.ts +++ b/ability/ability_runtime/actsshellcommandfunctionalitytest/ActsKillProcessWithAccountCloseRelyHap/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 847902970..75e6a5aae 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 3a7ebee7c..7fc7b9e55 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 2361d1ecc..3f5157fb0 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 ed3d1f68c..5c52b5472 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 02ec46b73..cb7062fce 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 b3e19ce16..076bdcd85 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 43ec23b00..b58935bcf 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/SystemSingletonExtension/entry/src/main/ets/Application/AbilityStage.ts b/ability/ability_runtime/actssingleton/SystemSingletonExtension/entry/src/main/ets/Application/AbilityStage.ts index 6ceb0c290..3745b4557 100644 --- a/ability/ability_runtime/actssingleton/SystemSingletonExtension/entry/src/main/ets/Application/AbilityStage.ts +++ b/ability/ability_runtime/actssingleton/SystemSingletonExtension/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/SystemSingletonExtension/entry/src/main/ets/MainAbility/MainAbility.ts b/ability/ability_runtime/actssingleton/SystemSingletonExtension/entry/src/main/ets/MainAbility/MainAbility.ts index 82e750043..fdc083064 100644 --- a/ability/ability_runtime/actssingleton/SystemSingletonExtension/entry/src/main/ets/MainAbility/MainAbility.ts +++ b/ability/ability_runtime/actssingleton/SystemSingletonExtension/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/SystemSingletonExtensionFalse/entry/src/main/ets/Application/AbilityStage.ts b/ability/ability_runtime/actssingleton/SystemSingletonExtensionFalse/entry/src/main/ets/Application/AbilityStage.ts index 6ceb0c290..3745b4557 100644 --- a/ability/ability_runtime/actssingleton/SystemSingletonExtensionFalse/entry/src/main/ets/Application/AbilityStage.ts +++ b/ability/ability_runtime/actssingleton/SystemSingletonExtensionFalse/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/SystemSingletonExtensionFalse/entry/src/main/ets/MainAbility/MainAbility.ts b/ability/ability_runtime/actssingleton/SystemSingletonExtensionFalse/entry/src/main/ets/MainAbility/MainAbility.ts index 7e962a25a..1f13d29bf 100644 --- a/ability/ability_runtime/actssingleton/SystemSingletonExtensionFalse/entry/src/main/ets/MainAbility/MainAbility.ts +++ b/ability/ability_runtime/actssingleton/SystemSingletonExtensionFalse/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/SystemSingletonExtensionFalse/entry/src/main/ets/test/Ability.test.ets b/ability/ability_runtime/actssingleton/SystemSingletonExtensionFalse/entry/src/main/ets/test/Ability.test.ets index 88bd4a30c..98f6e9ec1 100644 --- a/ability/ability_runtime/actssingleton/SystemSingletonExtensionFalse/entry/src/main/ets/test/Ability.test.ets +++ b/ability/ability_runtime/actssingleton/SystemSingletonExtensionFalse/entry/src/main/ets/test/Ability.test.ets @@ -81,7 +81,7 @@ export default function singleusermodelTest() { console.info('executeShellCommand : err : ' + JSON.stringify(err)); }) console.debug('ACTS_ExtensionSingleUserModel_1400====>timeout====>'); - globalThis.abilityContex.disconnectAbility(connId).then((data)=>{ + globalThis.abilityContext.disconnectServiceExtensionAbility(connId).then((data)=>{ console.debug("====>data is====>" + JSON.stringify(data)); }) },START_ABILITY_TIMEOUT); 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 6ceb0c290..3745b4557 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 d1de680e6..1684b31c7 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 0d4836e53..1ff77fe0e 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 a9da8df29..2dbbc3b49 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 85af6aa0a..d72e5d94c 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 29f84effe..7518a3a9d 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 bc2187afc..7ab4b8ea2 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 6ceb0c290..3745b4557 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 f1204f243..cd7ca6160 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 5266152f1..0b1d45693 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/ThirdSingletonExtension/entry/src/main/ets/Application/AbilityStage.ts b/ability/ability_runtime/actssingleton/ThirdSingletonExtension/entry/src/main/ets/Application/AbilityStage.ts index 6ceb0c290..3745b4557 100644 --- a/ability/ability_runtime/actssingleton/ThirdSingletonExtension/entry/src/main/ets/Application/AbilityStage.ts +++ b/ability/ability_runtime/actssingleton/ThirdSingletonExtension/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/ThirdSingletonExtension/entry/src/main/ets/MainAbility/MainAbility.ts b/ability/ability_runtime/actssingleton/ThirdSingletonExtension/entry/src/main/ets/MainAbility/MainAbility.ts index f4b4d0da2..11fe945f7 100644 --- a/ability/ability_runtime/actssingleton/ThirdSingletonExtension/entry/src/main/ets/MainAbility/MainAbility.ts +++ b/ability/ability_runtime/actssingleton/ThirdSingletonExtension/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/ThirdSingletonExtension/entry/src/main/ets/test/Ability.test.ets b/ability/ability_runtime/actssingleton/ThirdSingletonExtension/entry/src/main/ets/test/Ability.test.ets index 926203ee5..1ba0d7750 100644 --- a/ability/ability_runtime/actssingleton/ThirdSingletonExtension/entry/src/main/ets/test/Ability.test.ets +++ b/ability/ability_runtime/actssingleton/ThirdSingletonExtension/entry/src/main/ets/test/Ability.test.ets @@ -85,7 +85,7 @@ export default function singleusermodelTest() { }) globalThis.ability2Context.terminateSelf(); console.debug('ACTS_ExtensionSingleUserModel_1800====>timeout====>'); - globalThis.abilityContex.disconnectAbility(connId).then((data, err) => { + globalThis.abilityContext.disconnectServiceExtensionAbility(connId).then((data, err) => { console.debug("====>data is====>" + JSON.stringify(data)); console.debug("====>err is====>" + JSON.stringify(err)); }) diff --git a/ability/ability_runtime/actssingleton/ThirdSingletonExtensionFalse/entry/src/main/ets/Application/AbilityStage.ts b/ability/ability_runtime/actssingleton/ThirdSingletonExtensionFalse/entry/src/main/ets/Application/AbilityStage.ts index 6ceb0c290..3745b4557 100644 --- a/ability/ability_runtime/actssingleton/ThirdSingletonExtensionFalse/entry/src/main/ets/Application/AbilityStage.ts +++ b/ability/ability_runtime/actssingleton/ThirdSingletonExtensionFalse/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/ThirdSingletonExtensionFalse/entry/src/main/ets/MainAbility/MainAbility.ts b/ability/ability_runtime/actssingleton/ThirdSingletonExtensionFalse/entry/src/main/ets/MainAbility/MainAbility.ts index fee691e92..6c84b454d 100644 --- a/ability/ability_runtime/actssingleton/ThirdSingletonExtensionFalse/entry/src/main/ets/MainAbility/MainAbility.ts +++ b/ability/ability_runtime/actssingleton/ThirdSingletonExtensionFalse/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/ThirdSingletonExtensionFalse/entry/src/main/ets/test/Ability.test.ets b/ability/ability_runtime/actssingleton/ThirdSingletonExtensionFalse/entry/src/main/ets/test/Ability.test.ets index b7f9c6390..833eb4102 100644 --- a/ability/ability_runtime/actssingleton/ThirdSingletonExtensionFalse/entry/src/main/ets/test/Ability.test.ets +++ b/ability/ability_runtime/actssingleton/ThirdSingletonExtensionFalse/entry/src/main/ets/test/Ability.test.ets @@ -83,7 +83,7 @@ export default function singleusermodelTest() { console.info('executeShellCommand 0: err : ' + JSON.stringify(err)); }) console.debug('ACTS_ExtensionSingleUserModel_1000====>timeout====>'); - await globalThis.abilityContext.disconnectAbility(connId).then((data, err) => { + await globalThis.abilityContext.disconnectServiceExtensionAbility(connId).then((data, err) => { console.debug("====>data is====>" + JSON.stringify(data)); console.debug("====>err is====>" + JSON.stringify(err)); }) 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 6ceb0c290..3745b4557 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 f1204f243..cd7ca6160 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 08dd1f18f..af5003ee1 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 32dfe93cc..11200f672 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 b69c8389d..e24c00d13 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 9bd2b8ce2..273ef3357 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 @@ -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_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 a50f21965..6e4575fb8 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 @@ -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_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 8d3ffd134..9cd145d84 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 8e765bf1f..b4ea0100a 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 7188dd896..f3bd7f55e 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 26302eb5a..f5d461ac3 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 7b26de8ac..e93badcaa 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 9b624c753..86ad5daa2 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 27cb2995e..456aa561b 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 ff4a433b6..ebfd2b9a6 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 80c14a76d..db24362a5 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 92d9a0c82..f5bcdde65 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 e2e06d6d3..e8b627368 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 c89305ea6..75ea18cfb 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/ActsAmsUsersExtensionSystemTest/entry/src/main/ets/Application/AbilityStage.ts b/ability/ability_runtime/actsusers/ActsAmsUsersExtensionSystemTest/entry/src/main/ets/Application/AbilityStage.ts index 5e2915fe4..953114c1b 100644 --- a/ability/ability_runtime/actsusers/ActsAmsUsersExtensionSystemTest/entry/src/main/ets/Application/AbilityStage.ts +++ b/ability/ability_runtime/actsusers/ActsAmsUsersExtensionSystemTest/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/ActsAmsUsersExtensionSystemTest/entry/src/main/ets/MainAbility/MainAbility.ts b/ability/ability_runtime/actsusers/ActsAmsUsersExtensionSystemTest/entry/src/main/ets/MainAbility/MainAbility.ts index 627735a9b..9c42b9840 100644 --- a/ability/ability_runtime/actsusers/ActsAmsUsersExtensionSystemTest/entry/src/main/ets/MainAbility/MainAbility.ts +++ b/ability/ability_runtime/actsusers/ActsAmsUsersExtensionSystemTest/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/actsusers/ActsAmsUsersExtensionSystemTest/entry/src/main/ets/MainAbility2/MainAbility2.ts b/ability/ability_runtime/actsusers/ActsAmsUsersExtensionSystemTest/entry/src/main/ets/MainAbility2/MainAbility2.ts index 3a23181f8..c14e759e1 100644 --- a/ability/ability_runtime/actsusers/ActsAmsUsersExtensionSystemTest/entry/src/main/ets/MainAbility2/MainAbility2.ts +++ b/ability/ability_runtime/actsusers/ActsAmsUsersExtensionSystemTest/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" export default class MainAbility2 extends Ability { diff --git a/ability/ability_runtime/actsusers/ActsAmsUsersExtensionSystemTest/entry/src/main/ets/test/Ability.test.ets b/ability/ability_runtime/actsusers/ActsAmsUsersExtensionSystemTest/entry/src/main/ets/test/Ability.test.ets index a20fe5e8a..a3563c2fa 100644 --- a/ability/ability_runtime/actsusers/ActsAmsUsersExtensionSystemTest/entry/src/main/ets/test/Ability.test.ets +++ b/ability/ability_runtime/actsusers/ActsAmsUsersExtensionSystemTest/entry/src/main/ets/test/Ability.test.ets @@ -51,7 +51,7 @@ export default function abilityTest() { if (data.event == "ACTS_InterfaceMultiUsersExtension_CommonEvent") { startresult = true } - globalThis.abilityContext.disconnectAbility(globalThis.number).then((data) => { + globalThis.abilityContext.disconnectServiceExtensionAbility(globalThis.number).then((data) => { console.debug("====>data is====>" + JSON.stringify(data)); }) console.log('====>disconnectAbility finish'); @@ -64,7 +64,7 @@ export default function abilityTest() { Subscriber = data; commonEvent.subscribe(Subscriber, SubscribeCallBack); console.debug("====>0100start connectAbility====>"); - globalThis.number = await globalThis.abilityContext.connectAbility( + globalThis.number = await globalThis.abilityContext.connectServiceExtensionAbility( { bundleName: 'com.acts.actsinterfacemultiusersextensiontest', abilityName: 'com.acts.actsinterfacemultiusersextensiontest.ServiceAbility' @@ -118,7 +118,7 @@ export default function abilityTest() { console.debug("====>UnSubscribeCallback====>"); flag = false expect(startresult).assertEqual(false); - globalThis.abilityContext.disconnectAbility(globalThis.number).then((data) => { + globalThis.abilityContext.disconnectServiceExtensionAbility(globalThis.number).then((data) => { console.debug("====>data is====>" + JSON.stringify(data)); }) console.log('====>disconnectAbility finish'); @@ -152,7 +152,7 @@ export default function abilityTest() { Subscriber = data; commonEvent.subscribe(Subscriber, SubscribeCallBack); console.debug("====>0200start connectAbility====>"); - globalThis.number = await globalThis.abilityContext.connectAbility( + globalThis.number = await globalThis.abilityContext.connectServiceExtensionAbility( { bundleName: 'com.acts.actsinterfacemultiusersextensiontest', abilityName: 'com.acts.actsinterfacemultiusersextensiontest.ServiceAbility' @@ -183,7 +183,7 @@ export default function abilityTest() { if (data.event == "ACTS_InterfaceMultiUsersExtension_CommonEvent") { startresult = true } - globalThis.abilityContext.disconnectAbility(globalThis.number).then((data) => { + globalThis.abilityContext.disconnectServiceExtensionAbility(globalThis.number).then((data) => { console.debug("====>data is====>" + JSON.stringify(data)); }) console.log('====>disconnectAbility finish'); @@ -196,7 +196,7 @@ export default function abilityTest() { Subscriber = data; commonEvent.subscribe(Subscriber, SubscribeCallBack); console.debug("====>0300start connectAbility====>"); - globalThis.number = await globalThis.abilityContext.connectAbility( + globalThis.number = await globalThis.abilityContext.connectServiceExtensionAbility( { bundleName: 'com.acts.actsinterfacemultiusersextensiontest', abilityName: 'com.acts.actsinterfacemultiusersextensiontest.ServiceAbility' @@ -250,7 +250,7 @@ export default function abilityTest() { console.debug("====>UnSubscribeCallback====>"); flag = false expect(startresult).assertEqual(false); - globalThis.abilityContext.disconnectAbility(globalThis.number).then((data) => { + globalThis.abilityContext.disconnectServiceExtensionAbility(globalThis.number).then((data) => { console.debug("====>data is====>" + JSON.stringify(data)); }) console.log('====>disconnectAbility finish'); @@ -284,7 +284,7 @@ export default function abilityTest() { Subscriber = data; commonEvent.subscribe(Subscriber, SubscribeCallBack); console.debug("====>0400start connectAbility====>"); - globalThis.number = await globalThis.abilityContext.connectAbility( + globalThis.number = await globalThis.abilityContext.connectServiceExtensionAbility( { bundleName: 'com.acts.actsinterfacemultiusersextensiontest', abilityName: 'com.acts.actsinterfacemultiusersextensiontest.ServiceAbility' @@ -316,7 +316,7 @@ export default function abilityTest() { if (data.event == "ACTS_InterfaceMultiUsersExtension_CommonEvent") { startresult = true } - globalThis.abilityContext.disconnectAbility(globalThis.number).then((data) => { + globalThis.abilityContext.disconnectServiceExtensionAbility(globalThis.number).then((data) => { console.debug("====>data is====>" + JSON.stringify(data)); }) console.log('====>disconnectAbility finish'); @@ -329,7 +329,7 @@ export default function abilityTest() { Subscriber = data; commonEvent.subscribe(Subscriber, SubscribeCallBack); console.debug("====>0500start connectAbility====>"); - globalThis.number = await globalThis.abilityContext.connectAbility( + globalThis.number = await globalThis.abilityContext.connectServiceExtensionAbility( { bundleName: 'com.acts.actsinterfacemultiusersextensiontest', abilityName: 'com.acts.actsinterfacemultiusersextensiontest.ServiceAbility' @@ -383,7 +383,7 @@ export default function abilityTest() { console.debug("====>UnSubscribeCallback====>"); flag = false expect(startresult).assertEqual(false); - globalThis.abilityContext.disconnectAbility(globalThis.number).then((data) => { + globalThis.abilityContext.disconnectServiceExtensionAbility(globalThis.number).then((data) => { console.debug("====>data is====>" + JSON.stringify(data)); }) console.log('====>disconnectAbility finish'); @@ -417,7 +417,7 @@ export default function abilityTest() { Subscriber = data; commonEvent.subscribe(Subscriber, SubscribeCallBack); console.debug("====>0600start connectAbility====>"); - globalThis.number = await globalThis.abilityContext.connectAbility( + globalThis.number = await globalThis.abilityContext.connectServiceExtensionAbility( { bundleName: 'com.acts.actsinterfacemultiusersextensiontest', abilityName: 'com.acts.actsinterfacemultiusersextensiontest.ServiceAbility' @@ -448,7 +448,7 @@ export default function abilityTest() { if (data.event == "ACTS_InterfaceMultiUsersExtension_CommonEvent") { startresult = true } - globalThis.abilityContext.disconnectAbility(globalThis.number).then((data) => { + globalThis.abilityContext.disconnectServiceExtensionAbility(globalThis.number).then((data) => { console.debug("====>data is====>" + JSON.stringify(data)); }) console.log('====>disconnectAbility finish'); @@ -461,7 +461,7 @@ export default function abilityTest() { Subscriber = data; commonEvent.subscribe(Subscriber, SubscribeCallBack); console.debug("====>0700start connectAbility====>"); - globalThis.number = await globalThis.abilityContext.connectAbility( + globalThis.number = await globalThis.abilityContext.connectServiceExtensionAbility( { bundleName: 'com.acts.actsinterfacemultiusersextensiontest', abilityName: 'com.acts.actsinterfacemultiusersextensiontest.ServiceAbility' @@ -516,7 +516,7 @@ export default function abilityTest() { console.debug("====>UnSubscribeCallback====>"); flag = false expect(startresult).assertEqual(false); - globalThis.abilityContext.disconnectAbility(globalThis.number).then((data) => { + globalThis.abilityContext.disconnectServiceExtensionAbility(globalThis.number).then((data) => { console.debug("====>data is====>" + JSON.stringify(data)); }) console.log('====>disconnectAbility finish'); @@ -550,7 +550,7 @@ export default function abilityTest() { Subscriber = data; commonEvent.subscribe(Subscriber, SubscribeCallBack); console.debug("====>0800start connectAbility====>"); - globalThis.number = await globalThis.abilityContext.connectAbility( + globalThis.number = await globalThis.abilityContext.connectServiceExtensionAbility( { bundleName: 'com.acts.actsinterfacemultiusersextensiontest', abilityName: 'com.acts.actsinterfacemultiusersextensiontest.ServiceAbility' @@ -581,7 +581,7 @@ export default function abilityTest() { if (data.event == "ACTS_InterfaceMultiUsers_0100_Start_CommonEvent") { startresult = true } - globalThis.abilityContext.disconnectAbility(globalThis.number).then((data) => { + globalThis.abilityContext.disconnectServiceExtensionAbility(globalThis.number).then((data) => { console.debug("====>data is====>" + JSON.stringify(data)); }) console.log('====>disconnectAbility finish'); @@ -594,7 +594,7 @@ export default function abilityTest() { Subscriber = data; commonEvent.subscribe(Subscriber, SubscribeCallBack); console.debug("====>0900start connectAbility====>"); - globalThis.number = await globalThis.abilityContext.connectAbility( + globalThis.number = await globalThis.abilityContext.connectServiceExtensionAbility( { bundleName: 'com.acts.actsinterfacemultiusersextensiontest', abilityName: 'com.acts.actsinterfacemultiusersextensiontest.ServiceAbility' @@ -642,7 +642,7 @@ export default function abilityTest() { if (data.event == "ACTS_InterfaceMultiUsers_0100_Start_CommonEvent") { startresult = true } - globalThis.abilityContext.disconnectAbility(globalThis.number).then((data) => { + globalThis.abilityContext.disconnectServiceExtensionAbility(globalThis.number).then((data) => { console.debug("====>data is====>" + JSON.stringify(data)); }) console.log('====>disconnectAbility finish'); @@ -655,7 +655,7 @@ export default function abilityTest() { Subscriber = data; commonEvent.subscribe(Subscriber, SubscribeCallBack); console.debug("====>1000start connectAbility====>"); - globalThis.number = await globalThis.abilityContext.connectAbility( + globalThis.number = await globalThis.abilityContext.connectServiceExtensionAbility( { bundleName: 'com.acts.actsinterfacemultiusersextensiontest', abilityName: 'com.acts.actsinterfacemultiusersextensiontest.ServiceAbility' @@ -703,7 +703,7 @@ export default function abilityTest() { if (data.event == "ACTS_TerminateSelf_CommonEvent") { startresult = true } - globalThis.abilityContext.disconnectAbility(globalThis.number).then((data) => { + globalThis.abilityContext.disconnectServiceExtensionAbility(globalThis.number).then((data) => { console.debug("====>data is====>" + JSON.stringify(data)); }) console.log('====>disconnectAbility finish'); @@ -725,7 +725,7 @@ export default function abilityTest() { Subscriber = data; commonEvent.subscribe(Subscriber, SubscribeCallBack); console.debug("====>0100start connectAbility====>"); - globalThis.number = await globalThis.abilityContext.connectAbility( + globalThis.number = await globalThis.abilityContext.connectServiceExtensionAbility( { bundleName: 'com.acts.actsinterfacemultiusersextensiontest', abilityName: 'com.acts.actsinterfacemultiusersextensiontest.ServiceAbility' @@ -783,7 +783,7 @@ export default function abilityTest() { console.debug("====>UnSubscribeCallback====>"); flag = false expect(startresult).assertEqual(false); - globalThis.abilityContext.disconnectAbility(globalThis.number).then((data) => { + globalThis.abilityContext.disconnectServiceExtensionAbility(globalThis.number).then((data) => { console.debug("====>data is====>" + JSON.stringify(data)); }) console.log('====>disconnectAbility finish'); @@ -817,7 +817,7 @@ export default function abilityTest() { Subscriber = data; commonEvent.subscribe(Subscriber, SubscribeCallBack); console.debug("====>0200start connectAbility====>"); - globalThis.number = await globalThis.abilityContext.connectAbility( + globalThis.number = await globalThis.abilityContext.connectServiceExtensionAbility( { bundleName: 'com.acts.actsinterfacemultiusersextensiontest', abilityName: 'com.acts.actsinterfacemultiusersextensiontest.ServiceAbility' @@ -849,7 +849,7 @@ export default function abilityTest() { if (data.event == "ACTS_TerminateSelf_CommonEvent") { startresult = true } - globalThis.abilityContext.disconnectAbility(globalThis.number).then((data) => { + globalThis.abilityContext.disconnectServiceExtensionAbility(globalThis.number).then((data) => { console.debug("====>data is====>" + JSON.stringify(data)); }) console.log('====>disconnectAbility finish'); @@ -862,7 +862,7 @@ export default function abilityTest() { Subscriber = data; commonEvent.subscribe(Subscriber, SubscribeCallBack); console.debug("====>0300start connectAbility====>"); - globalThis.number = await globalThis.abilityContext.connectAbility( + globalThis.number = await globalThis.abilityContext.connectServiceExtensionAbility( { bundleName: 'com.acts.actsinterfacemultiusersextensiontest', abilityName: 'com.acts.actsinterfacemultiusersextensiontest.ServiceAbility' @@ -917,7 +917,7 @@ export default function abilityTest() { console.debug("====>UnSubscribeCallback====>"); flag = false expect(startresult).assertEqual(false); - globalThis.abilityContext.disconnectAbility(globalThis.number).then((data) => { + globalThis.abilityContext.disconnectServiceExtensionAbility(globalThis.number).then((data) => { console.debug("====>data is====>" + JSON.stringify(data)); }) console.log('====>disconnectAbility finish'); @@ -951,7 +951,7 @@ export default function abilityTest() { Subscriber = data; commonEvent.subscribe(Subscriber, SubscribeCallBack); console.debug("====>0400start connectAbility====>"); - globalThis.number = await globalThis.abilityContext.connectAbility( + globalThis.number = await globalThis.abilityContext.connectServiceExtensionAbility( { bundleName: 'com.acts.actsinterfacemultiusersextensiontest', abilityName: 'com.acts.actsinterfacemultiusersextensiontest.ServiceAbility' diff --git a/ability/ability_runtime/actsusers/ActsAmsUsersExtensionThirdTest/entry/src/main/ets/Application/AbilityStage.ts b/ability/ability_runtime/actsusers/ActsAmsUsersExtensionThirdTest/entry/src/main/ets/Application/AbilityStage.ts index 159f48742..bd7db9a9b 100644 --- a/ability/ability_runtime/actsusers/ActsAmsUsersExtensionThirdTest/entry/src/main/ets/Application/AbilityStage.ts +++ b/ability/ability_runtime/actsusers/ActsAmsUsersExtensionThirdTest/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/ActsAmsUsersExtensionThirdTest/entry/src/main/ets/MainAbility/MainAbility.ts b/ability/ability_runtime/actsusers/ActsAmsUsersExtensionThirdTest/entry/src/main/ets/MainAbility/MainAbility.ts index e2707cec8..c6ec554a3 100644 --- a/ability/ability_runtime/actsusers/ActsAmsUsersExtensionThirdTest/entry/src/main/ets/MainAbility/MainAbility.ts +++ b/ability/ability_runtime/actsusers/ActsAmsUsersExtensionThirdTest/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/actsusers/ActsAmsUsersExtensionThirdTest/entry/src/main/ets/MainAbility2/MainAbility2.ts b/ability/ability_runtime/actsusers/ActsAmsUsersExtensionThirdTest/entry/src/main/ets/MainAbility2/MainAbility2.ts index 9623986e8..e190aecbe 100644 --- a/ability/ability_runtime/actsusers/ActsAmsUsersExtensionThirdTest/entry/src/main/ets/MainAbility2/MainAbility2.ts +++ b/ability/ability_runtime/actsusers/ActsAmsUsersExtensionThirdTest/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" export default class MainAbility2 extends Ability { diff --git a/ability/ability_runtime/actsusers/ActsAmsUsersExtensionThirdTest/entry/src/main/ets/TestAbility/TestAbility.ts b/ability/ability_runtime/actsusers/ActsAmsUsersExtensionThirdTest/entry/src/main/ets/TestAbility/TestAbility.ts index e9f9aadff..4f101c99c 100644 --- a/ability/ability_runtime/actsusers/ActsAmsUsersExtensionThirdTest/entry/src/main/ets/TestAbility/TestAbility.ts +++ b/ability/ability_runtime/actsusers/ActsAmsUsersExtensionThirdTest/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/actsusers/ActsAmsUsersExtensionThirdTest/entry/src/main/ets/test/Ability.test.ets b/ability/ability_runtime/actsusers/ActsAmsUsersExtensionThirdTest/entry/src/main/ets/test/Ability.test.ets index 044a87d36..8d2b2242e 100644 --- a/ability/ability_runtime/actsusers/ActsAmsUsersExtensionThirdTest/entry/src/main/ets/test/Ability.test.ets +++ b/ability/ability_runtime/actsusers/ActsAmsUsersExtensionThirdTest/entry/src/main/ets/test/Ability.test.ets @@ -48,7 +48,7 @@ export default function abilityTest() { if(data.event == "ACTS_InterfaceMultiUsersExtension_CommonEvent"){ startresult = true } - globalThis.abilityContext.disconnectAbility(globalThis.number).then((data)=>{ + globalThis.abilityContext.disconnectServiceExtensionAbility(globalThis.number).then((data)=>{ console.debug("====>data is====>" + JSON.stringify(data)); }) console.log('====>disconnectAbility finish'); @@ -61,7 +61,7 @@ export default function abilityTest() { Subscriber = data; commonEvent.subscribe(Subscriber, SubscribeCallBack); console.debug("====>0100start connectAbility====>"); - globalThis.number = await globalThis.abilityContext.connectAbility( + globalThis.number = await globalThis.abilityContext.connectServiceExtensionAbility( { bundleName: 'com.acts.actsinterfacemultiusersextensionthirdtest', abilityName: 'com.acts.actsinterfacemultiusersextensionthirdtest.ServiceAbility' @@ -115,7 +115,7 @@ export default function abilityTest() { console.debug("====>UnSubscribeCallback====>"); flag = false expect(startresult).assertEqual(false); - globalThis.abilityContext.disconnectAbility(globalThis.number).then((data)=>{ + globalThis.abilityContext.disconnectServiceExtensionAbility(globalThis.number).then((data)=>{ console.debug("====>data is====>" + JSON.stringify(data)); }) console.log('====>disconnectAbility finish'); @@ -149,7 +149,7 @@ export default function abilityTest() { Subscriber = data; commonEvent.subscribe(Subscriber, SubscribeCallBack); console.debug("====>0200start connectAbility====>"); - globalThis.number = await globalThis.abilityContext.connectAbility( + globalThis.number = await globalThis.abilityContext.connectServiceExtensionAbility( { bundleName: 'com.acts.actsinterfacemultiusersextensionthirdtest', abilityName: 'com.acts.actsinterfacemultiusersextensionthirdtest.ServiceAbility' @@ -180,7 +180,7 @@ export default function abilityTest() { if(data.event == "ACTS_InterfaceMultiUsersExtension_CommonEvent"){ startresult = true } - globalThis.abilityContext.disconnectAbility(globalThis.number).then((data)=>{ + globalThis.abilityContext.disconnectServiceExtensionAbility(globalThis.number).then((data)=>{ console.debug("====>data is====>" + JSON.stringify(data)); }) console.log('====>disconnectAbility finish'); @@ -193,7 +193,7 @@ export default function abilityTest() { Subscriber = data; commonEvent.subscribe(Subscriber, SubscribeCallBack); console.debug("====>0300start connectAbility====>"); - globalThis.number = await globalThis.abilityContext.connectAbility( + globalThis.number = await globalThis.abilityContext.connectServiceExtensionAbility( { bundleName: 'com.acts.actsinterfacemultiusersextensionthirdtest', abilityName: 'com.acts.actsinterfacemultiusersextensionthirdtest.ServiceAbility' @@ -247,7 +247,7 @@ export default function abilityTest() { console.debug("====>UnSubscribeCallback====>"); flag = false expect(startresult).assertEqual(false); - globalThis.abilityContext.disconnectAbility(globalThis.number).then((data)=>{ + globalThis.abilityContext.disconnectServiceExtensionAbility(globalThis.number).then((data)=>{ console.debug("====>data is====>" + JSON.stringify(data)); }) console.log('====>disconnectAbility finish'); @@ -281,7 +281,7 @@ export default function abilityTest() { Subscriber = data; commonEvent.subscribe(Subscriber, SubscribeCallBack); console.debug("====>0400start connectAbility====>"); - globalThis.number = await globalThis.abilityContext.connectAbility( + globalThis.number = await globalThis.abilityContext.connectServiceExtensionAbility( { bundleName: 'com.acts.actsinterfacemultiusersextensionthirdtest', abilityName: 'com.acts.actsinterfacemultiusersextensionthirdtest.ServiceAbility' @@ -313,7 +313,7 @@ export default function abilityTest() { if(data.event == "ACTS_InterfaceMultiUsersExtension_CommonEvent"){ startresult = true } - globalThis.abilityContext.disconnectAbility(globalThis.number).then((data)=>{ + globalThis.abilityContext.disconnectServiceExtensionAbility(globalThis.number).then((data)=>{ console.debug("====>data is====>" + JSON.stringify(data)); }) console.log('====>disconnectAbility finish'); @@ -326,7 +326,7 @@ export default function abilityTest() { Subscriber = data; commonEvent.subscribe(Subscriber, SubscribeCallBack); console.debug("====>0500start connectAbility====>"); - globalThis.number = await globalThis.abilityContext.connectAbility( + globalThis.number = await globalThis.abilityContext.connectServiceExtensionAbility( { bundleName: 'com.acts.actsinterfacemultiusersextensionthirdtest', abilityName: 'com.acts.actsinterfacemultiusersextensionthirdtest.ServiceAbility' @@ -380,7 +380,7 @@ export default function abilityTest() { console.debug("====>UnSubscribeCallback====>"); flag = false expect(startresult).assertEqual(false); - globalThis.abilityContext.disconnectAbility(globalThis.number).then((data)=>{ + globalThis.abilityContext.disconnectServiceExtensionAbility(globalThis.number).then((data)=>{ console.debug("====>data is====>" + JSON.stringify(data)); }) console.log('====>disconnectAbility finish'); @@ -414,7 +414,7 @@ export default function abilityTest() { Subscriber = data; commonEvent.subscribe(Subscriber, SubscribeCallBack); console.debug("====>0600start connectAbility====>"); - globalThis.number = await globalThis.abilityContext.connectAbility( + globalThis.number = await globalThis.abilityContext.connectServiceExtensionAbility( { bundleName: 'com.acts.actsinterfacemultiusersextensionthirdtest', abilityName: 'com.acts.actsinterfacemultiusersextensionthirdtest.ServiceAbility' @@ -445,7 +445,7 @@ export default function abilityTest() { if(data.event == "ACTS_InterfaceMultiUsersExtension_CommonEvent"){ startresult = true } - globalThis.abilityContext.disconnectAbility(globalThis.number).then((data)=>{ + globalThis.abilityContext.disconnectServiceExtensionAbility(globalThis.number).then((data)=>{ console.debug("====>data is====>" + JSON.stringify(data)); }) console.log('====>disconnectAbility finish'); @@ -458,7 +458,7 @@ export default function abilityTest() { Subscriber = data; commonEvent.subscribe(Subscriber, SubscribeCallBack); console.debug("====>0700start connectAbility====>"); - globalThis.number = await globalThis.abilityContext.connectAbility( + globalThis.number = await globalThis.abilityContext.connectServiceExtensionAbility( { bundleName: 'com.acts.actsinterfacemultiusersextensionthirdtest', abilityName: 'com.acts.actsinterfacemultiusersextensionthirdtest.ServiceAbility' @@ -513,7 +513,7 @@ export default function abilityTest() { console.debug("====>UnSubscribeCallback====>"); flag = false expect(startresult).assertEqual(false); - globalThis.abilityContext.disconnectAbility(globalThis.number).then((data)=>{ + globalThis.abilityContext.disconnectServiceExtensionAbility(globalThis.number).then((data)=>{ console.debug("====>data is====>" + JSON.stringify(data)); }) console.log('====>disconnectAbility finish'); @@ -547,7 +547,7 @@ export default function abilityTest() { Subscriber = data; commonEvent.subscribe(Subscriber, SubscribeCallBack); console.debug("====>0800start connectAbility====>"); - globalThis.number = await globalThis.abilityContext.connectAbility( + globalThis.number = await globalThis.abilityContext.connectServiceExtensionAbility( { bundleName: 'com.acts.actsinterfacemultiusersextensionthirdtest', abilityName: 'com.acts.actsinterfacemultiusersextensionthirdtest.ServiceAbility' @@ -577,7 +577,7 @@ export default function abilityTest() { if(data.event == "ACTS_TerminateSelf_CommonEvent"){ startresult = true } - globalThis.abilityContext.disconnectAbility(globalThis.number).then((data)=>{ + globalThis.abilityContext.disconnectServiceExtensionAbility(globalThis.number).then((data)=>{ console.debug("====>data is====>" + JSON.stringify(data)); }) console.log('====>disconnectAbility finish'); @@ -590,7 +590,7 @@ export default function abilityTest() { Subscriber = data; commonEvent.subscribe(Subscriber, SubscribeCallBack); console.debug("====>0100start connectAbility====>"); - globalThis.number = await globalThis.abilityContext.connectAbility( + globalThis.number = await globalThis.abilityContext.connectServiceExtensionAbility( { bundleName: 'com.acts.actsinterfacemultiusersextensionthirdtest', abilityName: 'com.acts.actsinterfacemultiusersextensionthirdtest.ServiceAbility' @@ -643,7 +643,7 @@ export default function abilityTest() { console.debug("====>UnSubscribeCallback====>"); flag = false expect(startresult).assertEqual(false); - globalThis.abilityContext.disconnectAbility(globalThis.number).then((data)=>{ + globalThis.abilityContext.disconnectServiceExtensionAbility(globalThis.number).then((data)=>{ console.debug("====>data is====>" + JSON.stringify(data)); }) console.log('====>disconnectAbility finish'); @@ -677,7 +677,7 @@ export default function abilityTest() { Subscriber = data; commonEvent.subscribe(Subscriber, SubscribeCallBack); console.debug("====>0200start connectAbility====>"); - globalThis.number = await globalThis.abilityContext.connectAbility( + globalThis.number = await globalThis.abilityContext.connectServiceExtensionAbility( { bundleName: 'com.acts.actsinterfacemultiusersextensionthirdtest', abilityName: 'com.acts.actsinterfacemultiusersextensionthirdtest.ServiceAbility' @@ -708,7 +708,7 @@ export default function abilityTest() { if(data.event == "ACTS_TerminateSelf_CommonEvent"){ startresult = true } - globalThis.abilityContext.disconnectAbility(globalThis.number).then((data)=>{ + globalThis.abilityContext.disconnectServiceExtensionAbility(globalThis.number).then((data)=>{ console.debug("====>data is====>" + JSON.stringify(data)); }) console.log('====>disconnectAbility finish'); @@ -721,7 +721,7 @@ export default function abilityTest() { Subscriber = data; commonEvent.subscribe(Subscriber, SubscribeCallBack); console.debug("====>0300start connectAbility====>"); - globalThis.number = await globalThis.abilityContext.connectAbility( + globalThis.number = await globalThis.abilityContext.connectServiceExtensionAbility( { bundleName: 'com.acts.actsinterfacemultiusersextensionthirdtest', abilityName: 'com.acts.actsinterfacemultiusersextensionthirdtest.ServiceAbility' @@ -775,7 +775,7 @@ export default function abilityTest() { console.debug("====>UnSubscribeCallback====>"); flag = false expect(startresult).assertEqual(false); - globalThis.abilityContext.disconnectAbility(globalThis.number).then((data)=>{ + globalThis.abilityContext.disconnectServiceExtensionAbility(globalThis.number).then((data)=>{ console.debug("====>data is====>" + JSON.stringify(data)); }) console.log('====>disconnectAbility finish'); @@ -811,7 +811,7 @@ export default function abilityTest() { Subscriber = data; commonEvent.subscribe(Subscriber, SubscribeCallBack); console.debug("====>0400start connectAbility====>"); - globalThis.number = await globalThis.abilityContext.connectAbility( + globalThis.number = await globalThis.abilityContext.connectServiceExtensionAbility( { bundleName: 'com.acts.actsinterfacemultiusersextensionthirdtest', abilityName: 'com.acts.actsinterfacemultiusersextensionthirdtest.ServiceAbility' 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 98eb012db..a41751fb1 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 c4fe28ae1..317977671 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 98eb012db..a41751fb1 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 c3d2af559..600828f3a 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 98eb012db..a41751fb1 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 3eaadf9ce..6f077e452 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 5e2915fe4..953114c1b 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 5d9cb94eb..5e7a70c58 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 819778e4a..f9adf1ea4 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 7d1f0f3d2..68e8d62a8 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 5e2915fe4..953114c1b 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 28be9d6cd..78ccdb3df 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 e66016096..690f0fbff 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 be068fab9..7aa859733 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 e9f9aadff..4f101c99c 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/actsusers/actsconnectabilitysystemabilitytest/entry/src/main/ets/Application/AbilityStage.ts b/ability/ability_runtime/actsusers/actsconnectabilitysystemabilitytest/entry/src/main/ets/Application/AbilityStage.ts index 159f48742..bd7db9a9b 100644 --- a/ability/ability_runtime/actsusers/actsconnectabilitysystemabilitytest/entry/src/main/ets/Application/AbilityStage.ts +++ b/ability/ability_runtime/actsusers/actsconnectabilitysystemabilitytest/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/actsconnectabilitysystemabilitytest/entry/src/main/ets/MainAbility/MainAbility.ts b/ability/ability_runtime/actsusers/actsconnectabilitysystemabilitytest/entry/src/main/ets/MainAbility/MainAbility.ts index 7f32c4093..9d3458840 100644 --- a/ability/ability_runtime/actsusers/actsconnectabilitysystemabilitytest/entry/src/main/ets/MainAbility/MainAbility.ts +++ b/ability/ability_runtime/actsusers/actsconnectabilitysystemabilitytest/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/actsconnectabilitysystemabilitytest/entry/src/main/ets/TestAbility/TestAbility.ts b/ability/ability_runtime/actsusers/actsconnectabilitysystemabilitytest/entry/src/main/ets/TestAbility/TestAbility.ts index e9f9aadff..4f101c99c 100644 --- a/ability/ability_runtime/actsusers/actsconnectabilitysystemabilitytest/entry/src/main/ets/TestAbility/TestAbility.ts +++ b/ability/ability_runtime/actsusers/actsconnectabilitysystemabilitytest/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/actsusers/actsconnectabilitysystemabilitytest/entry/src/main/ets/test/manyusersabilitytest.test.ets b/ability/ability_runtime/actsusers/actsconnectabilitysystemabilitytest/entry/src/main/ets/test/manyusersabilitytest.test.ets index 6da29857f..7a2c4a0a5 100644 --- a/ability/ability_runtime/actsusers/actsconnectabilitysystemabilitytest/entry/src/main/ets/test/manyusersabilitytest.test.ets +++ b/ability/ability_runtime/actsusers/actsconnectabilitysystemabilitytest/entry/src/main/ets/test/manyusersabilitytest.test.ets @@ -186,7 +186,7 @@ export default function abilityTest() { commonEvent.unsubscribe(subscriber, unSubscribeCallback) } id = setTimeout(timeout, START_ABILITY_TIMEOUT); - connId = await globalThis.abilityContext.connectAbility( + connId = await globalThis.abilityContext.connectServiceExtensionAbility( { bundleName: "com.example.actsconnectabilitysystemabilitytest", abilityName: "com.example.actsconnectabilitysystemabilitytest.ServiceAbilityone", @@ -214,7 +214,7 @@ export default function abilityTest() { console.debug("====>ACTS_DisconnectAbility_0100 5 CallBack data:====>" + JSON.stringify(data)); clearTimeout(id); console.debug("====>ACTS_DisconnectAbility_0100 6====>"); - globalThis.abilityContext.disconnectAbility( + globalThis.abilityContext.disconnectServiceExtensionAbility( connId, (error, data) => { console.log('featureAbilityTest DisconnectAbility result errCode : ' + error.code + " data: " + data) @@ -238,7 +238,7 @@ export default function abilityTest() { expect().assertFail(); console.debug('AMS_DonnectAbility_0300 timeout'); commonEvent.unsubscribe(subscriber, unSubscribeCallback) - globalThis.abilityContext.disconnectAbility( + globalThis.abilityContext.disconnectServiceExtensionAbility( connId, (error, data) => { console.log('featureAbilityTest DisconnectAbility result errCode : ' + error.code + " data: " + data) @@ -246,7 +246,7 @@ export default function abilityTest() { } id = setTimeout(timeout, START_ABILITY_TIMEOUT); console.debug("====>ACTS_DisconnectAbility_0100 3====>"); - connId = await globalThis.abilityContext.connectAbility( + connId = await globalThis.abilityContext.connectServiceExtensionAbility( { bundleName: "com.example.actsconnectabilitysystemabilitytest", abilityName: "com.example.actsconnectabilitysystemabilitytest.ServiceAbility", @@ -280,7 +280,7 @@ export default function abilityTest() { console.debug("====>ACTS_DisconnectAbility_0200 1111 connectAbility2====>"); console.debug("====>ACTS_DisconnectAbility_0200 66 Subscriber====>"); - globalThis.abilityContext.disconnectAbility( + globalThis.abilityContext.disconnectServiceExtensionAbility( 999, (error, data) => { console.log('ACTS_DisconnectAbility_0200 5 DisconnectAbility result errCode : ' @@ -306,7 +306,7 @@ export default function abilityTest() { console.debug('unsubscribe subscriberdisconnect'); commonEvent.unsubscribe(subscriber, () => { console.debug('unsubscribe subscriber') - globalThis.abilityContext.disconnectAbility( + globalThis.abilityContext.disconnectServiceExtensionAbility( connId, (error, data) => { console.log('ACTS_DisconnectAbility_0200 9 DisconnectAbility result errCode : ' @@ -323,7 +323,7 @@ export default function abilityTest() { console.debug("====>ACTS_DisconnectAbility_0200 10 Subscriber====>"); subscriber = data; await commonEvent.subscribe(subscriber, subscribeCallBack) - connId = await globalThis.abilityContext.connectAbility( + connId = await globalThis.abilityContext.connectServiceExtensionAbility( { bundleName: "com.example.actsconnectabilitysystemabilitytest", abilityName: "com.example.actsconnectabilitysystemabilitytest.ServiceAbility", @@ -355,7 +355,7 @@ export default function abilityTest() { console.debug("====>ACTS_DisconnectAbility_0300 4 CallBack data:====>" + JSON.stringify(data)); clearTimeout(id); expect(data.event).assertEqual("AMS_ConnectAbility_0500_commonEvent"); - globalThis.abilityContext.disconnectAbility( + globalThis.abilityContext.disconnectServiceExtensionAbility( connId, (error, data) => { console.log('ACTS_DisconnectAbility_0300 5 DisconnectAbility result errCode : ' @@ -379,7 +379,7 @@ export default function abilityTest() { expect().assertFail(); console.debug('AMS_ConnectAbility_0500 timeout'); commonEvent.unsubscribe(subscriber, unSubscribeCallback) - globalThis.abilityContext.disconnectAbility( + globalThis.abilityContext.disconnectServiceExtensionAbility( connId, (error, data) => { console.log('ACTS_DisconnectAbility_0300 7 DisconnectAbility result errCode : ' @@ -388,7 +388,7 @@ export default function abilityTest() { } id = setTimeout(timeout, START_ABILITY_TIMEOUT); console.debug("====>ACTS_DisconnectAbility_0300 3 "); - connId = await globalThis.abilityContext.connectAbility( + connId = await globalThis.abilityContext.connectServiceExtensionAbility( { bundleName: "com.example.actsconnectabilitysystemabilitytest", abilityName: "com.example.actsconnectabilitysystemabilitytest.ServiceAbility", @@ -422,7 +422,7 @@ export default function abilityTest() { console.debug("====>ACTS_DisconnectAbility_0400 1111 connectAbility2====>"); console.debug("====>ACTS_DisconnectAbility_0400 66 Subscriber====>"); - globalThis.abilityContext.disconnectAbility( + globalThis.abilityContext.disconnectServiceExtensionAbility( 999, (error, data) => { console.log('ACTS_DisconnectAbility_0400 5 DisconnectAbility result errCode : ' @@ -448,7 +448,7 @@ export default function abilityTest() { console.debug('unsubscribe subscriberdisconnect'); commonEvent.unsubscribe(subscriber, () => { console.debug('unsubscribe subscriber') - globalThis.abilityContext.disconnectAbility( + globalThis.abilityContext.disconnectServiceExtensionAbility( connId, (error, data) => { console.log('ACTS_DisconnectAbility_0400 9 DisconnectAbility result errCode : ' @@ -465,7 +465,7 @@ export default function abilityTest() { console.debug("====>ACTS_DisconnectAbility_0400 10 Subscriber====>"); subscriber = data; await commonEvent.subscribe(subscriber, subscribeCallBack) - connId = await globalThis.abilityContext.connectAbility( + connId = await globalThis.abilityContext.connectServiceExtensionAbility( { bundleName: "com.example.actsconnectabilitysystemabilitytest", abilityName: "com.example.actsconnectabilitysystemabilitytest.ServiceAbility", @@ -498,7 +498,7 @@ export default function abilityTest() { clearTimeout(id); expect(data.event).assertEqual("AMS_ConnectAbility_0700_commonEvent"); console.debug("====>ACTS_ExtensionConnectAbility_0100 5 "); - globalThis.abilityContext.disconnectAbility( + globalThis.abilityContext.disconnectServiceExtensionAbility( connId, (error, data) => { console.log('featureAbilityTest DisconnectAbility result errCode : ' + error.code + " data: " + data) @@ -522,7 +522,7 @@ export default function abilityTest() { expect().assertFail(); console.debug('ACTS_ExtensionConnectAbility_0100 timeout'); commonEvent.unsubscribe(subscriber, unSubscribeCallback) - globalThis.abilityContext.disconnectAbility( + globalThis.abilityContext.disconnectServiceExtensionAbility( connId, (error, data) => { console.log('featureAbilityTest DisconnectAbility result errCode : ' + error.code + " data: " + data) @@ -530,7 +530,7 @@ export default function abilityTest() { } id = setTimeout(timeout, START_ABILITY_TIMEOUT); console.debug("====>ACTS_ExtensionConnectAbility_0100 3 "); - connId = await globalThis.abilityContext.connectAbility( + connId = await globalThis.abilityContext.connectServiceExtensionAbility( { bundleName: "com.example.actsconnectabilitysystemabilitytest", abilityName: "com.example.actsconnectabilitysystemabilitytest.ServiceAbility", @@ -557,7 +557,7 @@ export default function abilityTest() { clearTimeout(id); expect(data.event).assertEqual("AMS_ConnectAbility_0800_commonEvent"); console.debug("====>ACTS_ExtensionConnectAbility_0200 5 "); - globalThis.abilityContext.disconnectAbility( + globalThis.abilityContext.disconnectServiceExtensionAbility( connId, (error, data) => { console.log('featureAbilityTest DisconnectAbility result errCode : ' + error.code + " data: " + data) @@ -580,7 +580,7 @@ export default function abilityTest() { function timeout() { console.debug('ACTS_ExtensionConnectAbility_0200 timeout'); commonEvent.unsubscribe(subscriber, unSubscribeCallback) - globalThis.abilityContext.disconnectAbility( + globalThis.abilityContext.disconnectServiceExtensionAbility( connId, (error, data) => { console.log('featureAbilityTest DisconnectAbility result errCode : ' + error.code + " data: " + data) @@ -588,7 +588,7 @@ export default function abilityTest() { } id = setTimeout(timeout, START_ABILITY_TIMEOUT); console.debug("====>ACTS_ExtensionConnectAbility_0200 3 "); - connId = await globalThis.abilityContext.connectAbility( + connId = await globalThis.abilityContext.connectServiceExtensionAbility( { bundleName: "com.example.actsconnectabilitysystemabilitytest", abilityName: "com.example.actsconnectabilitysystemabilitytest.ServiceAbility", @@ -615,7 +615,7 @@ export default function abilityTest() { clearTimeout(id); expect(data.event).assertEqual("AMS_ConnectAbility_0900_commonEvent"); console.debug("====>ACTS_ExtensionDisconnectAbility_0100 5 "); - globalThis.abilityContext.disconnectAbility( + globalThis.abilityContext.disconnectServiceExtensionAbility( connId, (error, data) => { console.log('featureAbilityTest DisconnectAbility result errCode : ' + error.code + " data: " + data) @@ -639,7 +639,7 @@ export default function abilityTest() { expect().assertFail(); console.debug('ACTS_ExtensionDisconnectAbility_0100 timeout'); commonEvent.unsubscribe(subscriber, unSubscribeCallback) - globalThis.abilityContext.disconnectAbility( + globalThis.abilityContext.disconnectServiceExtensionAbility( connId, (error, data) => { console.log('featureAbilityTest DisconnectAbility result errCode : ' + error.code + " data: " + data) @@ -647,7 +647,7 @@ export default function abilityTest() { } id = setTimeout(timeout, START_ABILITY_TIMEOUT); console.debug("====>ACTS_ExtensionDisconnectAbility_0100 3 "); - connId = await globalThis.abilityContext.connectAbility( + connId = await globalThis.abilityContext.connectServiceExtensionAbility( { bundleName: "com.example.actsconnectabilitysystemabilitytest", abilityName: "com.example.actsconnectabilitysystemabilitytest.ServiceAbility", @@ -674,7 +674,7 @@ export default function abilityTest() { clearTimeout(id); expect(data.event).assertEqual("AMS_ConnectAbility_1000_commonEvent"); console.debug("====>ACTS_ExtensionDisconnectAbility_0200 5 "); - globalThis.abilityContext.disconnectAbility( + globalThis.abilityContext.disconnectServiceExtensionAbility( connId, (error, data) => { console.log('featureAbilityTest DisconnectAbility result errCode : ' + error.code + " data: " + data) @@ -698,7 +698,7 @@ export default function abilityTest() { expect().assertFail(); console.debug('ACTS_ExtensionDisconnectAbility_0200 timeout'); commonEvent.unsubscribe(subscriber, unSubscribeCallback) - globalThis.abilityContext.disconnectAbility( + globalThis.abilityContext.disconnectServiceExtensionAbility( connId, (error, data) => { console.log('featureAbilityTest DisconnectAbility result errCode : ' + error.code + " data: " + data) @@ -706,7 +706,7 @@ export default function abilityTest() { } id = setTimeout(timeout, START_ABILITY_TIMEOUT); console.debug("====>ACTS_ExtensionDisconnectAbility_0200 3 "); - connId = await globalThis.abilityContext.connectAbility( + connId = await globalThis.abilityContext.connectServiceExtensionAbility( { bundleName: "com.example.actsconnectabilitysystemabilitytest", abilityName: "com.example.actsconnectabilitysystemabilitytest.ServiceAbility", @@ -733,7 +733,7 @@ export default function abilityTest() { clearTimeout(id); expect(data.event).assertEqual("AMS_ConnectAbility_1100_commonEvent"); console.debug("====>ACTS_ExtensionDisconnectAbility_0300 5 "); - globalThis.abilityContext.disconnectAbility( + globalThis.abilityContext.disconnectServiceExtensionAbility( connId, (error, data) => { console.log('featureAbilityTest DisconnectAbility result errCode : ' + error.code + " data: " + data) @@ -756,7 +756,7 @@ export default function abilityTest() { function timeout() { console.debug('ACTS_ExtensionDisconnectAbility_0300 timeout'); commonEvent.unsubscribe(subscriber, unSubscribeCallback) - globalThis.abilityContext.disconnectAbility( + globalThis.abilityContext.disconnectServiceExtensionAbility( connId, (error, data) => { console.log('featureAbilityTest DisconnectAbility result errCode : ' + error.code + " data: " + data) @@ -764,7 +764,7 @@ export default function abilityTest() { } id = setTimeout(timeout, START_ABILITY_TIMEOUT); console.debug("====>ACTS_ExtensionDisconnectAbility_0300 3 "); - connId = await globalThis.abilityContext.connectAbility( + connId = await globalThis.abilityContext.connectServiceExtensionAbility( { bundleName: "com.example.actsconnectabilitysystemabilitytest", abilityName: "com.example.actsconnectabilitysystemabilitytest.ServiceAbility", @@ -792,7 +792,7 @@ export default function abilityTest() { clearTimeout(id); expect(data.event).assertEqual("AMS_ConnectAbility_1200_commonEvent"); console.debug("====>ACTS_ExtensionDisconnectAbility_0400 5 "); - globalThis.abilityContext.disconnectAbility( + globalThis.abilityContext.disconnectServiceExtensionAbility( connId, (error, data) => { console.log('featureAbilityTest DisconnectAbility result errCode : ' + error.code + " data: " + data) @@ -815,7 +815,7 @@ export default function abilityTest() { function timeout() { console.debug('ACTS_ExtensionDisconnectAbility_0400 timeout'); commonEvent.unsubscribe(subscriber, unSubscribeCallback) - globalThis.abilityContext.disconnectAbility( + globalThis.abilityContext.disconnectServiceExtensionAbility( connId, (error, data) => { console.log('featureAbilityTest DisconnectAbility result errCode : ' + error.code + " data: " + data) @@ -823,7 +823,7 @@ export default function abilityTest() { } id = setTimeout(timeout, START_ABILITY_TIMEOUT); console.debug("====>ACTS_ExtensionDisconnectAbility_0400 3 "); - connId = await globalThis.abilityContext.connectAbility( + connId = await globalThis.abilityContext.connectServiceExtensionAbility( { bundleName: "com.example.actsconnectabilitysystemabilitytest", abilityName: "com.example.actsconnectabilitysystemabilitytest.ServiceAbility", diff --git a/ability/ability_runtime/actsusers/actsmanyuserthirdabilitytest/entry/src/main/ets/Application/AbilityStage.ts b/ability/ability_runtime/actsusers/actsmanyuserthirdabilitytest/entry/src/main/ets/Application/AbilityStage.ts index 98eb012db..a41751fb1 100644 --- a/ability/ability_runtime/actsusers/actsmanyuserthirdabilitytest/entry/src/main/ets/Application/AbilityStage.ts +++ b/ability/ability_runtime/actsusers/actsmanyuserthirdabilitytest/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/actsmanyuserthirdabilitytest/entry/src/main/ets/MainAbility/MainAbility.ts b/ability/ability_runtime/actsusers/actsmanyuserthirdabilitytest/entry/src/main/ets/MainAbility/MainAbility.ts index 91d5813ab..a26dc732d 100644 --- a/ability/ability_runtime/actsusers/actsmanyuserthirdabilitytest/entry/src/main/ets/MainAbility/MainAbility.ts +++ b/ability/ability_runtime/actsusers/actsmanyuserthirdabilitytest/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/actsmanyuserthirdabilitytest/entry/src/main/ets/TestAbility/TestAbility.ts b/ability/ability_runtime/actsusers/actsmanyuserthirdabilitytest/entry/src/main/ets/TestAbility/TestAbility.ts index e9f9aadff..4f101c99c 100644 --- a/ability/ability_runtime/actsusers/actsmanyuserthirdabilitytest/entry/src/main/ets/TestAbility/TestAbility.ts +++ b/ability/ability_runtime/actsusers/actsmanyuserthirdabilitytest/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/actsusers/actsmanyuserthirdabilitytest/entry/src/main/ets/test/manyusersabilitytest.test.ets b/ability/ability_runtime/actsusers/actsmanyuserthirdabilitytest/entry/src/main/ets/test/manyusersabilitytest.test.ets index e1ebf0fc3..7614ed74e 100644 --- a/ability/ability_runtime/actsusers/actsmanyuserthirdabilitytest/entry/src/main/ets/test/manyusersabilitytest.test.ets +++ b/ability/ability_runtime/actsusers/actsmanyuserthirdabilitytest/entry/src/main/ets/test/manyusersabilitytest.test.ets @@ -111,7 +111,7 @@ export default function abilityTest() { clearTimeout(id); expect(data.event).assertEqual("AMS_ConnectAbility_0100_commonEvent"); console.debug("====>ACTS_ThirdPartyConnectAbility_0100 5 "); - globalThis.abilityContext.disconnectAbility( + globalThis.abilityContext.disconnectServiceExtensionAbility( connId, (error, data) => { console.log('featureAbilityTest DisconnectAbility result errCode : ' + error.code + " data: " + data) @@ -136,7 +136,7 @@ export default function abilityTest() { expect().assertFail(); console.debug('ACTS_ThirdPartyConnectAbility_0100 timeout'); commonEvent.unsubscribe(subscriber, unSubscribeCallback) - globalThis.abilityContext.disconnectAbility( + globalThis.abilityContext.disconnectServiceExtensionAbility( connId, (error, data) => { console.log('featureAbilityTest DisconnectAbility result errCode : ' + error.code + " data: " + data) @@ -145,7 +145,7 @@ export default function abilityTest() { id = setTimeout(timeout, START_ABILITY_TIMEOUT); console.debug("====>ACTS_ThirdPartyConnectAbility_0100 3 "); - connId = await globalThis.abilityContext.connectAbility( + connId = await globalThis.abilityContext.connectServiceExtensionAbility( { bundleName: "com.example.actsmanyusersabilitytest", abilityName: "com.example.actsmanyusersabilitytest.ServiceAbility", @@ -197,7 +197,7 @@ export default function abilityTest() { } id = setTimeout(timeout, START_ABILITY_TIMEOUT); - connId = await globalThis.abilityContext.connectAbility( + connId = await globalThis.abilityContext.connectServiceExtensionAbility( { bundleName: "com.example.actsmanyusersabilitytest", abilityName: "com.example.actsmanyusersabilitytest.ServiceAbilityone", @@ -221,7 +221,7 @@ export default function abilityTest() { console.debug("====>ACTS_ThirdPartyDisconnectAbility_0100 5 CallBack data:====>" + JSON.stringify(data)); clearTimeout(id); console.debug("====>ACTS_ThirdPartyDisconnectAbility_0100 6====>"); - globalThis.abilityContext.disconnectAbility( + globalThis.abilityContext.disconnectServiceExtensionAbility( connId, (error, data) => { console.log('featureAbilityTest DisconnectAbility result errCode : ' + error.code + " data: " + data) @@ -250,7 +250,7 @@ export default function abilityTest() { expect().assertFail(); console.debug('AMS_DonnectAbility_0300 timeout'); commonEvent.unsubscribe(subscriber, unSubscribeCallback) - globalThis.abilityContext.disconnectAbility( + globalThis.abilityContext.disconnectServiceExtensionAbility( connId, (error, data) => { console.log('featureAbilityTest DisconnectAbility result errCode : ' + error.code + " data: " + data) @@ -259,7 +259,7 @@ export default function abilityTest() { id = setTimeout(timeout, START_ABILITY_TIMEOUT); console.debug("====>ACTS_ThirdPartyDisconnectAbility_0100 3====>"); - connId = await globalThis.abilityContext.connectAbility( + connId = await globalThis.abilityContext.connectServiceExtensionAbility( { bundleName: "com.example.actsmanyusersabilitytest", abilityName: "com.example.actsmanyusersabilitytest.ServiceAbility", @@ -292,7 +292,7 @@ export default function abilityTest() { console.debug("====>ACTS_ThirdPartyDisconnectAbility_0200 1111 connectAbility2====>"); console.debug("====>ACTS_ThirdPartyDisconnectAbility_0200 66 Subscriber====>"); - globalThis.abilityContext.disconnectAbility( + globalThis.abilityContext.disconnectServiceExtensionAbility( 999, (error, data) => { console.log('ACTS_ThirdPartyDisconnectAbility_0200 5 DisconnectAbility result errCode : ' + error.code + " data: " + data) @@ -320,7 +320,7 @@ export default function abilityTest() { console.debug('unsubscribe subscriberdisconnect'); commonEvent.unsubscribe(subscriber, () => { console.debug('unsubscribe subscriber') - globalThis.abilityContext.disconnectAbility( + globalThis.abilityContext.disconnectServiceExtensionAbility( connId, (error, data) => { console.log('ACTS_ThirdPartyDisconnectAbility_0200 9 DisconnectAbility result errCode : ' + error.code + " data: " + data) @@ -339,7 +339,7 @@ export default function abilityTest() { console.debug("====>ACTS_ThirdPartyDisconnectAbility_0200 10 Subscriber====>"); subscriber = data; await commonEvent.subscribe(subscriber, subscribeCallBack) - connId = await globalThis.abilityContext.connectAbility( + connId = await globalThis.abilityContext.connectServiceExtensionAbility( { bundleName: "com.example.actsmanyusersabilitytest", abilityName: "com.example.actsmanyusersabilitytest.ServiceAbility", @@ -374,7 +374,7 @@ export default function abilityTest() { console.debug("====>ACTS_ThirdPartyDisconnectAbility_0300 4 CallBack data:====>" + JSON.stringify(data)); clearTimeout(id); expect(data.event).assertEqual("AMS_ConnectAbility_0500_commonEvent"); - globalThis.abilityContext.disconnectAbility( + globalThis.abilityContext.disconnectServiceExtensionAbility( connId, (error, data) => { console.log('ACTS_ThirdPartyDisconnectAbility_0300 5 DisconnectAbility result errCode : ' + error.code + " data: " + data) @@ -402,7 +402,7 @@ export default function abilityTest() { expect().assertFail(); console.debug('ACTS_ThirdPartyDisconnectAbility_0300 timeout'); commonEvent.unsubscribe(subscriber, unSubscribeCallback) - globalThis.abilityContext.disconnectAbility( + globalThis.abilityContext.disconnectServiceExtensionAbility( connId, (error, data) => { console.log('ACTS_ThirdPartyDisconnectAbility_0300 7 DisconnectAbility result errCode : ' + error.code + " data: " + data) @@ -411,7 +411,7 @@ export default function abilityTest() { id = setTimeout(timeout, START_ABILITY_TIMEOUT); console.debug("====>ACTS_ThirdPartyDisconnectAbility_0300 3 "); - connId = await globalThis.abilityContext.connectAbility( + connId = await globalThis.abilityContext.connectServiceExtensionAbility( { bundleName: "com.example.actsmanyusersabilitytest", abilityName: "com.example.actsmanyusersabilitytest.ServiceAbility", @@ -443,7 +443,7 @@ export default function abilityTest() { console.debug("====>ACTS_ThirdPartyDisconnectAbility_0400 1111 connectAbility2====>"); console.debug("====>ACTS_ThirdPartyDisconnectAbility_0400 66 Subscriber====>"); - globalThis.abilityContext.disconnectAbility( + globalThis.abilityContext.disconnectServiceExtensionAbility( 999, (error, data) => { console.log('ACTS_ThirdPartyDisconnectAbility_0400 5 DisconnectAbility result errCode : ' + error.code + " data: " + data) @@ -471,7 +471,7 @@ export default function abilityTest() { console.debug('unsubscribe subscriberdisconnect'); commonEvent.unsubscribe(subscriber, () => { console.debug('unsubscribe subscriber') - globalThis.abilityContext.disconnectAbility( + globalThis.abilityContext.disconnectServiceExtensionAbility( connId, (error, data) => { console.log('ACTS_ThirdPartyDisconnectAbility_0400 9 DisconnectAbility result errCode : ' + error.code + " data: " + data) @@ -490,7 +490,7 @@ export default function abilityTest() { console.debug("====>ACTS_ThirdPartyDisconnectAbility_0400 10 Subscriber====>"); subscriber = data; await commonEvent.subscribe(subscriber, subscribeCallBack) - connId = await globalThis.abilityContext.connectAbility( + connId = await globalThis.abilityContext.connectServiceExtensionAbility( { bundleName: "com.example.actsmanyusersabilitytest", abilityName: "com.example.actsmanyusersabilitytest.ServiceAbility", @@ -525,7 +525,7 @@ export default function abilityTest() { clearTimeout(id); expect(data.event).assertEqual("AMS_ConnectAbility_0700_commonEvent"); console.debug("====>ACTS_ThirdPartyExtensionConnectAbility_0100 5 "); - globalThis.abilityContext.disconnectAbility( + globalThis.abilityContext.disconnectServiceExtensionAbility( connId, (error, data) => { console.log('featureAbilityTest DisconnectAbility result errCode : ' + error.code + " data: " + data) @@ -554,7 +554,7 @@ export default function abilityTest() { expect().assertFail(); console.debug('ACTS_ExtensionConnectAbility_0100 timeout'); commonEvent.unsubscribe(subscriber, unSubscribeCallback) - globalThis.abilityContext.disconnectAbility( + globalThis.abilityContext.disconnectServiceExtensionAbility( connId, (error, data) => { console.log('featureAbilityTest DisconnectAbility result errCode : ' + error.code + " data: " + data) @@ -563,7 +563,7 @@ export default function abilityTest() { id = setTimeout(timeout, START_ABILITY_TIMEOUT); console.debug("====>ACTS_ThirdPartyExtensionConnectAbility_0100 3 "); - connId = await globalThis.abilityContext.connectAbility( + connId = await globalThis.abilityContext.connectServiceExtensionAbility( { bundleName: "com.example.actsmanyusersabilitytest", abilityName: "com.example.actsmanyusersabilitytest.ServiceAbility", @@ -591,7 +591,7 @@ export default function abilityTest() { clearTimeout(id); expect(data.event).assertEqual("AMS_ConnectAbility_0800_commonEvent"); console.debug("====>ACTS_ThirdPartyExtensionConnectAbility_0200 5 "); - globalThis.abilityContext.disconnectAbility( + globalThis.abilityContext.disconnectServiceExtensionAbility( connId, (error, data) => { console.log('featureAbilityTest DisconnectAbility result errCode : ' + error.code + " data: " + data) @@ -619,7 +619,7 @@ export default function abilityTest() { function timeout() { console.debug('ACTS_ThirdPartyExtensionConnectAbility_0200 timeout'); commonEvent.unsubscribe(subscriber, unSubscribeCallback) - globalThis.abilityContext.disconnectAbility( + globalThis.abilityContext.disconnectServiceExtensionAbility( connId, (error, data) => { console.log('featureAbilityTest DisconnectAbility result errCode : ' + error.code + " data: " + data) @@ -628,7 +628,7 @@ export default function abilityTest() { id = setTimeout(timeout, START_ABILITY_TIMEOUT); console.debug("====>ACTS_ThirdPartyExtensionConnectAbility_0200 3 "); - connId = await globalThis.abilityContext.connectAbility( + connId = await globalThis.abilityContext.connectServiceExtensionAbility( { bundleName: "com.example.actsmanyusersabilitytest", abilityName: "com.example.actsmanyusersabilitytest.ServiceAbility", @@ -655,7 +655,7 @@ export default function abilityTest() { clearTimeout(id); expect(data.event).assertEqual("AMS_ConnectAbility_0900_commonEvent"); console.debug("====>ACTS_ThirdPartyExtensionDisconnectAbility_0100 5 "); - globalThis.abilityContext.disconnectAbility( + globalThis.abilityContext.disconnectServiceExtensionAbility( connId, (error, data) => { console.log('featureAbilityTest DisconnectAbility result errCode : ' + error.code + " data: " + data) @@ -684,7 +684,7 @@ export default function abilityTest() { expect().assertFail(); console.debug('ACTS_ThirdPartyExtensionDisconnectAbility_0100 timeout'); commonEvent.unsubscribe(subscriber, unSubscribeCallback) - globalThis.abilityContext.disconnectAbility( + globalThis.abilityContext.disconnectServiceExtensionAbility( connId, (error, data) => { console.log('featureAbilityTest DisconnectAbility result errCode : ' + error.code + " data: " + data) @@ -693,7 +693,7 @@ export default function abilityTest() { id = setTimeout(timeout, START_ABILITY_TIMEOUT); console.debug("====>ACTS_ThirdPartyExtensionDisconnectAbility_0100 3 "); - connId = await globalThis.abilityContext.connectAbility( + connId = await globalThis.abilityContext.connectServiceExtensionAbility( { bundleName: "com.example.actsmanyusersabilitytest", abilityName: "com.example.actsmanyusersabilitytest.ServiceAbility", @@ -721,7 +721,7 @@ export default function abilityTest() { clearTimeout(id); expect(data.event).assertEqual("AMS_ConnectAbility_1000_commonEvent"); console.debug("====>ACTS_ThirdPartyExtensionDisconnectAbility_0200 5 "); - globalThis.abilityContext.disconnectAbility( + globalThis.abilityContext.disconnectServiceExtensionAbility( connId, (error, data) => { console.log('featureAbilityTest DisconnectAbility result errCode : ' + error.code + " data: " + data) @@ -750,7 +750,7 @@ export default function abilityTest() { expect().assertFail(); console.debug('ACTS_ThirdPartyExtensionDisconnectAbility_0200 timeout'); commonEvent.unsubscribe(subscriber, unSubscribeCallback) - globalThis.abilityContext.disconnectAbility( + globalThis.abilityContext.disconnectServiceExtensionAbility( connId, (error, data) => { console.log('featureAbilityTest DisconnectAbility result errCode : ' + error.code + " data: " + data) @@ -759,7 +759,7 @@ export default function abilityTest() { id = setTimeout(timeout, START_ABILITY_TIMEOUT); console.debug("====>ACTS_ThirdPartyExtensionDisconnectAbility_0200 3 "); - connId = await globalThis.abilityContext.connectAbility( + connId = await globalThis.abilityContext.connectServiceExtensionAbility( { bundleName: "com.example.actsmanyusersabilitytest", abilityName: "com.example.actsmanyusersabilitytest.ServiceAbility", @@ -787,7 +787,7 @@ export default function abilityTest() { clearTimeout(id); expect(data.event).assertEqual("AMS_ConnectAbility_1100_commonEvent"); console.debug("====>ACTS_ThirdPartyExtensionDisconnectAbility_0200 5 "); - globalThis.abilityContext.disconnectAbility( + globalThis.abilityContext.disconnectServiceExtensionAbility( connId, (error, data) => { console.log('featureAbilityTest DisconnectAbility result errCode : ' + error.code + " data: " + data) @@ -815,7 +815,7 @@ export default function abilityTest() { function timeout() { console.debug('ACTS_ThirdPartyExtensionDisconnectAbility_0300 timeout'); commonEvent.unsubscribe(subscriber, unSubscribeCallback) - globalThis.abilityContext.disconnectAbility( + globalThis.abilityContext.disconnectServiceExtensionAbility( connId, (error, data) => { console.log('featureAbilityTest DisconnectAbility result errCode : ' + error.code + " data: " + data) @@ -824,7 +824,7 @@ export default function abilityTest() { id = setTimeout(timeout, START_ABILITY_TIMEOUT); console.debug("====>ACTS_ThirdPartyExtensionDisconnectAbility_0300 3 "); - connId = await globalThis.abilityContext.connectAbility( + connId = await globalThis.abilityContext.connectServiceExtensionAbility( { bundleName: "com.example.actsmanyusersabilitytest", abilityName: "com.example.actsmanyusersabilitytest.ServiceAbility", @@ -852,7 +852,7 @@ export default function abilityTest() { clearTimeout(id); expect(data.event).assertEqual("AMS_ConnectAbility_1200_commonEvent"); console.debug("====>ACTS_ThirdPartyExtensionDisconnectAbility_0400 5 "); - globalThis.abilityContext.disconnectAbility( + globalThis.abilityContext.disconnectServiceExtensionAbility( connId, (error, data) => { console.log('featureAbilityTest DisconnectAbility result errCode : ' + error.code + " data: " + data) @@ -880,7 +880,7 @@ export default function abilityTest() { function timeout() { console.debug('ACTS_ThirdPartyExtensionDisconnectAbility_0400 timeout'); commonEvent.unsubscribe(subscriber, unSubscribeCallback) - globalThis.abilityContext.disconnectAbility( + globalThis.abilityContext.disconnectServiceExtensionAbility( connId, (error, data) => { console.log('featureAbilityTest DisconnectAbility result errCode : ' + error.code + " data: " + data) @@ -889,7 +889,7 @@ export default function abilityTest() { id = setTimeout(timeout, START_ABILITY_TIMEOUT); console.debug("====>ACTS_ThirdPartyExtensionDisconnectAbility_0400 3 "); - connId = await globalThis.abilityContext.connectAbility( + connId = await globalThis.abilityContext.connectServiceExtensionAbility( { bundleName: "com.example.actsmanyusersabilitytest", abilityName: "com.example.actsmanyusersabilitytest.ServiceAbility", diff --git a/ability/ability_runtime/amscontextualinforquery/actsamsextensionmodulehap/entry/src/main/ets/Application/AbilityStage.ts b/ability/ability_runtime/amscontextualinforquery/actsamsextensionmodulehap/entry/src/main/ets/Application/AbilityStage.ts index 98eb012db..a41751fb1 100644 --- a/ability/ability_runtime/amscontextualinforquery/actsamsextensionmodulehap/entry/src/main/ets/Application/AbilityStage.ts +++ b/ability/ability_runtime/amscontextualinforquery/actsamsextensionmodulehap/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/actsamsextensionmodulehap/entry/src/main/ets/MainAbility/MainAbility.ts b/ability/ability_runtime/amscontextualinforquery/actsamsextensionmodulehap/entry/src/main/ets/MainAbility/MainAbility.ts index 24066f46c..c720a902c 100644 --- a/ability/ability_runtime/amscontextualinforquery/actsamsextensionmodulehap/entry/src/main/ets/MainAbility/MainAbility.ts +++ b/ability/ability_runtime/amscontextualinforquery/actsamsextensionmodulehap/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 rpc from '@ohos.rpc' var connection = -1; @@ -68,13 +68,13 @@ export default class MainAbility extends Ability { "bundleName": "com.example.ohosproject.hmservice", "abilityName": "ServiceExtAbility", } - connection = context.connectAbility(want, options); + connection = context.connectServiceExtensionAbility(want, options); console.log("mxh connectServiceExtAbility end, connection:" + connection); }) globalThis.disconnectServiceExtAbility = (() => { console.log("mxh disconnectServiceExtAbility begin"); - context.disconnectAbility(connection).then((data) => { + context.disconnectServiceExtensionAbility(connection).then((data) => { console.info("mxh startAbility success:" + JSON.stringify(data)); }).catch((error) => { console.error("mxh startAbility failed:" + JSON.stringify(error)); 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 cdc3a115e..958e157b6 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 5d9cb94eb..5e7a70c58 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 89a847305..8028a70f8 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/actsamsstaticextensioninfohap/entry/src/main/ets/Application/AbilityStage.ts b/ability/ability_runtime/amscontextualinforquery/actsamsstaticextensioninfohap/entry/src/main/ets/Application/AbilityStage.ts index 98eb012db..a41751fb1 100644 --- a/ability/ability_runtime/amscontextualinforquery/actsamsstaticextensioninfohap/entry/src/main/ets/Application/AbilityStage.ts +++ b/ability/ability_runtime/amscontextualinforquery/actsamsstaticextensioninfohap/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/actsamsstaticextensioninfohap/entry/src/main/ets/MainAbility/MainAbility.ts b/ability/ability_runtime/amscontextualinforquery/actsamsstaticextensioninfohap/entry/src/main/ets/MainAbility/MainAbility.ts index f0f8dec8b..9bb0892a7 100644 --- a/ability/ability_runtime/amscontextualinforquery/actsamsstaticextensioninfohap/entry/src/main/ets/MainAbility/MainAbility.ts +++ b/ability/ability_runtime/amscontextualinforquery/actsamsstaticextensioninfohap/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/amscontextualinforquery/actsamsstaticextensioninfotest/entry/src/main/ets/Application/AbilityStage.ts b/ability/ability_runtime/amscontextualinforquery/actsamsstaticextensioninfotest/entry/src/main/ets/Application/AbilityStage.ts index b3c7ec92d..41515e203 100644 --- a/ability/ability_runtime/amscontextualinforquery/actsamsstaticextensioninfotest/entry/src/main/ets/Application/AbilityStage.ts +++ b/ability/ability_runtime/amscontextualinforquery/actsamsstaticextensioninfotest/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/actsamsstaticextensioninfotest/entry/src/main/ets/MainAbility/MainAbility.ts b/ability/ability_runtime/amscontextualinforquery/actsamsstaticextensioninfotest/entry/src/main/ets/MainAbility/MainAbility.ts index 5d9cb94eb..5e7a70c58 100644 --- a/ability/ability_runtime/amscontextualinforquery/actsamsstaticextensioninfotest/entry/src/main/ets/MainAbility/MainAbility.ts +++ b/ability/ability_runtime/amscontextualinforquery/actsamsstaticextensioninfotest/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/actsamsstaticextensioninfotest/entry/src/main/ets/TestAbility/TestAbility.ts b/ability/ability_runtime/amscontextualinforquery/actsamsstaticextensioninfotest/entry/src/main/ets/TestAbility/TestAbility.ts index 89a847305..8028a70f8 100644 --- a/ability/ability_runtime/amscontextualinforquery/actsamsstaticextensioninfotest/entry/src/main/ets/TestAbility/TestAbility.ts +++ b/ability/ability_runtime/amscontextualinforquery/actsamsstaticextensioninfotest/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/actsamsstaticextensioninfotest/entry/src/main/ets/test/Ability.test.ets b/ability/ability_runtime/amscontextualinforquery/actsamsstaticextensioninfotest/entry/src/main/ets/test/Ability.test.ets index 7317facec..b76402d04 100644 --- a/ability/ability_runtime/amscontextualinforquery/actsamsstaticextensioninfotest/entry/src/main/ets/test/Ability.test.ets +++ b/ability/ability_runtime/amscontextualinforquery/actsamsstaticextensioninfotest/entry/src/main/ets/test/Ability.test.ets @@ -56,7 +56,7 @@ export default function abilityTest() { console.debug("====>ACTS_getExtensionInfo_0100_Create Subscriber====>"); subscriber = data; await commonEvent.subscribe(subscriber, subscribeCallBack); - connId = await globalThis.abilityContext.connectAbility( + connId = await globalThis.abilityContext.connectServiceExtensionAbility( { bundleName: "com.example.staticextensioninfo", abilityName: "com.example.staticextensioninfo.ServiceAbility", @@ -239,7 +239,7 @@ export default function abilityTest() { console.debug("====>ACTS_getExtensionInfo_0200_Create Subscriber====>"); subscriber = data; await commonEvent.subscribe(subscriber, subscribeCallBack); - connId = await globalThis.abilityContext.connectAbility( + connId = await globalThis.abilityContext.connectServiceExtensionAbility( { bundleName: "com.example.staticextensioninfotest", abilityName: "com.example.staticextensioninfotest.ServiceAbility", @@ -420,7 +420,7 @@ export default function abilityTest() { console.debug("====>ACTS_getExtensionInfo_0300_Create Subscriber====>"); subscriber = data; await commonEvent.subscribe(subscriber, subscribeCallBack); - connId = await globalThis.abilityContext.connectAbility( + connId = await globalThis.abilityContext.connectServiceExtensionAbility( { bundleName: "com.example.extensionmodule", abilityName: "ServiceExtAbility", @@ -435,7 +435,7 @@ export default function abilityTest() { function timeout() { expect().assertFail(); - globalThis.abilityContext.disconnectAbility( + globalThis.abilityContext.disconnectServiceExtensionAbility( connId, (error, data) => { console.log('DisconnectAbility_0300 result errCode : ' + error.code + " data: " + data) 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 98eb012db..a41751fb1 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 bb674485f..53a58cda8 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 98eb012db..a41751fb1 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 24d748e5f..9830a346a 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 5e2915fe4..953114c1b 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 5d9cb94eb..5e7a70c58 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 89a847305..8028a70f8 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 5e2915fe4..953114c1b 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 5d9cb94eb..5e7a70c58 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 89a847305..8028a70f8 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 5e2915fe4..953114c1b 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 5d9cb94eb..5e7a70c58 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 89a847305..8028a70f8 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 5c09242f7..5fbeb922f 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 054401cd3..243e393b9 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 2c0c39850..8e8bf6024 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 98eb012db..a41751fb1 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 b989a745e..eb7d1deec 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 4ca501100..a49c97fed 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 5d9cb94eb..5e7a70c58 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 e67d5ef1a..1b100e267 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 89a847305..8028a70f8 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/actsamsstartabilityforresulttest/entry/src/main/ets/test/Ability.test.ets b/ability/ability_runtime/amsdisplayIdtest/actsamsstartabilityforresulttest/entry/src/main/ets/test/Ability.test.ets index 845c0ddc1..354cd7793 100644 --- a/ability/ability_runtime/amsdisplayIdtest/actsamsstartabilityforresulttest/entry/src/main/ets/test/Ability.test.ets +++ b/ability/ability_runtime/amsdisplayIdtest/actsamsstartabilityforresulttest/entry/src/main/ets/test/Ability.test.ets @@ -235,7 +235,7 @@ export default function abilityTest() { console.debug("====>ACTS_startAbilityForResult_1100_Create Subscriber====>"); subscriber = data; await commonEvent.subscribe(subscriber, subscribeCallBack); - connId = await globalThis.abilityContext.connectAbility( + connId = await globalThis.abilityContext.connectServiceExtensionAbility( { bundleName: "com.example.startabilityforresult", abilityName: "com.example.startabilityforresult.ServiceAbility", @@ -246,7 +246,7 @@ export default function abilityTest() { }) function unSubscribeCallback() { - globalThis.abilityContext.disconnectAbility( + globalThis.abilityContext.disconnectServiceExtensionAbility( connId, (error, data) => { console.log('startAbilityForResult_0400 Disconnect result errCode : ' + error.code + " data: " + data) @@ -258,7 +258,7 @@ export default function abilityTest() { function timeout() { expect().assertFail(); - globalThis.abilityContext.disconnectAbility( + globalThis.abilityContext.disconnectServiceExtensionAbility( connId, (error, data) => { console.log('DisconnectAbility_0400 result errCode : ' + error.code + " data: " + data) 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 5e2915fe4..953114c1b 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 10dd9a1ea..b4ad1e5b3 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 a590b7d61..7e917ee0f 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 481070a0d..e4c12a94f 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/FormHostAbility/FormHostAbility.ts b/ability/ability_runtime/apicover/apicoverhaptest/entry/src/main/ets/FormHostAbility/FormHostAbility.ts index b87146f00..db846c9f2 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 83be6c5a2..881e90c13 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 5a2b21198..293bcb917 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 89a847305..8028a70f8 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 c33356ab8..8825f4d21 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 @@ -20,7 +20,7 @@ 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 abilityConstant from '@ohos.app.ability.AbilityConstant' import appManager from '@ohos.application.appManager' import applicationContext from '@ohos.application.context' import commonEvent from '@ohos.commonEvent'; 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 d70ed9217..722516ad8 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/stagesupplement/entry/src/main/ets/Application/AbilityStage.ts b/ability/ability_runtime/apicover/stagesupplement/entry/src/main/ets/Application/AbilityStage.ts index d8f246892..4fc667ef5 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 28beb02c5..b2d78e904 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 c2f80ac0b..a1ce6ac23 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 4042495f6..9de369e49 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 37f65bfeb..2566b910a 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 cb63cb3cd..b2c119ffb 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 bb6f8e4ae..23a58f27a 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 2ae1bf3ce..f851e3de0 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 38415bcb1..e7b2eeb8f 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 f18242941..c2953016c 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 077b6fa9e..7d11ea72a 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 36898c0b2..b1c44b394 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 e199b01c8..ebafd94e1 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 5073f0743..a31d98d3a 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 2f1389c76..8625a754d 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 5073f0743..a31d98d3a 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 2f1389c76..8625a754d 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 2b1035b73..aa42e2969 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 07eefcc2c..5944d812e 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/context/actsstagecontext/actsstagecontextassistone/entry/src/main/ets/Application/MyAbilityStage.ts b/ability/ability_runtime/context/actsstagecontext/actsstagecontextassistone/entry/src/main/ets/Application/MyAbilityStage.ts index 84e69952d..fcfe98e65 100644 --- a/ability/ability_runtime/context/actsstagecontext/actsstagecontextassistone/entry/src/main/ets/Application/MyAbilityStage.ts +++ b/ability/ability_runtime/context/actsstagecontext/actsstagecontextassistone/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/context/actsstagecontext/actsstagecontextassistone/entry/src/main/ets/MainAbility/MainAbility.ts b/ability/ability_runtime/context/actsstagecontext/actsstagecontextassistone/entry/src/main/ets/MainAbility/MainAbility.ts index a5c2a0434..2371b3d4b 100644 --- a/ability/ability_runtime/context/actsstagecontext/actsstagecontextassistone/entry/src/main/ets/MainAbility/MainAbility.ts +++ b/ability/ability_runtime/context/actsstagecontext/actsstagecontextassistone/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/context/actsstagecontext/actsstagecontextassisttwo/entry/src/main/ets/Application/MyAbilityStage.ts b/ability/ability_runtime/context/actsstagecontext/actsstagecontextassisttwo/entry/src/main/ets/Application/MyAbilityStage.ts index d5309541b..c006f8749 100644 --- a/ability/ability_runtime/context/actsstagecontext/actsstagecontextassisttwo/entry/src/main/ets/Application/MyAbilityStage.ts +++ b/ability/ability_runtime/context/actsstagecontext/actsstagecontextassisttwo/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" import commonEvent from '@ohos.commonEvent' function sleep(delay) { diff --git a/ability/ability_runtime/context/actsstagecontext/actsstagecontextassisttwo/entry/src/main/ets/MainAbility/MainAbility.ts b/ability/ability_runtime/context/actsstagecontext/actsstagecontextassisttwo/entry/src/main/ets/MainAbility/MainAbility.ts index dd286cedb..fec47b86b 100644 --- a/ability/ability_runtime/context/actsstagecontext/actsstagecontextassisttwo/entry/src/main/ets/MainAbility/MainAbility.ts +++ b/ability/ability_runtime/context/actsstagecontext/actsstagecontextassisttwo/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' import bundle from '@ohos.bundle'; import dataAbility from '@ohos.data.dataAbility'; diff --git a/ability/ability_runtime/context/actsstagecontext/actsstagecontextpropertiestest/entry/src/main/ets/Application/MyAbilityStage.ts b/ability/ability_runtime/context/actsstagecontext/actsstagecontextpropertiestest/entry/src/main/ets/Application/MyAbilityStage.ts index a5252dd1c..d7b80c3fa 100644 --- a/ability/ability_runtime/context/actsstagecontext/actsstagecontextpropertiestest/entry/src/main/ets/Application/MyAbilityStage.ts +++ b/ability/ability_runtime/context/actsstagecontext/actsstagecontextpropertiestest/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/context/actsstagecontext/actsstagecontextpropertiestest/entry/src/main/ets/MainAbility/MainAbility.ts b/ability/ability_runtime/context/actsstagecontext/actsstagecontextpropertiestest/entry/src/main/ets/MainAbility/MainAbility.ts index 1e2e87f4f..ea4cc8595 100644 --- a/ability/ability_runtime/context/actsstagecontext/actsstagecontextpropertiestest/entry/src/main/ets/MainAbility/MainAbility.ts +++ b/ability/ability_runtime/context/actsstagecontext/actsstagecontextpropertiestest/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/context/actsstagecontext/actsstagecontextpropertiestest/entry/src/main/ets/MainAbility2/MainAbility2.ts b/ability/ability_runtime/context/actsstagecontext/actsstagecontextpropertiestest/entry/src/main/ets/MainAbility2/MainAbility2.ts index 51d5acc1b..e485e610d 100644 --- a/ability/ability_runtime/context/actsstagecontext/actsstagecontextpropertiestest/entry/src/main/ets/MainAbility2/MainAbility2.ts +++ b/ability/ability_runtime/context/actsstagecontext/actsstagecontextpropertiestest/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' export default class MainAbility2 extends Ability { 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 6ceb0c290..3745b4557 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 a67282173..a133ba34f 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 89a847305..8028a70f8 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/module1/src/main/ets/Application/AbilityStage.ts b/ability/ability_runtime/formmanager/stage/actsformprovidergetformsinfo/module1/src/main/ets/Application/AbilityStage.ts index 6ceb0c290..3745b4557 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/MainAbility/MainAbility.ts b/ability/ability_runtime/formmanager/stage/actsformprovidergetformsinfo/module1/src/main/ets/MainAbility/MainAbility.ts index 92e4e8922..9008f9958 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 6ceb0c290..3745b4557 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/MainAbility/MainAbility.ts b/ability/ability_runtime/formmanager/stage/actsformprovidergetformsinfo/module2/src/main/ets/MainAbility/MainAbility.ts index 92e4e8922..9008f9958 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/connectdifferentapplication/entry/src/main/ets/Application/AbilityStage.ts b/ability/ability_runtime/freeinstalltest/connectabilityfatest/connectdifferentapplication/entry/src/main/ets/Application/AbilityStage.ts index 9090e1e7a..edfe8d7e0 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 a3b93f8a0..61ee95bae 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/connectabilitystagetest/actsfreeinstallconnectabilitystagetest/entry/src/main/ets/Application/AbilityStage.ts b/ability/ability_runtime/freeinstalltest/connectabilitystagetest/actsfreeinstallconnectabilitystagetest/entry/src/main/ets/Application/AbilityStage.ts index b3f3c3060..bcdd94768 100644 --- a/ability/ability_runtime/freeinstalltest/connectabilitystagetest/actsfreeinstallconnectabilitystagetest/entry/src/main/ets/Application/AbilityStage.ts +++ b/ability/ability_runtime/freeinstalltest/connectabilitystagetest/actsfreeinstallconnectabilitystagetest/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/connectabilitystagetest/actsfreeinstallconnectabilitystagetest/entry/src/main/ets/MainAbility/MainAbility.ts b/ability/ability_runtime/freeinstalltest/connectabilitystagetest/actsfreeinstallconnectabilitystagetest/entry/src/main/ets/MainAbility/MainAbility.ts index ed2f65212..1a3520c5f 100644 --- a/ability/ability_runtime/freeinstalltest/connectabilitystagetest/actsfreeinstallconnectabilitystagetest/entry/src/main/ets/MainAbility/MainAbility.ts +++ b/ability/ability_runtime/freeinstalltest/connectabilitystagetest/actsfreeinstallconnectabilitystagetest/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'; let publishOptions = { diff --git a/ability/ability_runtime/freeinstalltest/connectabilitystagetest/actsfreeinstallconnectabilitystagetest/entry/src/main/ets/MainAbility2/MainAbility2.ts b/ability/ability_runtime/freeinstalltest/connectabilitystagetest/actsfreeinstallconnectabilitystagetest/entry/src/main/ets/MainAbility2/MainAbility2.ts index a7a9b4346..6e87e2098 100644 --- a/ability/ability_runtime/freeinstalltest/connectabilitystagetest/actsfreeinstallconnectabilitystagetest/entry/src/main/ets/MainAbility2/MainAbility2.ts +++ b/ability/ability_runtime/freeinstalltest/connectabilitystagetest/actsfreeinstallconnectabilitystagetest/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 MainAbility2 extends Ability { onCreate(want, launchParam) { diff --git a/ability/ability_runtime/freeinstalltest/connectabilitystagetest/actsfreeinstallconnectabilitystagetest/entry/src/main/ets/test/ConnectAbilityTest.ets b/ability/ability_runtime/freeinstalltest/connectabilitystagetest/actsfreeinstallconnectabilitystagetest/entry/src/main/ets/test/ConnectAbilityTest.ets index 15b2a6289..cba580811 100644 --- a/ability/ability_runtime/freeinstalltest/connectabilitystagetest/actsfreeinstallconnectabilitystagetest/entry/src/main/ets/test/ConnectAbilityTest.ets +++ b/ability/ability_runtime/freeinstalltest/connectabilitystagetest/actsfreeinstallconnectabilitystagetest/entry/src/main/ets/test/ConnectAbilityTest.ets @@ -99,7 +99,7 @@ export default function ConnectAbilityTest(abilityContext) { tips("连接失败"); } } - let connection = await globalThis.abilityContext.connectAbility(request, options); + let connection = await globalThis.abilityContext.connectServiceExtensionAbility(request, options); console.info(msg + "request：" + JSON.stringify(request)); console.info(msg + "options：" + JSON.stringify(options)); console.info(msg + "connection=" + JSON.stringify(connection)); diff --git a/ability/ability_runtime/freeinstalltest/connectabilitystagetest/connectstagemyapplication0/entry/src/main/ets/Application/AbilityStage.ts b/ability/ability_runtime/freeinstalltest/connectabilitystagetest/connectstagemyapplication0/entry/src/main/ets/Application/AbilityStage.ts index b3f3c3060..bcdd94768 100644 --- a/ability/ability_runtime/freeinstalltest/connectabilitystagetest/connectstagemyapplication0/entry/src/main/ets/Application/AbilityStage.ts +++ b/ability/ability_runtime/freeinstalltest/connectabilitystagetest/connectstagemyapplication0/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/connectabilitystagetest/connectstagemyapplication0/entry/src/main/ets/MainAbility/MainAbility.ts b/ability/ability_runtime/freeinstalltest/connectabilitystagetest/connectstagemyapplication0/entry/src/main/ets/MainAbility/MainAbility.ts index 1e29b8b56..603946931 100644 --- a/ability/ability_runtime/freeinstalltest/connectabilitystagetest/connectstagemyapplication0/entry/src/main/ets/MainAbility/MainAbility.ts +++ b/ability/ability_runtime/freeinstalltest/connectabilitystagetest/connectstagemyapplication0/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/connectabilitystagetest/connectstagemyapplication1/entry/src/main/ets/Application/AbilityStage.ts b/ability/ability_runtime/freeinstalltest/connectabilitystagetest/connectstagemyapplication1/entry/src/main/ets/Application/AbilityStage.ts index b3f3c3060..bcdd94768 100644 --- a/ability/ability_runtime/freeinstalltest/connectabilitystagetest/connectstagemyapplication1/entry/src/main/ets/Application/AbilityStage.ts +++ b/ability/ability_runtime/freeinstalltest/connectabilitystagetest/connectstagemyapplication1/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/connectabilitystagetest/connectstagemyapplication1/entry/src/main/ets/MainAbility/MainAbility.ts b/ability/ability_runtime/freeinstalltest/connectabilitystagetest/connectstagemyapplication1/entry/src/main/ets/MainAbility/MainAbility.ts index 1e29b8b56..603946931 100644 --- a/ability/ability_runtime/freeinstalltest/connectabilitystagetest/connectstagemyapplication1/entry/src/main/ets/MainAbility/MainAbility.ts +++ b/ability/ability_runtime/freeinstalltest/connectabilitystagetest/connectstagemyapplication1/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/connectabilitystagetest/connectstagemyapplication2/entry/src/main/ets/Application/AbilityStage.ts b/ability/ability_runtime/freeinstalltest/connectabilitystagetest/connectstagemyapplication2/entry/src/main/ets/Application/AbilityStage.ts index b3f3c3060..bcdd94768 100644 --- a/ability/ability_runtime/freeinstalltest/connectabilitystagetest/connectstagemyapplication2/entry/src/main/ets/Application/AbilityStage.ts +++ b/ability/ability_runtime/freeinstalltest/connectabilitystagetest/connectstagemyapplication2/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/connectabilitystagetest/connectstagemyapplication2/entry/src/main/ets/MainAbility/MainAbility.ts b/ability/ability_runtime/freeinstalltest/connectabilitystagetest/connectstagemyapplication2/entry/src/main/ets/MainAbility/MainAbility.ts index 3b57d52c1..79a750500 100644 --- a/ability/ability_runtime/freeinstalltest/connectabilitystagetest/connectstagemyapplication2/entry/src/main/ets/MainAbility/MainAbility.ts +++ b/ability/ability_runtime/freeinstalltest/connectabilitystagetest/connectstagemyapplication2/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/connectabilitystagetest/connectstagemyapplication3/entry/src/main/ets/Application/AbilityStage.ts b/ability/ability_runtime/freeinstalltest/connectabilitystagetest/connectstagemyapplication3/entry/src/main/ets/Application/AbilityStage.ts index b3f3c3060..bcdd94768 100644 --- a/ability/ability_runtime/freeinstalltest/connectabilitystagetest/connectstagemyapplication3/entry/src/main/ets/Application/AbilityStage.ts +++ b/ability/ability_runtime/freeinstalltest/connectabilitystagetest/connectstagemyapplication3/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/connectabilitystagetest/connectstagemyapplication3/entry/src/main/ets/MainAbility/MainAbility.ts b/ability/ability_runtime/freeinstalltest/connectabilitystagetest/connectstagemyapplication3/entry/src/main/ets/MainAbility/MainAbility.ts index 1e29b8b56..603946931 100644 --- a/ability/ability_runtime/freeinstalltest/connectabilitystagetest/connectstagemyapplication3/entry/src/main/ets/MainAbility/MainAbility.ts +++ b/ability/ability_runtime/freeinstalltest/connectabilitystagetest/connectstagemyapplication3/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/connectabilitystagetest/connectstagemyapplication4/entry/src/main/ets/Application/AbilityStage.ts b/ability/ability_runtime/freeinstalltest/connectabilitystagetest/connectstagemyapplication4/entry/src/main/ets/Application/AbilityStage.ts index b3f3c3060..bcdd94768 100644 --- a/ability/ability_runtime/freeinstalltest/connectabilitystagetest/connectstagemyapplication4/entry/src/main/ets/Application/AbilityStage.ts +++ b/ability/ability_runtime/freeinstalltest/connectabilitystagetest/connectstagemyapplication4/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/connectabilitystagetest/connectstagemyapplication4/entry/src/main/ets/MainAbility/MainAbility.ts b/ability/ability_runtime/freeinstalltest/connectabilitystagetest/connectstagemyapplication4/entry/src/main/ets/MainAbility/MainAbility.ts index 1e29b8b56..603946931 100644 --- a/ability/ability_runtime/freeinstalltest/connectabilitystagetest/connectstagemyapplication4/entry/src/main/ets/MainAbility/MainAbility.ts +++ b/ability/ability_runtime/freeinstalltest/connectabilitystagetest/connectstagemyapplication4/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/connectabilitystagetest/connectstagemyapplication5/entry/src/main/ets/Application/AbilityStage.ts b/ability/ability_runtime/freeinstalltest/connectabilitystagetest/connectstagemyapplication5/entry/src/main/ets/Application/AbilityStage.ts index b3f3c3060..bcdd94768 100644 --- a/ability/ability_runtime/freeinstalltest/connectabilitystagetest/connectstagemyapplication5/entry/src/main/ets/Application/AbilityStage.ts +++ b/ability/ability_runtime/freeinstalltest/connectabilitystagetest/connectstagemyapplication5/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/connectabilitystagetest/connectstagemyapplication5/entry/src/main/ets/MainAbility/MainAbility.ts b/ability/ability_runtime/freeinstalltest/connectabilitystagetest/connectstagemyapplication5/entry/src/main/ets/MainAbility/MainAbility.ts index 1e29b8b56..603946931 100644 --- a/ability/ability_runtime/freeinstalltest/connectabilitystagetest/connectstagemyapplication5/entry/src/main/ets/MainAbility/MainAbility.ts +++ b/ability/ability_runtime/freeinstalltest/connectabilitystagetest/connectstagemyapplication5/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/connectabilitystagetest/connectstagemyapplication6/entry/src/main/ets/Application/AbilityStage.ts b/ability/ability_runtime/freeinstalltest/connectabilitystagetest/connectstagemyapplication6/entry/src/main/ets/Application/AbilityStage.ts index b3f3c3060..bcdd94768 100644 --- a/ability/ability_runtime/freeinstalltest/connectabilitystagetest/connectstagemyapplication6/entry/src/main/ets/Application/AbilityStage.ts +++ b/ability/ability_runtime/freeinstalltest/connectabilitystagetest/connectstagemyapplication6/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/connectabilitystagetest/connectstagemyapplication6/entry/src/main/ets/MainAbility/MainAbility.ts b/ability/ability_runtime/freeinstalltest/connectabilitystagetest/connectstagemyapplication6/entry/src/main/ets/MainAbility/MainAbility.ts index 1e29b8b56..603946931 100644 --- a/ability/ability_runtime/freeinstalltest/connectabilitystagetest/connectstagemyapplication6/entry/src/main/ets/MainAbility/MainAbility.ts +++ b/ability/ability_runtime/freeinstalltest/connectabilitystagetest/connectstagemyapplication6/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/connectabilitystagetest/connectstagemyapplication7/entry/src/main/ets/Application/AbilityStage.ts b/ability/ability_runtime/freeinstalltest/connectabilitystagetest/connectstagemyapplication7/entry/src/main/ets/Application/AbilityStage.ts index b3f3c3060..bcdd94768 100644 --- a/ability/ability_runtime/freeinstalltest/connectabilitystagetest/connectstagemyapplication7/entry/src/main/ets/Application/AbilityStage.ts +++ b/ability/ability_runtime/freeinstalltest/connectabilitystagetest/connectstagemyapplication7/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/connectabilitystagetest/connectstagemyapplication7/entry/src/main/ets/MainAbility/MainAbility.ts b/ability/ability_runtime/freeinstalltest/connectabilitystagetest/connectstagemyapplication7/entry/src/main/ets/MainAbility/MainAbility.ts index 1e29b8b56..603946931 100644 --- a/ability/ability_runtime/freeinstalltest/connectabilitystagetest/connectstagemyapplication7/entry/src/main/ets/MainAbility/MainAbility.ts +++ b/ability/ability_runtime/freeinstalltest/connectabilitystagetest/connectstagemyapplication7/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/connectabilitystagetest/connectstagemyapplication8/entry/src/main/ets/Application/AbilityStage.ts b/ability/ability_runtime/freeinstalltest/connectabilitystagetest/connectstagemyapplication8/entry/src/main/ets/Application/AbilityStage.ts index b3f3c3060..bcdd94768 100644 --- a/ability/ability_runtime/freeinstalltest/connectabilitystagetest/connectstagemyapplication8/entry/src/main/ets/Application/AbilityStage.ts +++ b/ability/ability_runtime/freeinstalltest/connectabilitystagetest/connectstagemyapplication8/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/connectabilitystagetest/connectstagemyapplication8/entry/src/main/ets/MainAbility/MainAbility.ts b/ability/ability_runtime/freeinstalltest/connectabilitystagetest/connectstagemyapplication8/entry/src/main/ets/MainAbility/MainAbility.ts index 1e29b8b56..603946931 100644 --- a/ability/ability_runtime/freeinstalltest/connectabilitystagetest/connectstagemyapplication8/entry/src/main/ets/MainAbility/MainAbility.ts +++ b/ability/ability_runtime/freeinstalltest/connectabilitystagetest/connectstagemyapplication8/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 b3f3c3060..bcdd94768 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 1e29b8b56..603946931 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 b3f3c3060..bcdd94768 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 1e29b8b56..603946931 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 396606ff7..9ee1aa9fb 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 2879c19bb..02a2a1095 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 525be4fcb..3a1bdfebd 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 @@ -14,7 +14,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/actsstartabilityforresultnotargetbundleliststagetest/entry/src/main/ets/Application/AbilityStage.ts b/ability/ability_runtime/freeinstalltest/startabilityforresultstagetest/actsstartabilityforresultnotargetbundleliststagetest/entry/src/main/ets/Application/AbilityStage.ts index 396606ff7..9ee1aa9fb 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 2879c19bb..02a2a1095 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 a9609dd37..415cf8522 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 @@ -14,7 +14,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 396606ff7..9ee1aa9fb 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 6a7c9df68..91d72c9e1 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 396606ff7..9ee1aa9fb 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 4efeca31a..66b0642fa 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 396606ff7..9ee1aa9fb 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 4efeca31a..66b0642fa 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 b3f3c3060..bcdd94768 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 1031a55f5..642d29d64 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 b3f3c3060..bcdd94768 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/MainAbility/MainAbility.ts b/ability/ability_runtime/freeinstalltest/startabilitystagetest/actsfreeinstallstartabilitystagetest/entry/src/main/ets/MainAbility/MainAbility.ts index 9dca45fbb..f426ea529 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 a7b04f832..334d785ab 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 a56b2aa2d..3b14725f9 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 @@ -14,7 +14,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/actsstartabilitynotargetbundleliststagetest/entry/src/main/ets/Application/AbilityStage.ts b/ability/ability_runtime/freeinstalltest/startabilitystagetest/actsstartabilitynotargetbundleliststagetest/entry/src/main/ets/Application/AbilityStage.ts index b3f3c3060..bcdd94768 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 9dca45fbb..f426ea529 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 a66291b36..d7d460904 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 @@ -14,7 +14,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 b3f3c3060..bcdd94768 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 1e29b8b56..603946931 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/atomizationstagehm2/entry/src/main/ets/Application/AbilityStage.ts b/ability/ability_runtime/freeinstalltest/startabilitystagetest/atomizationstagehm2/entry/src/main/ets/Application/AbilityStage.ts index b3f3c3060..bcdd94768 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 1e29b8b56..603946931 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 b3f3c3060..bcdd94768 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 1e29b8b56..603946931 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 b3f3c3060..bcdd94768 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 1e29b8b56..603946931 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 98eb012db..a41751fb1 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 c3dc930c5..3857a6da8 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 5e2915fe4..953114c1b 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 717657a0c..8ed0a149b 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 89a847305..8028a70f8 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 110b635df..105d9ab56 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 9962ff55d..7fa34e486 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 b44ce4627..ab70b5ad1 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 8e74ecba1..fbb55ab16 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 b44ce4627..ab70b5ad1 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 153190f2b..9905a3a2e 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) { @@ -81,7 +81,7 @@ export default class MainAbility extends Ability { }) } if (globalThis.abilityWant.action == 'startMainAbility0700') { - globalThis.abilityContext.connectAbility({ + globalThis.abilityContext.connectServiceExtensionAbility({ bundleName: "com.example.newwanthap", abilityName: "com.example.newwanthapa.ServiceAbility", action: "connectServiceAbility0700" 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 3faed4fc1..a262041cb 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 6837617a9..b4110dd30 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 f59e72750..39fe1c406 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 89a847305..8028a70f8 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 98eb012db..a41751fb1 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 21042c6b3..ac09453e2 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 e54a793c6..dc615727e 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 89a847305..8028a70f8 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_systemappa_test/entry/src/main/ets/test/AbilityPermission.test.ets b/ability/ability_runtime/non_concurrent/acts_systemappa_test/entry/src/main/ets/test/AbilityPermission.test.ets index 23b6d64de..f45d30bb0 100644 --- a/ability/ability_runtime/non_concurrent/acts_systemappa_test/entry/src/main/ets/test/AbilityPermission.test.ets +++ b/ability/ability_runtime/non_concurrent/acts_systemappa_test/entry/src/main/ets/test/AbilityPermission.test.ets @@ -157,7 +157,7 @@ export default function abilityPermissionTest() { function SubscribeCallBack(err, data) { expect(data.event == "ACTS_AbilityPermission_0400_Start_CommonEvent").assertTrue(); console.debug("====>0400 Subscribe CallBack data:====>" + JSON.stringify(data)); - globalThis.abilityContext.disconnectAbility(globalThis.number).then((data) => { + globalThis.abilityContext.disconnectServiceExtensionAbility(globalThis.number).then((data) => { console.debug("====>data is====>" + JSON.stringify(data)); }) console.log('====>disconnectAbility finish'); 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 98eb012db..a41751fb1 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 7335dbf49..ffb2d64d5 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 579e88598..518c7f953 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 ad051678a..570d85445 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 b11ac50ea..d466fc861 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/actsthirdappatest/entry/src/main/ets/test/AbilityPermission.test.ets b/ability/ability_runtime/non_concurrent/actsthirdappatest/entry/src/main/ets/test/AbilityPermission.test.ets index 5532d6eda..163f650a7 100755 --- a/ability/ability_runtime/non_concurrent/actsthirdappatest/entry/src/main/ets/test/AbilityPermission.test.ets +++ b/ability/ability_runtime/non_concurrent/actsthirdappatest/entry/src/main/ets/test/AbilityPermission.test.ets @@ -138,7 +138,7 @@ export default function abilityPermissionTest() { function SubscribeCallBack(err, data) { expect(data.event == "ACTS_ThirdPartyAbilityPermission_0400_Start_CommonEvent").assertTrue(); console.debug("====>0400 Subscribe CallBack data:====>" + JSON.stringify(data)); - globalThis.abilityContext.disconnectAbility(globalThis.number).then((data) => { + globalThis.abilityContext.disconnectServiceExtensionAbility(globalThis.number).then((data) => { console.debug("====>data is====>" + JSON.stringify(data)); }) console.log('====>disconnectAbility finish'); 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 98eb012db..a41751fb1 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 60a0edd48..1957f1056 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/processmultiinstance/actsamsprocessmultiinstancehapaarelyhap/entry/src/main/ets/Application/AbilityStage.ts b/ability/ability_runtime/processmultiinstance/actsamsprocessmultiinstancehapaarelyhap/entry/src/main/ets/Application/AbilityStage.ts index 98eb012db..a41751fb1 100644 --- a/ability/ability_runtime/processmultiinstance/actsamsprocessmultiinstancehapaarelyhap/entry/src/main/ets/Application/AbilityStage.ts +++ b/ability/ability_runtime/processmultiinstance/actsamsprocessmultiinstancehapaarelyhap/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/processmultiinstance/actsamsprocessmultiinstancehapaarelyhap/entry/src/main/ets/MainAbility/MainAbility.ts b/ability/ability_runtime/processmultiinstance/actsamsprocessmultiinstancehapaarelyhap/entry/src/main/ets/MainAbility/MainAbility.ts index f770af1c8..0b25b52d8 100644 --- a/ability/ability_runtime/processmultiinstance/actsamsprocessmultiinstancehapaarelyhap/entry/src/main/ets/MainAbility/MainAbility.ts +++ b/ability/ability_runtime/processmultiinstance/actsamsprocessmultiinstancehapaarelyhap/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/processmultiinstance/actsamsprocessmultiinstancehapabrelyhap/entry/src/main/ets/Application/AbilityStage.ts b/ability/ability_runtime/processmultiinstance/actsamsprocessmultiinstancehapabrelyhap/entry/src/main/ets/Application/AbilityStage.ts index 98eb012db..a41751fb1 100644 --- a/ability/ability_runtime/processmultiinstance/actsamsprocessmultiinstancehapabrelyhap/entry/src/main/ets/Application/AbilityStage.ts +++ b/ability/ability_runtime/processmultiinstance/actsamsprocessmultiinstancehapabrelyhap/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/processmultiinstance/actsamsprocessmultiinstancehapabrelyhap/entry/src/main/ets/MainAbility/MainAbility.ts b/ability/ability_runtime/processmultiinstance/actsamsprocessmultiinstancehapabrelyhap/entry/src/main/ets/MainAbility/MainAbility.ts index ef8a0e1a5..2cf20c0bd 100644 --- a/ability/ability_runtime/processmultiinstance/actsamsprocessmultiinstancehapabrelyhap/entry/src/main/ets/MainAbility/MainAbility.ts +++ b/ability/ability_runtime/processmultiinstance/actsamsprocessmultiinstancehapabrelyhap/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/processmultiinstance/actsamsprocessmultiinstancehapbarelyhap/entry/src/main/ets/Application/AbilityStage.ts b/ability/ability_runtime/processmultiinstance/actsamsprocessmultiinstancehapbarelyhap/entry/src/main/ets/Application/AbilityStage.ts index 98eb012db..a41751fb1 100644 --- a/ability/ability_runtime/processmultiinstance/actsamsprocessmultiinstancehapbarelyhap/entry/src/main/ets/Application/AbilityStage.ts +++ b/ability/ability_runtime/processmultiinstance/actsamsprocessmultiinstancehapbarelyhap/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/processmultiinstance/actsamsprocessmultiinstancehapbarelyhap/entry/src/main/ets/MainAbility/MainAbility.ts b/ability/ability_runtime/processmultiinstance/actsamsprocessmultiinstancehapbarelyhap/entry/src/main/ets/MainAbility/MainAbility.ts index f1c52538a..e346ebe9c 100644 --- a/ability/ability_runtime/processmultiinstance/actsamsprocessmultiinstancehapbarelyhap/entry/src/main/ets/MainAbility/MainAbility.ts +++ b/ability/ability_runtime/processmultiinstance/actsamsprocessmultiinstancehapbarelyhap/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' let connectionId = -1; diff --git a/ability/ability_runtime/processmultiinstance/actsamsprocessmultiinstancehapbbrelyhap/entry/src/main/ets/Application/AbilityStage.ts b/ability/ability_runtime/processmultiinstance/actsamsprocessmultiinstancehapbbrelyhap/entry/src/main/ets/Application/AbilityStage.ts index 98eb012db..a41751fb1 100644 --- a/ability/ability_runtime/processmultiinstance/actsamsprocessmultiinstancehapbbrelyhap/entry/src/main/ets/Application/AbilityStage.ts +++ b/ability/ability_runtime/processmultiinstance/actsamsprocessmultiinstancehapbbrelyhap/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/processmultiinstance/actsamsprocessmultiinstancehapbbrelyhap/entry/src/main/ets/MainAbility/MainAbility.ts b/ability/ability_runtime/processmultiinstance/actsamsprocessmultiinstancehapbbrelyhap/entry/src/main/ets/MainAbility/MainAbility.ts index fdd62659d..7145f5389 100644 --- a/ability/ability_runtime/processmultiinstance/actsamsprocessmultiinstancehapbbrelyhap/entry/src/main/ets/MainAbility/MainAbility.ts +++ b/ability/ability_runtime/processmultiinstance/actsamsprocessmultiinstancehapbbrelyhap/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' let connectionId = -1; diff --git a/ability/ability_runtime/processmultiinstance/actsamsprocessmultiinstancehapbcrelyhap/entry/src/main/ets/Application/AbilityStage.ts b/ability/ability_runtime/processmultiinstance/actsamsprocessmultiinstancehapbcrelyhap/entry/src/main/ets/Application/AbilityStage.ts index 98eb012db..a41751fb1 100644 --- a/ability/ability_runtime/processmultiinstance/actsamsprocessmultiinstancehapbcrelyhap/entry/src/main/ets/Application/AbilityStage.ts +++ b/ability/ability_runtime/processmultiinstance/actsamsprocessmultiinstancehapbcrelyhap/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/processmultiinstance/actsamsprocessmultiinstancehapbcrelyhap/entry/src/main/ets/MainAbility/MainAbility.ts b/ability/ability_runtime/processmultiinstance/actsamsprocessmultiinstancehapbcrelyhap/entry/src/main/ets/MainAbility/MainAbility.ts index 6782e5820..4a0c53a40 100644 --- a/ability/ability_runtime/processmultiinstance/actsamsprocessmultiinstancehapbcrelyhap/entry/src/main/ets/MainAbility/MainAbility.ts +++ b/ability/ability_runtime/processmultiinstance/actsamsprocessmultiinstancehapbcrelyhap/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' let connectionId = -1; diff --git a/ability/ability_runtime/processmultiinstance/actsamsprocessmultiinstancehapbdrelyhap/entry/src/main/ets/Application/AbilityStage.ts b/ability/ability_runtime/processmultiinstance/actsamsprocessmultiinstancehapbdrelyhap/entry/src/main/ets/Application/AbilityStage.ts index 98eb012db..a41751fb1 100644 --- a/ability/ability_runtime/processmultiinstance/actsamsprocessmultiinstancehapbdrelyhap/entry/src/main/ets/Application/AbilityStage.ts +++ b/ability/ability_runtime/processmultiinstance/actsamsprocessmultiinstancehapbdrelyhap/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/processmultiinstance/actsamsprocessmultiinstancehapbdrelyhap/entry/src/main/ets/MainAbility/MainAbility.ts b/ability/ability_runtime/processmultiinstance/actsamsprocessmultiinstancehapbdrelyhap/entry/src/main/ets/MainAbility/MainAbility.ts index cf0378810..02d4b0434 100644 --- a/ability/ability_runtime/processmultiinstance/actsamsprocessmultiinstancehapbdrelyhap/entry/src/main/ets/MainAbility/MainAbility.ts +++ b/ability/ability_runtime/processmultiinstance/actsamsprocessmultiinstancehapbdrelyhap/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' let connectionId = -1; diff --git a/ability/ability_runtime/processmultiinstance/actsamsprocessmultiinstancehapberelyhap/entry/src/main/ets/Application/AbilityStage.ts b/ability/ability_runtime/processmultiinstance/actsamsprocessmultiinstancehapberelyhap/entry/src/main/ets/Application/AbilityStage.ts index 98eb012db..a41751fb1 100644 --- a/ability/ability_runtime/processmultiinstance/actsamsprocessmultiinstancehapberelyhap/entry/src/main/ets/Application/AbilityStage.ts +++ b/ability/ability_runtime/processmultiinstance/actsamsprocessmultiinstancehapberelyhap/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/processmultiinstance/actsamsprocessmultiinstancehapberelyhap/entry/src/main/ets/MainAbility/MainAbility.ts b/ability/ability_runtime/processmultiinstance/actsamsprocessmultiinstancehapberelyhap/entry/src/main/ets/MainAbility/MainAbility.ts index b043dc469..0e2d4592e 100644 --- a/ability/ability_runtime/processmultiinstance/actsamsprocessmultiinstancehapberelyhap/entry/src/main/ets/MainAbility/MainAbility.ts +++ b/ability/ability_runtime/processmultiinstance/actsamsprocessmultiinstancehapberelyhap/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' let connectionId = -1; diff --git a/ability/ability_runtime/processmultiinstance/actsamsprocessmultiinstancehapbfrelyhap/entry/src/main/ets/Application/AbilityStage.ts b/ability/ability_runtime/processmultiinstance/actsamsprocessmultiinstancehapbfrelyhap/entry/src/main/ets/Application/AbilityStage.ts index 98eb012db..a41751fb1 100644 --- a/ability/ability_runtime/processmultiinstance/actsamsprocessmultiinstancehapbfrelyhap/entry/src/main/ets/Application/AbilityStage.ts +++ b/ability/ability_runtime/processmultiinstance/actsamsprocessmultiinstancehapbfrelyhap/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/processmultiinstance/actsamsprocessmultiinstancehapbfrelyhap/entry/src/main/ets/MainAbility/MainAbility.ts b/ability/ability_runtime/processmultiinstance/actsamsprocessmultiinstancehapbfrelyhap/entry/src/main/ets/MainAbility/MainAbility.ts index 0d3d245f9..61ad93543 100644 --- a/ability/ability_runtime/processmultiinstance/actsamsprocessmultiinstancehapbfrelyhap/entry/src/main/ets/MainAbility/MainAbility.ts +++ b/ability/ability_runtime/processmultiinstance/actsamsprocessmultiinstancehapbfrelyhap/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' let connectionId = -1; diff --git a/ability/ability_runtime/processmultiinstance/actsamsprocessmultiinstancetest/entry/src/main/ets/Application/AbilityStage.ts b/ability/ability_runtime/processmultiinstance/actsamsprocessmultiinstancetest/entry/src/main/ets/Application/AbilityStage.ts index 5e2915fe4..953114c1b 100644 --- a/ability/ability_runtime/processmultiinstance/actsamsprocessmultiinstancetest/entry/src/main/ets/Application/AbilityStage.ts +++ b/ability/ability_runtime/processmultiinstance/actsamsprocessmultiinstancetest/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/processmultiinstance/actsamsprocessmultiinstancetest/entry/src/main/ets/MainAbility/MainAbility.ts b/ability/ability_runtime/processmultiinstance/actsamsprocessmultiinstancetest/entry/src/main/ets/MainAbility/MainAbility.ts index 03bed122d..f4b962102 100644 --- a/ability/ability_runtime/processmultiinstance/actsamsprocessmultiinstancetest/entry/src/main/ets/MainAbility/MainAbility.ts +++ b/ability/ability_runtime/processmultiinstance/actsamsprocessmultiinstancetest/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/processmultiinstance/actsamsprocessmultiinstancetest/entry/src/main/ets/TestAbility/TestAbility.ts b/ability/ability_runtime/processmultiinstance/actsamsprocessmultiinstancetest/entry/src/main/ets/TestAbility/TestAbility.ts index 89a847305..8028a70f8 100644 --- a/ability/ability_runtime/processmultiinstance/actsamsprocessmultiinstancetest/entry/src/main/ets/TestAbility/TestAbility.ts +++ b/ability/ability_runtime/processmultiinstance/actsamsprocessmultiinstancetest/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/actslifecyclemultihap2/entry/src/main/ets/Application/AbilityStage.ts b/ability/ability_runtime/stage/actslifecyclemultihap2/entry/src/main/ets/Application/AbilityStage.ts index 6ceb0c290..3745b4557 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 f203cde4e..3f69c6a93 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 fe58d0912..891a50570 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 a6b9102b9..4880de1b8 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 4a6039a3a..0edbe564b 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 266bf2aa2..28d2f949b 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 238a21eee..9a5252af1 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 50090b7b0..a008ee2ba 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 c2ceba502..137841008 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 8f7562032..0c3fb5303 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 7ce1fe750..d9ae704e6 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 396606ff7..9ee1aa9fb 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 c491aad5b..29a012705 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 7916120e2..4aa803ecf 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 b59387497..e5d06f663 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 38a0705fc..07f5d29b9 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 047c5575a..b686f1a17 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 9af9101ac..1fef23ae0 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 65fd87312..a82b5ea94 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 33f456c7a..7dc4350ce 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 789378bea..6b11ddecb 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 5bac3c2e4..ff7b81b7f 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 08a80dd11..c0c14332a 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 2feeecd86..d883d8e1b 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 89a847305..8028a70f8 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 396606ff7..9ee1aa9fb 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 5669014b8..935ed22be 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 95c0c9795..edf74a91e 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 0bd8bae9c..7ce8a676d 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 0827cc9ac..b641e36ef 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 2f474d0bc..cee1378d9 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 bb7c243e0..e970e2d51 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 4c6405de0..2493d8f97 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 3887f3b5f..f2428c6ea 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 c49d303ed..43bc4c405 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 075694f35..e19e6b769 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 4820224da..2e1cc20d7 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 68c13255e..6ccd88c3c 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 490df7590..8c9e2ed66 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 77591a437..540f18106 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 135c38552..8b004c16c 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 a49fe06fe..d408d7c38 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 76e6fea16..11584dba0 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 89a847305..8028a70f8 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 38a0705fc..07f5d29b9 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 047c5575a..b686f1a17 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 5c87a1b50..37fa54777 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 5f018c442..ae2dc2352 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 518d6118f..55a16bffd 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 29ef4b791..23ce92fa2 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 365e3faa1..6a86226b9 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 11d0f8607..91f542b00 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 82ff89474..c402acca3 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 89a847305..8028a70f8 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 396606ff7..9ee1aa9fb 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 5669014b8..935ed22be 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 7bfbd67ed..60151aede 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 0bd8bae9c..7ce8a676d 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 0827cc9ac..b641e36ef 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 2f474d0bc..cee1378d9 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 3ed184640..7aadcba72 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 113eddac3..43b317b0a 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 52724343d..81d4157e9 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 7b8c66d51..ae270ee20 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 075694f35..e19e6b769 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 5bebcb984..52e7ac3f3 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 654590c7d..c39238c8e 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 490df7590..8c9e2ed66 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 e3a1b85db..ca601c7dd 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 8405125c1..78411c870 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 ede5afac6..0fa17a471 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 c19116470..4f430382b 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 89a847305..8028a70f8 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 e88c656f8..2c9e6ad77 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 a6d9684bf..2cb7f3fa8 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 89a847305..8028a70f8 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/ability/ability_runtime/zidltest/actsamszidlclienttest/entry/src/main/ets/Application/AbilityStage.ts b/ability/ability_runtime/zidltest/actsamszidlclienttest/entry/src/main/ets/Application/AbilityStage.ts index 5e2915fe4..953114c1b 100644 --- a/ability/ability_runtime/zidltest/actsamszidlclienttest/entry/src/main/ets/Application/AbilityStage.ts +++ b/ability/ability_runtime/zidltest/actsamszidlclienttest/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/zidltest/actsamszidlclienttest/entry/src/main/ets/MainAbility/MainAbility.ts b/ability/ability_runtime/zidltest/actsamszidlclienttest/entry/src/main/ets/MainAbility/MainAbility.ts index 809b62491..0123f81b1 100644 --- a/ability/ability_runtime/zidltest/actsamszidlclienttest/entry/src/main/ets/MainAbility/MainAbility.ts +++ b/ability/ability_runtime/zidltest/actsamszidlclienttest/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/zidltest/actsamszidlclienttest/entry/src/main/ets/test/Ability.test.ets b/ability/ability_runtime/zidltest/actsamszidlclienttest/entry/src/main/ets/test/Ability.test.ets index 7c31cb698..87c351546 100644 --- a/ability/ability_runtime/zidltest/actsamszidlclienttest/entry/src/main/ets/test/Ability.test.ets +++ b/ability/ability_runtime/zidltest/actsamszidlclienttest/entry/src/main/ets/test/Ability.test.ets @@ -137,14 +137,14 @@ export default function abilityTest(abilityContext) { }; console.info('ZidlTest Client connectAbility start'); - connectionId = globalThis.abilityContext.connectAbility(wantMulti, paMultiConnect); + connectionId = globalThis.abilityContext.connectServiceExtensionAbility(wantMulti, paMultiConnect); console.info('ZidlTest Client connectAbility end connectionId = ' + connectionId); - connectionOnewayId = globalThis.abilityContext.connectAbility(wantMultiOneway, paMultiOnewayConnect); + connectionOnewayId = globalThis.abilityContext.connectServiceExtensionAbility(wantMultiOneway, paMultiOnewayConnect); console.info('ZidlTest Client connectAbility end connectionOnewayId = ' + connectionOnewayId); - connectionIdSingle = globalThis.abilityContext.connectAbility(wantSingle, paSingleConnect); + connectionIdSingle = globalThis.abilityContext.connectServiceExtensionAbility(wantSingle, paSingleConnect); console.info('ZidlTest Client connectAbility end connectionIdSingle = ' + connectionIdSingle); - connectionOnewayIdSingle = globalThis.abilityContext.connectAbility(wantSingleOneway, paSingleOnewayConnect); + connectionOnewayIdSingle = globalThis.abilityContext.connectServiceExtensionAbility(wantSingleOneway, paSingleOnewayConnect); console.info('ZidlTest Client connectAbility end connectionOnewayIdSingle = ' + connectionOnewayIdSingle); }) @@ -163,7 +163,7 @@ export default function abilityTest(abilityContext) { } } - globalThis.abilityContext.disconnectAbility(connectionId, (err) => { + globalThis.abilityContext.disconnectServiceExtensionAbility(connectionId, (err) => { console.info('ZidlTest Client disconnectAbility result ' + JSON.stringify(err)); connectionId = -1; testProxyMulti = null; @@ -171,7 +171,7 @@ export default function abilityTest(abilityContext) { checkDone(); }) - globalThis.abilityContext.disconnectAbility(connectionOnewayId, (err) => { + globalThis.abilityContext.disconnectServiceExtensionAbility(connectionOnewayId, (err) => { console.info('ZidlTest Client disconnectAbility2 result ' + JSON.stringify(err)); connectionOnewayId = -1; testProxyMultiOneway = null; @@ -179,7 +179,7 @@ export default function abilityTest(abilityContext) { checkDone(); }) - globalThis.abilityContext.disconnectAbility(connectionIdSingle, (err) => { + globalThis.abilityContext.disconnectServiceExtensionAbility(connectionIdSingle, (err) => { console.info('ZidlTest Client disconnectAbility result ' + JSON.stringify(err)); connectionIdSingle = -1; testProxyMulti = null; @@ -187,7 +187,7 @@ export default function abilityTest(abilityContext) { checkDone(); }) - globalThis.abilityContext.disconnectAbility(connectionOnewayIdSingle, (err) => { + globalThis.abilityContext.disconnectServiceExtensionAbility(connectionOnewayIdSingle, (err) => { console.info('ZidlTest Client disconnectAbility2 result ' + JSON.stringify(err)); connectionOnewayIdSingle = -1; testProxyMultiOneway = null; diff --git a/ability/ability_runtime/zidltest/actsamszidlservice/entry/src/main/ets/Application/AbilityStage.ts b/ability/ability_runtime/zidltest/actsamszidlservice/entry/src/main/ets/Application/AbilityStage.ts index 98eb012db..a41751fb1 100644 --- a/ability/ability_runtime/zidltest/actsamszidlservice/entry/src/main/ets/Application/AbilityStage.ts +++ b/ability/ability_runtime/zidltest/actsamszidlservice/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/zidltest/actsamszidlservice/entry/src/main/ets/MainAbility/MainAbility.ts b/ability/ability_runtime/zidltest/actsamszidlservice/entry/src/main/ets/MainAbility/MainAbility.ts index 3b14eab61..12e4e6d21 100644 --- a/ability/ability_runtime/zidltest/actsamszidlservice/entry/src/main/ets/MainAbility/MainAbility.ts +++ b/ability/ability_runtime/zidltest/actsamszidlservice/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/account/appaccount/actsaccounttstest/entry/src/main/ets/Application/AbilityStage.ts b/account/appaccount/actsaccounttstest/entry/src/main/ets/Application/AbilityStage.ts index 32dfe93cc..11200f672 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 cd47e0225..8ac9f56ff 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 89a847305..8028a70f8 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_component_apilack/entry/src/main/ets/MainAbility/pages/storage.ets b/arkui/ace_ets_component_apilack/entry/src/main/ets/MainAbility/pages/storage.ets index 0ff3d695a..2b80ef98b 100644 --- a/arkui/ace_ets_component_apilack/entry/src/main/ets/MainAbility/pages/storage.ets +++ b/arkui/ace_ets_component_apilack/entry/src/main/ets/MainAbility/pages/storage.ets @@ -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 { storage : LocalStorage onCreate(want) { 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 e3fdadfeb..b0e0206ea 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 59523bc6f..cfe767269 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 e3fdadfeb..b0e0206ea 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 59523bc6f..cfe767269 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 e3fdadfeb..b0e0206ea 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 59523bc6f..cfe767269 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 c429c3de0..0668cd3e9 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/barrierfree/accessibilityconfig/entry/src/main/ets/Application/AbilityStage.ts b/barrierfree/accessibilityconfig/entry/src/main/ets/Application/AbilityStage.ts index 071c0d862..d617b713d 100644 --- a/barrierfree/accessibilityconfig/entry/src/main/ets/Application/AbilityStage.ts +++ b/barrierfree/accessibilityconfig/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/barrierfree/accessibilityconfig/entry/src/main/ets/MainAbility/MainAbility.ts b/barrierfree/accessibilityconfig/entry/src/main/ets/MainAbility/MainAbility.ts index e5dba418d..6818792bc 100644 --- a/barrierfree/accessibilityconfig/entry/src/main/ets/MainAbility/MainAbility.ts +++ b/barrierfree/accessibilityconfig/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/barrierfree/accessibilityconfig/entry/src/main/ets/TestAbility/TestAbility.ts b/barrierfree/accessibilityconfig/entry/src/main/ets/TestAbility/TestAbility.ts index 89a847305..8028a70f8 100644 --- a/barrierfree/accessibilityconfig/entry/src/main/ets/TestAbility/TestAbility.ts +++ b/barrierfree/accessibilityconfig/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/barrierfree/accessibilityconfigreqreadpermission/entry/src/main/ets/Application/AbilityStage.ts b/barrierfree/accessibilityconfigreqreadpermission/entry/src/main/ets/Application/AbilityStage.ts index 071c0d862..d617b713d 100644 --- a/barrierfree/accessibilityconfigreqreadpermission/entry/src/main/ets/Application/AbilityStage.ts +++ b/barrierfree/accessibilityconfigreqreadpermission/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/barrierfree/accessibilityconfigreqreadpermission/entry/src/main/ets/MainAbility/MainAbility.ts b/barrierfree/accessibilityconfigreqreadpermission/entry/src/main/ets/MainAbility/MainAbility.ts index d12485060..5683d05fb 100644 --- a/barrierfree/accessibilityconfigreqreadpermission/entry/src/main/ets/MainAbility/MainAbility.ts +++ b/barrierfree/accessibilityconfigreqreadpermission/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/barrierfree/accessibilityconfigreqreadpermission/entry/src/main/ets/TestAbility/TestAbility.ts b/barrierfree/accessibilityconfigreqreadpermission/entry/src/main/ets/TestAbility/TestAbility.ts index 75889c25d..ca3d77d21 100644 --- a/barrierfree/accessibilityconfigreqreadpermission/entry/src/main/ets/TestAbility/TestAbility.ts +++ b/barrierfree/accessibilityconfigreqreadpermission/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/barrierfree/accessibilityconfigreqwritepermission/entry/src/main/ets/Application/AbilityStage.ts b/barrierfree/accessibilityconfigreqwritepermission/entry/src/main/ets/Application/AbilityStage.ts index 071c0d862..d617b713d 100644 --- a/barrierfree/accessibilityconfigreqwritepermission/entry/src/main/ets/Application/AbilityStage.ts +++ b/barrierfree/accessibilityconfigreqwritepermission/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/barrierfree/accessibilityconfigreqwritepermission/entry/src/main/ets/MainAbility/MainAbility.ts b/barrierfree/accessibilityconfigreqwritepermission/entry/src/main/ets/MainAbility/MainAbility.ts index f9014b87a..7e6de36c2 100644 --- a/barrierfree/accessibilityconfigreqwritepermission/entry/src/main/ets/MainAbility/MainAbility.ts +++ b/barrierfree/accessibilityconfigreqwritepermission/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/barrierfree/accessibilityconfigreqwritepermission/entry/src/main/ets/TestAbility/TestAbility.ts b/barrierfree/accessibilityconfigreqwritepermission/entry/src/main/ets/TestAbility/TestAbility.ts index 78935adb8..cf3c10e05 100644 --- a/barrierfree/accessibilityconfigreqwritepermission/entry/src/main/ets/TestAbility/TestAbility.ts +++ b/barrierfree/accessibilityconfigreqwritepermission/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/barrierfree/accessibilityelement/entry/src/main/ets/Application/AbilityStage.ts b/barrierfree/accessibilityelement/entry/src/main/ets/Application/AbilityStage.ts index 1535a6b50..bda78b218 100644 --- a/barrierfree/accessibilityelement/entry/src/main/ets/Application/AbilityStage.ts +++ b/barrierfree/accessibilityelement/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/barrierfree/accessibilityelement/entry/src/main/ets/MainAbility/MainAbility.ts b/barrierfree/accessibilityelement/entry/src/main/ets/MainAbility/MainAbility.ts index cd47e0225..8ac9f56ff 100644 --- a/barrierfree/accessibilityelement/entry/src/main/ets/MainAbility/MainAbility.ts +++ b/barrierfree/accessibilityelement/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/barrierfree/accessibilityelement/entry/src/main/ets/TestAbility/TestAbility.ts b/barrierfree/accessibilityelement/entry/src/main/ets/TestAbility/TestAbility.ts index 89a847305..8028a70f8 100644 --- a/barrierfree/accessibilityelement/entry/src/main/ets/TestAbility/TestAbility.ts +++ b/barrierfree/accessibilityelement/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/barrierfree/accessibilityerrcode/entry/src/main/ets/Application/AbilityStage.ts b/barrierfree/accessibilityerrcode/entry/src/main/ets/Application/AbilityStage.ts index 071c0d862..d617b713d 100644 --- a/barrierfree/accessibilityerrcode/entry/src/main/ets/Application/AbilityStage.ts +++ b/barrierfree/accessibilityerrcode/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/barrierfree/accessibilityerrcode/entry/src/main/ets/MainAbility/MainAbility.ts b/barrierfree/accessibilityerrcode/entry/src/main/ets/MainAbility/MainAbility.ts index f9014b87a..7e6de36c2 100644 --- a/barrierfree/accessibilityerrcode/entry/src/main/ets/MainAbility/MainAbility.ts +++ b/barrierfree/accessibilityerrcode/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/barrierfree/accessibilityerrcode/entry/src/main/ets/TestAbility/TestAbility.ts b/barrierfree/accessibilityerrcode/entry/src/main/ets/TestAbility/TestAbility.ts index 78935adb8..cf3c10e05 100644 --- a/barrierfree/accessibilityerrcode/entry/src/main/ets/TestAbility/TestAbility.ts +++ b/barrierfree/accessibilityerrcode/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/barrierfree/accessibilityevent/entry/src/main/ets/Application/AbilityStage.ts b/barrierfree/accessibilityevent/entry/src/main/ets/Application/AbilityStage.ts index 1535a6b50..bda78b218 100644 --- a/barrierfree/accessibilityevent/entry/src/main/ets/Application/AbilityStage.ts +++ b/barrierfree/accessibilityevent/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/barrierfree/accessibilityevent/entry/src/main/ets/MainAbility/MainAbility.ts b/barrierfree/accessibilityevent/entry/src/main/ets/MainAbility/MainAbility.ts index 83c05cfb5..cb372b94f 100644 --- a/barrierfree/accessibilityevent/entry/src/main/ets/MainAbility/MainAbility.ts +++ b/barrierfree/accessibilityevent/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/barrierfree/accessibilityevent/entry/src/main/ets/TestAbility/TestAbility.ts b/barrierfree/accessibilityevent/entry/src/main/ets/TestAbility/TestAbility.ts index 89a847305..8028a70f8 100644 --- a/barrierfree/accessibilityevent/entry/src/main/ets/TestAbility/TestAbility.ts +++ b/barrierfree/accessibilityevent/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/barrierfree/accessibilityextension/entry/src/main/ets/Application/AbilityStage.ts b/barrierfree/accessibilityextension/entry/src/main/ets/Application/AbilityStage.ts index 1535a6b50..bda78b218 100644 --- a/barrierfree/accessibilityextension/entry/src/main/ets/Application/AbilityStage.ts +++ b/barrierfree/accessibilityextension/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/barrierfree/accessibilityextension/entry/src/main/ets/MainAbility/MainAbility.ts b/barrierfree/accessibilityextension/entry/src/main/ets/MainAbility/MainAbility.ts index 905eef254..14e46c6be 100644 --- a/barrierfree/accessibilityextension/entry/src/main/ets/MainAbility/MainAbility.ts +++ b/barrierfree/accessibilityextension/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/barrierfree/accessibilityextension/entry/src/main/ets/TestAbility/TestAbility.ts b/barrierfree/accessibilityextension/entry/src/main/ets/TestAbility/TestAbility.ts index 89a847305..8028a70f8 100644 --- a/barrierfree/accessibilityextension/entry/src/main/ets/TestAbility/TestAbility.ts +++ b/barrierfree/accessibilityextension/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/barrierfree/accessibilityextensioncontext/entry/src/main/ets/Application/AbilityStage.ts b/barrierfree/accessibilityextensioncontext/entry/src/main/ets/Application/AbilityStage.ts index 32dfe93cc..11200f672 100644 --- a/barrierfree/accessibilityextensioncontext/entry/src/main/ets/Application/AbilityStage.ts +++ b/barrierfree/accessibilityextensioncontext/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/barrierfree/accessibilityextensioncontext/entry/src/main/ets/MainAbility/MainAbility.ts b/barrierfree/accessibilityextensioncontext/entry/src/main/ets/MainAbility/MainAbility.ts index 40427aad1..ae734bfbe 100644 --- a/barrierfree/accessibilityextensioncontext/entry/src/main/ets/MainAbility/MainAbility.ts +++ b/barrierfree/accessibilityextensioncontext/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/barrierfree/accessibilityextensioncontext/entry/src/main/ets/TestAbility/TestAbility.ts b/barrierfree/accessibilityextensioncontext/entry/src/main/ets/TestAbility/TestAbility.ts index 89a847305..8028a70f8 100644 --- a/barrierfree/accessibilityextensioncontext/entry/src/main/ets/TestAbility/TestAbility.ts +++ b/barrierfree/accessibilityextensioncontext/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/barrierfree/accessibilityextensioncontextcaperrcode/entry/src/main/ets/Application/AbilityStage.ts b/barrierfree/accessibilityextensioncontextcaperrcode/entry/src/main/ets/Application/AbilityStage.ts index 8a1acf6be..863c2e610 100644 --- a/barrierfree/accessibilityextensioncontextcaperrcode/entry/src/main/ets/Application/AbilityStage.ts +++ b/barrierfree/accessibilityextensioncontextcaperrcode/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/barrierfree/accessibilityextensioncontextcaperrcode/entry/src/main/ets/MainAbility/MainAbility.ts b/barrierfree/accessibilityextensioncontextcaperrcode/entry/src/main/ets/MainAbility/MainAbility.ts index 40427aad1..ae734bfbe 100644 --- a/barrierfree/accessibilityextensioncontextcaperrcode/entry/src/main/ets/MainAbility/MainAbility.ts +++ b/barrierfree/accessibilityextensioncontextcaperrcode/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/barrierfree/accessibilityextensioncontextcaperrcode/entry/src/main/ets/TestAbility/TestAbility.ts b/barrierfree/accessibilityextensioncontextcaperrcode/entry/src/main/ets/TestAbility/TestAbility.ts index 75889c25d..ca3d77d21 100644 --- a/barrierfree/accessibilityextensioncontextcaperrcode/entry/src/main/ets/TestAbility/TestAbility.ts +++ b/barrierfree/accessibilityextensioncontextcaperrcode/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/barrierfree/accessibilitygestureevent/entry/src/main/ets/Application/AbilityStage.ts b/barrierfree/accessibilitygestureevent/entry/src/main/ets/Application/AbilityStage.ts index 32dfe93cc..11200f672 100644 --- a/barrierfree/accessibilitygestureevent/entry/src/main/ets/Application/AbilityStage.ts +++ b/barrierfree/accessibilitygestureevent/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/barrierfree/accessibilitygestureevent/entry/src/main/ets/MainAbility/MainAbility.ts b/barrierfree/accessibilitygestureevent/entry/src/main/ets/MainAbility/MainAbility.ts index cd47e0225..8ac9f56ff 100644 --- a/barrierfree/accessibilitygestureevent/entry/src/main/ets/MainAbility/MainAbility.ts +++ b/barrierfree/accessibilitygestureevent/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/barrierfree/accessibilitygestureevent/entry/src/main/ets/TestAbility/TestAbility.ts b/barrierfree/accessibilitygestureevent/entry/src/main/ets/TestAbility/TestAbility.ts index 89a847305..8028a70f8 100644 --- a/barrierfree/accessibilitygestureevent/entry/src/main/ets/TestAbility/TestAbility.ts +++ b/barrierfree/accessibilitygestureevent/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/barrierfree/accessibilitysendaccessibilityevent/entry/src/main/ets/Application/AbilityStage.ts b/barrierfree/accessibilitysendaccessibilityevent/entry/src/main/ets/Application/AbilityStage.ts index 071c0d862..d617b713d 100644 --- a/barrierfree/accessibilitysendaccessibilityevent/entry/src/main/ets/Application/AbilityStage.ts +++ b/barrierfree/accessibilitysendaccessibilityevent/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/barrierfree/accessibilitysendaccessibilityevent/entry/src/main/ets/MainAbility/MainAbility.ts b/barrierfree/accessibilitysendaccessibilityevent/entry/src/main/ets/MainAbility/MainAbility.ts index f9014b87a..7e6de36c2 100644 --- a/barrierfree/accessibilitysendaccessibilityevent/entry/src/main/ets/MainAbility/MainAbility.ts +++ b/barrierfree/accessibilitysendaccessibilityevent/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/barrierfree/accessibilitysendaccessibilityevent/entry/src/main/ets/TestAbility/TestAbility.ts b/barrierfree/accessibilitysendaccessibilityevent/entry/src/main/ets/TestAbility/TestAbility.ts index 78935adb8..cf3c10e05 100644 --- a/barrierfree/accessibilitysendaccessibilityevent/entry/src/main/ets/TestAbility/TestAbility.ts +++ b/barrierfree/accessibilitysendaccessibilityevent/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/barrierfree/accessibletest/actsabilitylisttest/entry/src/main/ets/Application/AbilityStage.ts b/barrierfree/accessibletest/actsabilitylisttest/entry/src/main/ets/Application/AbilityStage.ts index 4972d0cb7..d9b08bc02 100644 --- a/barrierfree/accessibletest/actsabilitylisttest/entry/src/main/ets/Application/AbilityStage.ts +++ b/barrierfree/accessibletest/actsabilitylisttest/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/barrierfree/accessibletest/actsabilitylisttest/entry/src/main/ets/MainAbility/MainAbility.ts b/barrierfree/accessibletest/actsabilitylisttest/entry/src/main/ets/MainAbility/MainAbility.ts index b17fcff20..75bdbf7f1 100644 --- a/barrierfree/accessibletest/actsabilitylisttest/entry/src/main/ets/MainAbility/MainAbility.ts +++ b/barrierfree/accessibletest/actsabilitylisttest/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) { diff --git a/barrierfree/accessibletest/actsabilitylisttest/entry/src/main/ets/TestAbility/TestAbility.ts b/barrierfree/accessibletest/actsabilitylisttest/entry/src/main/ets/TestAbility/TestAbility.ts index 20877f79a..cf4649270 100644 --- a/barrierfree/accessibletest/actsabilitylisttest/entry/src/main/ets/TestAbility/TestAbility.ts +++ b/barrierfree/accessibletest/actsabilitylisttest/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/barrierfree/accessibletest/actscaptionconfigurationtest/entry/src/main/ets/Application/AbilityStage.ts b/barrierfree/accessibletest/actscaptionconfigurationtest/entry/src/main/ets/Application/AbilityStage.ts index add36a172..8ad9d8545 100644 --- a/barrierfree/accessibletest/actscaptionconfigurationtest/entry/src/main/ets/Application/AbilityStage.ts +++ b/barrierfree/accessibletest/actscaptionconfigurationtest/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() { console.info("[Demo] MyAbilityStage onCreate") diff --git a/barrierfree/accessibletest/actscaptionconfigurationtest/entry/src/main/ets/MainAbility/MainAbility.ts b/barrierfree/accessibletest/actscaptionconfigurationtest/entry/src/main/ets/MainAbility/MainAbility.ts index 871643e56..da216c87a 100644 --- a/barrierfree/accessibletest/actscaptionconfigurationtest/entry/src/main/ets/MainAbility/MainAbility.ts +++ b/barrierfree/accessibletest/actscaptionconfigurationtest/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) { diff --git a/barrierfree/accessibletest/actscaptionconfigurationtest/entry/src/main/ets/TestAbility/TestAbility.ts b/barrierfree/accessibletest/actscaptionconfigurationtest/entry/src/main/ets/TestAbility/TestAbility.ts index 20877f79a..cf4649270 100644 --- a/barrierfree/accessibletest/actscaptionconfigurationtest/entry/src/main/ets/TestAbility/TestAbility.ts +++ b/barrierfree/accessibletest/actscaptionconfigurationtest/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/barrierfree/accessibletest/actsgesturesimulationtest/entry/src/main/ets/Application/AbilityStage.ts b/barrierfree/accessibletest/actsgesturesimulationtest/entry/src/main/ets/Application/AbilityStage.ts index f6de13d0d..5133cc1f1 100644 --- a/barrierfree/accessibletest/actsgesturesimulationtest/entry/src/main/ets/Application/AbilityStage.ts +++ b/barrierfree/accessibletest/actsgesturesimulationtest/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/barrierfree/accessibletest/actsgesturesimulationtest/entry/src/main/ets/MainAbility/MainAbility.ts b/barrierfree/accessibletest/actsgesturesimulationtest/entry/src/main/ets/MainAbility/MainAbility.ts index 871643e56..da216c87a 100644 --- a/barrierfree/accessibletest/actsgesturesimulationtest/entry/src/main/ets/MainAbility/MainAbility.ts +++ b/barrierfree/accessibletest/actsgesturesimulationtest/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) { diff --git a/barrierfree/accessibletest/actsgesturesimulationtest/entry/src/main/ets/TestAbility/TestAbility.ts b/barrierfree/accessibletest/actsgesturesimulationtest/entry/src/main/ets/TestAbility/TestAbility.ts index 20877f79a..cf4649270 100644 --- a/barrierfree/accessibletest/actsgesturesimulationtest/entry/src/main/ets/TestAbility/TestAbility.ts +++ b/barrierfree/accessibletest/actsgesturesimulationtest/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/barrierfree/accessibletest/sceneProject/accessibilityAudibleAbility/entry/src/main/ets/Application/AbilityStage.ts b/barrierfree/accessibletest/sceneProject/accessibilityAudibleAbility/entry/src/main/ets/Application/AbilityStage.ts index 3788aefd2..137607a56 100644 --- a/barrierfree/accessibletest/sceneProject/accessibilityAudibleAbility/entry/src/main/ets/Application/AbilityStage.ts +++ b/barrierfree/accessibletest/sceneProject/accessibilityAudibleAbility/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/barrierfree/accessibletest/sceneProject/accessibilityAudibleAbility/entry/src/main/ets/MainAbility/MainAbility.ts b/barrierfree/accessibletest/sceneProject/accessibilityAudibleAbility/entry/src/main/ets/MainAbility/MainAbility.ts index 1cc33db63..e457452c6 100644 --- a/barrierfree/accessibletest/sceneProject/accessibilityAudibleAbility/entry/src/main/ets/MainAbility/MainAbility.ts +++ b/barrierfree/accessibletest/sceneProject/accessibilityAudibleAbility/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/barrierfree/accessibletest/sceneProject/accessibilityGenericAbility/entry/src/main/ets/Application/AbilityStage.ts b/barrierfree/accessibletest/sceneProject/accessibilityGenericAbility/entry/src/main/ets/Application/AbilityStage.ts index 14b999a57..3431a052d 100644 --- a/barrierfree/accessibletest/sceneProject/accessibilityGenericAbility/entry/src/main/ets/Application/AbilityStage.ts +++ b/barrierfree/accessibletest/sceneProject/accessibilityGenericAbility/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/barrierfree/accessibletest/sceneProject/accessibilityGenericAbility/entry/src/main/ets/MainAbility/MainAbility.ts b/barrierfree/accessibletest/sceneProject/accessibilityGenericAbility/entry/src/main/ets/MainAbility/MainAbility.ts index faa3d8f62..6f7a5bcaf 100644 --- a/barrierfree/accessibletest/sceneProject/accessibilityGenericAbility/entry/src/main/ets/MainAbility/MainAbility.ts +++ b/barrierfree/accessibletest/sceneProject/accessibilityGenericAbility/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/barrierfree/accessibletest/sceneProject/accessibilityHapticAbility/entry/src/main/ets/Application/AbilityStage.ts b/barrierfree/accessibletest/sceneProject/accessibilityHapticAbility/entry/src/main/ets/Application/AbilityStage.ts index eb46727c4..33d9873a2 100644 --- a/barrierfree/accessibletest/sceneProject/accessibilityHapticAbility/entry/src/main/ets/Application/AbilityStage.ts +++ b/barrierfree/accessibletest/sceneProject/accessibilityHapticAbility/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/barrierfree/accessibletest/sceneProject/accessibilityHapticAbility/entry/src/main/ets/MainAbility/MainAbility.ts b/barrierfree/accessibletest/sceneProject/accessibilityHapticAbility/entry/src/main/ets/MainAbility/MainAbility.ts index 5a19cec08..3af54df4d 100644 --- a/barrierfree/accessibletest/sceneProject/accessibilityHapticAbility/entry/src/main/ets/MainAbility/MainAbility.ts +++ b/barrierfree/accessibletest/sceneProject/accessibilityHapticAbility/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/barrierfree/accessibletest/sceneProject/accessibilitySpokenAbility/entry/src/main/ets/Application/AbilityStage.ts b/barrierfree/accessibletest/sceneProject/accessibilitySpokenAbility/entry/src/main/ets/Application/AbilityStage.ts index b57816d1c..e5db01608 100644 --- a/barrierfree/accessibletest/sceneProject/accessibilitySpokenAbility/entry/src/main/ets/Application/AbilityStage.ts +++ b/barrierfree/accessibletest/sceneProject/accessibilitySpokenAbility/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/barrierfree/accessibletest/sceneProject/accessibilitySpokenAbility/entry/src/main/ets/MainAbility/MainAbility.ts b/barrierfree/accessibletest/sceneProject/accessibilitySpokenAbility/entry/src/main/ets/MainAbility/MainAbility.ts index a28eed3fa..08c0fc02e 100644 --- a/barrierfree/accessibletest/sceneProject/accessibilitySpokenAbility/entry/src/main/ets/MainAbility/MainAbility.ts +++ b/barrierfree/accessibletest/sceneProject/accessibilitySpokenAbility/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/barrierfree/accessibletest/sceneProject/accessibilityVisualAbility/entry/src/main/ets/Application/AbilityStage.ts b/barrierfree/accessibletest/sceneProject/accessibilityVisualAbility/entry/src/main/ets/Application/AbilityStage.ts index 36f6b6d60..376b3155b 100644 --- a/barrierfree/accessibletest/sceneProject/accessibilityVisualAbility/entry/src/main/ets/Application/AbilityStage.ts +++ b/barrierfree/accessibletest/sceneProject/accessibilityVisualAbility/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/barrierfree/accessibletest/sceneProject/accessibilityVisualAbility/entry/src/main/ets/MainAbility/MainAbility.ts b/barrierfree/accessibletest/sceneProject/accessibilityVisualAbility/entry/src/main/ets/MainAbility/MainAbility.ts index 9f7a95429..9773dca59 100644 --- a/barrierfree/accessibletest/sceneProject/accessibilityVisualAbility/entry/src/main/ets/MainAbility/MainAbility.ts +++ b/barrierfree/accessibletest/sceneProject/accessibilityVisualAbility/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/barrierfree/targetProject/aceTest/entry/src/main/ets/Application/AbilityStage.ts b/barrierfree/targetProject/aceTest/entry/src/main/ets/Application/AbilityStage.ts index 32dfe93cc..11200f672 100644 --- a/barrierfree/targetProject/aceTest/entry/src/main/ets/Application/AbilityStage.ts +++ b/barrierfree/targetProject/aceTest/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/barrierfree/targetProject/aceTest/entry/src/main/ets/MainAbility/MainAbility.ts b/barrierfree/targetProject/aceTest/entry/src/main/ets/MainAbility/MainAbility.ts index dad945382..f3209abfc 100644 --- a/barrierfree/targetProject/aceTest/entry/src/main/ets/MainAbility/MainAbility.ts +++ b/barrierfree/targetProject/aceTest/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/bundlemanager/bundle_standard/bundlemanager/actsbundlemanagerstagetest/entry/src/main/ets/Application/AbilityStage.ts b/bundlemanager/bundle_standard/bundlemanager/actsbundlemanagerstagetest/entry/src/main/ets/Application/AbilityStage.ts index 51cb02ba3..cbcc939ff 100755 --- a/bundlemanager/bundle_standard/bundlemanager/actsbundlemanagerstagetest/entry/src/main/ets/Application/AbilityStage.ts +++ b/bundlemanager/bundle_standard/bundlemanager/actsbundlemanagerstagetest/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/bundlemanager/bundle_standard/bundlemanager/actsbundlemanagerstagetest/entry/src/main/ets/MainAbility/MainAbility.ts b/bundlemanager/bundle_standard/bundlemanager/actsbundlemanagerstagetest/entry/src/main/ets/MainAbility/MainAbility.ts index 87b6463a2..48fba3a5f 100755 --- a/bundlemanager/bundle_standard/bundlemanager/actsbundlemanagerstagetest/entry/src/main/ets/MainAbility/MainAbility.ts +++ b/bundlemanager/bundle_standard/bundlemanager/actsbundlemanagerstagetest/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/bundlemanager/bundle_standard/bundlemanager/actsbundlemanagerstagetest/entry/src/main/ets/TestAbility/TestAbility.ts b/bundlemanager/bundle_standard/bundlemanager/actsbundlemanagerstagetest/entry/src/main/ets/TestAbility/TestAbility.ts index fb7ef2b1e..3e2d601de 100755 --- a/bundlemanager/bundle_standard/bundlemanager/actsbundlemanagerstagetest/entry/src/main/ets/TestAbility/TestAbility.ts +++ b/bundlemanager/bundle_standard/bundlemanager/actsbundlemanagerstagetest/entry/src/main/ets/TestAbility/TestAbility.ts @@ -1,4 +1,4 @@ -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/bundlemanager/bundle_standard/bundlemanager/sceneProject/bmsstagedemoone/entry/src/main/ets/Application/AbilityStage.ts b/bundlemanager/bundle_standard/bundlemanager/sceneProject/bmsstagedemoone/entry/src/main/ets/Application/AbilityStage.ts index 51cb02ba3..cbcc939ff 100644 --- a/bundlemanager/bundle_standard/bundlemanager/sceneProject/bmsstagedemoone/entry/src/main/ets/Application/AbilityStage.ts +++ b/bundlemanager/bundle_standard/bundlemanager/sceneProject/bmsstagedemoone/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/bundlemanager/bundle_standard/bundlemanager/sceneProject/bmsstagedemoone/entry/src/main/ets/MainAbility/MainAbility.ts b/bundlemanager/bundle_standard/bundlemanager/sceneProject/bmsstagedemoone/entry/src/main/ets/MainAbility/MainAbility.ts index 2f9d6d1f2..266fcd859 100644 --- a/bundlemanager/bundle_standard/bundlemanager/sceneProject/bmsstagedemoone/entry/src/main/ets/MainAbility/MainAbility.ts +++ b/bundlemanager/bundle_standard/bundlemanager/sceneProject/bmsstagedemoone/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/bundlemanager/bundle_standard/bundlemanager/sceneProject/bmsstagedemotwo/entry/src/main/ets/Application/AbilityStage.ts b/bundlemanager/bundle_standard/bundlemanager/sceneProject/bmsstagedemotwo/entry/src/main/ets/Application/AbilityStage.ts index 51cb02ba3..cbcc939ff 100644 --- a/bundlemanager/bundle_standard/bundlemanager/sceneProject/bmsstagedemotwo/entry/src/main/ets/Application/AbilityStage.ts +++ b/bundlemanager/bundle_standard/bundlemanager/sceneProject/bmsstagedemotwo/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/bundlemanager/bundle_standard/bundlemanager/sceneProject/bmsstagedemotwo/entry/src/main/ets/MainAbility/MainAbility.ts b/bundlemanager/bundle_standard/bundlemanager/sceneProject/bmsstagedemotwo/entry/src/main/ets/MainAbility/MainAbility.ts index 2f9d6d1f2..266fcd859 100644 --- a/bundlemanager/bundle_standard/bundlemanager/sceneProject/bmsstagedemotwo/entry/src/main/ets/MainAbility/MainAbility.ts +++ b/bundlemanager/bundle_standard/bundlemanager/sceneProject/bmsstagedemotwo/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/distributeddatamgr/relationalStoretest/relationalStoreStagetest/entry/src/main/ets/Application/AbilityStage.ts b/distributeddatamgr/relationalStoretest/relationalStoreStagetest/entry/src/main/ets/Application/AbilityStage.ts index 02ecba3c3..582953b77 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 cc6fdc5ef..fb807f8be 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 89a847305..8028a70f8 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 e3fdadfeb..b0e0206ea 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 8b12c6e3c..44e7f26fa 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 e3fdadfeb..b0e0206ea 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 c3b2b245c..4d66065e8 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 89a847305..8028a70f8 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 e3fdadfeb..b0e0206ea 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 c3b2b245c..4d66065e8 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 89a847305..8028a70f8 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 ad2394a37..06606ff0a 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 f5a5c13a6..e09d30e86 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 36a8a495d..f5c927f73 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 1ddf22a98..ff7ec1c31 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_album/entry/src/main/ets/Application/AbilityStage.ts b/multimedia/medialibrary/mediaLibrary_album/entry/src/main/ets/Application/AbilityStage.ts index 14f230e14..9df3a8d75 100755 --- a/multimedia/medialibrary/mediaLibrary_album/entry/src/main/ets/Application/AbilityStage.ts +++ b/multimedia/medialibrary/mediaLibrary_album/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_album/entry/src/main/ets/MainAbility/MainAbility.ts b/multimedia/medialibrary/mediaLibrary_album/entry/src/main/ets/MainAbility/MainAbility.ts index 72b03d747..8a2d100df 100755 --- a/multimedia/medialibrary/mediaLibrary_album/entry/src/main/ets/MainAbility/MainAbility.ts +++ b/multimedia/medialibrary/mediaLibrary_album/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_base/entry/src/main/ets/Application/AbilityStage.ts b/multimedia/medialibrary/mediaLibrary_base/entry/src/main/ets/Application/AbilityStage.ts index 51cb02ba3..cbcc939ff 100755 --- 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_base/entry/src/main/ets/MainAbility/MainAbility.ts b/multimedia/medialibrary/mediaLibrary_base/entry/src/main/ets/MainAbility/MainAbility.ts index 2f9d6d1f2..266fcd859 100755 --- a/multimedia/medialibrary/mediaLibrary_base/entry/src/main/ets/MainAbility/MainAbility.ts +++ b/multimedia/medialibrary/mediaLibrary_base/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_favorite/entry/src/main/ets/Application/AbilityStage.ts b/multimedia/medialibrary/mediaLibrary_favorite/entry/src/main/ets/Application/AbilityStage.ts index 14f230e14..9df3a8d75 100755 --- a/multimedia/medialibrary/mediaLibrary_favorite/entry/src/main/ets/Application/AbilityStage.ts +++ b/multimedia/medialibrary/mediaLibrary_favorite/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_favorite/entry/src/main/ets/MainAbility/MainAbility.ts b/multimedia/medialibrary/mediaLibrary_favorite/entry/src/main/ets/MainAbility/MainAbility.ts index 72b03d747..8a2d100df 100755 --- a/multimedia/medialibrary/mediaLibrary_favorite/entry/src/main/ets/MainAbility/MainAbility.ts +++ b/multimedia/medialibrary/mediaLibrary_favorite/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_file/entry/src/main/ets/Application/AbilityStage.ts b/multimedia/medialibrary/mediaLibrary_file/entry/src/main/ets/Application/AbilityStage.ts index 14f230e14..9df3a8d75 100755 --- a/multimedia/medialibrary/mediaLibrary_file/entry/src/main/ets/Application/AbilityStage.ts +++ b/multimedia/medialibrary/mediaLibrary_file/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_file/entry/src/main/ets/MainAbility/MainAbility.ts b/multimedia/medialibrary/mediaLibrary_file/entry/src/main/ets/MainAbility/MainAbility.ts index 72b03d747..8a2d100df 100755 --- a/multimedia/medialibrary/mediaLibrary_file/entry/src/main/ets/MainAbility/MainAbility.ts +++ b/multimedia/medialibrary/mediaLibrary_file/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_fileAsset/entry/src/main/ets/Application/AbilityStage.ts b/multimedia/medialibrary/mediaLibrary_fileAsset/entry/src/main/ets/Application/AbilityStage.ts index 51cb02ba3..cbcc939ff 100755 --- 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 2f9d6d1f2..266fcd859 100755 --- 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 51cb02ba3..cbcc939ff 100755 --- 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 2f9d6d1f2..266fcd859 100755 --- 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_fileResult/entry/src/main/ets/Application/AbilityStage.ts b/multimedia/medialibrary/mediaLibrary_fileResult/entry/src/main/ets/Application/AbilityStage.ts index 14f230e14..9df3a8d75 100755 --- a/multimedia/medialibrary/mediaLibrary_fileResult/entry/src/main/ets/Application/AbilityStage.ts +++ b/multimedia/medialibrary/mediaLibrary_fileResult/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_fileResult/entry/src/main/ets/MainAbility/MainAbility.ts b/multimedia/medialibrary/mediaLibrary_fileResult/entry/src/main/ets/MainAbility/MainAbility.ts index 72b03d747..8a2d100df 100755 --- a/multimedia/medialibrary/mediaLibrary_fileResult/entry/src/main/ets/MainAbility/MainAbility.ts +++ b/multimedia/medialibrary/mediaLibrary_fileResult/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 51cb02ba3..cbcc939ff 100755 --- 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 2f9d6d1f2..266fcd859 100755 --- 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 51cb02ba3..cbcc939ff 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 2f9d6d1f2..266fcd859 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 51cb02ba3..cbcc939ff 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 2f9d6d1f2..266fcd859 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/multimedia/userfilemgr/userfilemgr_album/entry/src/main/ets/Application/AbilityStage.ts b/multimedia/userfilemgr/userfilemgr_album/entry/src/main/ets/Application/AbilityStage.ts index 14f230e14..9df3a8d75 100755 --- a/multimedia/userfilemgr/userfilemgr_album/entry/src/main/ets/Application/AbilityStage.ts +++ b/multimedia/userfilemgr/userfilemgr_album/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/userfilemgr/userfilemgr_album/entry/src/main/ets/MainAbility/MainAbility.ts b/multimedia/userfilemgr/userfilemgr_album/entry/src/main/ets/MainAbility/MainAbility.ts index 72b03d747..8a2d100df 100755 --- a/multimedia/userfilemgr/userfilemgr_album/entry/src/main/ets/MainAbility/MainAbility.ts +++ b/multimedia/userfilemgr/userfilemgr_album/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/userfilemgr/userfilemgr_base/entry/src/main/ets/Application/AbilityStage.ts b/multimedia/userfilemgr/userfilemgr_base/entry/src/main/ets/Application/AbilityStage.ts index 51cb02ba3..cbcc939ff 100755 --- a/multimedia/userfilemgr/userfilemgr_base/entry/src/main/ets/Application/AbilityStage.ts +++ b/multimedia/userfilemgr/userfilemgr_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/userfilemgr/userfilemgr_base/entry/src/main/ets/MainAbility/MainAbility.ts b/multimedia/userfilemgr/userfilemgr_base/entry/src/main/ets/MainAbility/MainAbility.ts index 2f9d6d1f2..266fcd859 100755 --- a/multimedia/userfilemgr/userfilemgr_base/entry/src/main/ets/MainAbility/MainAbility.ts +++ b/multimedia/userfilemgr/userfilemgr_base/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/userfilemgr/userfilemgr_fileAsset/entry/src/main/ets/Application/AbilityStage.ts b/multimedia/userfilemgr/userfilemgr_fileAsset/entry/src/main/ets/Application/AbilityStage.ts index 51cb02ba3..cbcc939ff 100755 --- a/multimedia/userfilemgr/userfilemgr_fileAsset/entry/src/main/ets/Application/AbilityStage.ts +++ b/multimedia/userfilemgr/userfilemgr_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/userfilemgr/userfilemgr_fileAsset/entry/src/main/ets/MainAbility/MainAbility.ts b/multimedia/userfilemgr/userfilemgr_fileAsset/entry/src/main/ets/MainAbility/MainAbility.ts index 2f9d6d1f2..266fcd859 100755 --- a/multimedia/userfilemgr/userfilemgr_fileAsset/entry/src/main/ets/MainAbility/MainAbility.ts +++ b/multimedia/userfilemgr/userfilemgr_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/userfilemgr/userfilemgr_noPermission/entry/src/main/ets/Application/AbilityStage.ts b/multimedia/userfilemgr/userfilemgr_noPermission/entry/src/main/ets/Application/AbilityStage.ts index 14f230e14..9df3a8d75 100755 --- a/multimedia/userfilemgr/userfilemgr_noPermission/entry/src/main/ets/Application/AbilityStage.ts +++ b/multimedia/userfilemgr/userfilemgr_noPermission/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/userfilemgr/userfilemgr_noPermission/entry/src/main/ets/MainAbility/MainAbility.ts b/multimedia/userfilemgr/userfilemgr_noPermission/entry/src/main/ets/MainAbility/MainAbility.ts index 72b03d747..8a2d100df 100755 --- a/multimedia/userfilemgr/userfilemgr_noPermission/entry/src/main/ets/MainAbility/MainAbility.ts +++ b/multimedia/userfilemgr/userfilemgr_noPermission/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/actsNotificationSecondaryDirectoryTest/entry/src/main/ets/Application/AbilityStage.ts b/notification/ans_standard/actsNotificationSecondaryDirectoryTest/entry/src/main/ets/Application/AbilityStage.ts index a590b7d61..7e917ee0f 100644 --- a/notification/ans_standard/actsNotificationSecondaryDirectoryTest/entry/src/main/ets/Application/AbilityStage.ts +++ b/notification/ans_standard/actsNotificationSecondaryDirectoryTest/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/actsNotificationSecondaryDirectoryTest/entry/src/main/ets/MainAbility/MainAbility.ts b/notification/ans_standard/actsNotificationSecondaryDirectoryTest/entry/src/main/ets/MainAbility/MainAbility.ts index 83be6c5a2..881e90c13 100644 --- a/notification/ans_standard/actsNotificationSecondaryDirectoryTest/entry/src/main/ets/MainAbility/MainAbility.ts +++ b/notification/ans_standard/actsNotificationSecondaryDirectoryTest/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/request/RequestTest_Stage/entry/src/main/ets/Application/MyAbilityStage.ts b/request/RequestTest_Stage/entry/src/main/ets/Application/MyAbilityStage.ts index 4bea34b35..63c0efb17 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 ad865b2b2..ef31b9080 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 ab2682985..297039e88 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 50fe24cd1..11cc75137 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 89a847305..8028a70f8 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 4bea34b35..63c0efb17 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 9dc331bc8..946c1d888 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 { -- GitLab