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: Nyangzk <yangzhongkai@huawei.com>
Change-Id: I2249e8978ab7dafc6b7128f23471b27147763f82

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'

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() {

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) {

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====>");

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 {

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() {

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) {

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====>");

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 {

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() {

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'

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() {

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'

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() {

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'

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() {

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'

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() {

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'

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() {

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'

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() {

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'

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) {

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() {

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) {

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;

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 = "";

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() {

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 = "";

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() {

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 = "";

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;
 

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 = "";

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 = "";

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 = "";

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() {

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'

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() {

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) {

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() {

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) {

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() {

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) {

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() {

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) {

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() {

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) {

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() {

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) {

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() {

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) {

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() {

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'

ability/ability_runtime/actsabilityusertest/entry/src/main/ets/Application/AbilityStage.ts

-import AbilityStage from "@ohos.application.AbilityStage"
+import AbilityStage from "@ohos.app.ability.AbilityStage"
 
 export default class MyAbilityStage extends AbilityStage {
     onCreate() {

ability/ability_runtime/actsabilityusertest/entry/src/main/ets/MainAbility/MainAbility.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'

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====>");

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====>");

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;
 

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 {

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 {

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 {

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;
 

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";

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 {

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 {

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;
 

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";

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;
 

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";

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;
 

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;

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"

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) {

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;
 

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;

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;
 

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 {

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;
 

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 {

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 {

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) {

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 {

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) {

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 {

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() {

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) {

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() {

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");

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() {

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'

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) {

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) {

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 {
 

ability/ability_runtime/actsqueryfunctiontest/actsgetappcontextstageatest/entry/src/main/ets/Application/AbilityStage.ts

-import AbilityStage from "@ohos.application.AbilityStage"
+import AbilityStage from "@ohos.app.ability.AbilityStage"
 
 export default class MyAbilityStage extends AbilityStage {
     onCreate() {

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'

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====>");

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() {

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'

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====>");

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() {

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'

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====>");

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");

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====>");

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() {

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'

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");

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

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() {

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'

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() {

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");

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() {

ability/ability_runtime/actsserviceabilityclienttest/actsserviceabilityserversecondrelyhap/entry/src/main/ets/MainAbility/MainAbility.ts

-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");

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() {

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'

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() {

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'

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() {

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'

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) {

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) {

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) {

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) {

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) {

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() {

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'

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() {

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'

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);

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() {

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'

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 {
 

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 {
 

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) {

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) {

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) {

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() {

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'

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====>")

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() {

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'

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));
                 })

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() {

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'

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));
                 })

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() {

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'

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) {

ability/ability_runtime/actsstartrunnertest/entry/src/main/ets/Application/AbilityStage.ts

-import AbilityStage from "@ohos.application.AbilityStage"
+import AbilityStage from "@ohos.app.ability.AbilityStage"
 
 export default class MyAbilityStage extends AbilityStage {
     onCreate() {

ability/ability_runtime/actsstartrunnertest/entry/src/main/ets/MainAbility/MainAbility.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'

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====>");

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====>");

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 {

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';

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 {

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';

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 {

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:';

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:';

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:';

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 {

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:';

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() {

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");

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() {

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'

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 {

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'

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() {

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'

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 {

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) {

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'

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() {

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====>");

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() {

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 {

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() {

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 {

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() {

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){

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====>");

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){

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() {

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 {
 

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====>");

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 {
 

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) {

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() {

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){

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) {

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",

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() {

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 {
 

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) {

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",

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() {

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));

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() {

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){

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) {

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() {

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 {
 

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() {

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){

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) {

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)

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() {

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 {

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() {

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 {

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() {

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){

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) {

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() {

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){

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) {

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() {

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){

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) {

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() {

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 {

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 {

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() {

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 = "";

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() {

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){

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() {

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) {

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)

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() {

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){

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() {

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) {

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 {
 

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 {
 

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 {
 

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) {

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';

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';
 

ability/ability_runtime/apicover/stagesupplement/entry/src/main/ets/Application/AbilityStage.ts

-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() {

ability/ability_runtime/apicover/stagesupplement/entry/src/main/ets/MainAbility/MainAbility.ts

-import Ability from '@ohos.application.Ability'
+import Ability from '@ohos.app.ability.UIAbility'
 import commonEvent from '@ohos.commonEvent';
 
 var printLog1 = "Stage:MainAbility:";

ability/ability_runtime/apicover/stagesupplement/entry/src/main/ets/MainAbility10/MainAbility10.ts

-import Ability from '@ohos.application.Ability'
+import Ability from '@ohos.app.ability.UIAbility'
 import commonEvent from '@ohos.commonEvent';
 
 var printLog10 = "Stage:MainAbility10:";

ability/ability_runtime/apicover/stagesupplement/entry/src/main/ets/MainAbility3/MainAbility3.ts

-import Ability from '@ohos.application.Ability'
+import Ability from '@ohos.app.ability.UIAbility'
 import commonEvent from '@ohos.commonEvent';
 
 var printLog3 = "Stage:MainAbility3:";

ability/ability_runtime/apicover/stagesupplement/entry/src/main/ets/MainAbility4/MainAbility4.ts

-import Ability from '@ohos.application.Ability'
+import Ability from '@ohos.app.ability.UIAbility'
 import commonEvent from '@ohos.commonEvent';
 
 var printLog4 = "Stage:MainAbility4:";

ability/ability_runtime/apicover/stagesupplement/entry/src/main/ets/MainAbility5/MainAbility5.ts

-import Ability from '@ohos.application.Ability'
+import Ability from '@ohos.app.ability.UIAbility'
 import commonEvent from '@ohos.commonEvent';
 
 var printLog5 = "Stage:MainAbility5:";

ability/ability_runtime/apicover/stagesupplement/entry/src/main/ets/MainAbility9/MainAbility9.ts

-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_";

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() {

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'

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====>");

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====>");

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====>");

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====>");

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() {

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) {

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() {

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) {

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() {

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'

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() {

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 {

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) {

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';

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() {

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'

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 {

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() {

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) {

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) {

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() {

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) {

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() {

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) {

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() {

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) {

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() {

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 = {

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) {

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));

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() {

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) {

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() {

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) {

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() {

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) {

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() {

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) {

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() {

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) {

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() {

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) {

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() {

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) {

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() {

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) {

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() {

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) {

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() {

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) {

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() {

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) {

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() {

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 {

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';

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() {

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 {

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';

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() {

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) {

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() {

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) {

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() {

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) {

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() {

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) {

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() {

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) {

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) {

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';

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() {

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) {

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';

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() {

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) {

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() {

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) {

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() {

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) {

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() {

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) {

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() {

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 {
 

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() {

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'

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) {

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() {

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) {

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() {

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) {

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() {

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"

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) {

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() {

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'

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) {

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() {

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 {
 

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====>");

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) {

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');

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() {

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====>");

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() {

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====>");

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'

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');

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() {

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====>");

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() {

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 {

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() {

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 {

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() {

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;

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() {

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;

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() {

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;

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() {

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;

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() {

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;

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() {

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;

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() {

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'

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) {

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() {

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) {

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) {

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) {

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) {

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) {

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) {

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) {

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) {

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) {

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) {

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() {

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) {

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) {

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) {

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() {

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) {

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) {

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) {

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) {

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) {

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) {

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) {

ability/ability_runtime/stage/actslifecyclemultihaptest/entry/src/main/ets/MainAbility7/MainAbility7.ts

-import Ability from '@ohos.application.Ability'
+import Ability from '@ohos.app.ability.UIAbility'
 
 export default class MainAbility7 extends Ability {
     onCreate(want, launchParam) {

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) {

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() {

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) {

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() {

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) {

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) {

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) {

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) {

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) {

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) {

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) {

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) {

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) {

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) {

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) {

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) {

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) {

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) {

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) {

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) {

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() {

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) {

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) {

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) {

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) {

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) {

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) {

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) {

ability/ability_runtime/stage/actswindowstagelifecyclemultihaptest/entry/src/main/ets/MainAbility7/MainAbility7.ts

-import Ability from '@ohos.application.Ability'
+import Ability from '@ohos.app.ability.UIAbility'
 
 export default class MainAbility7 extends Ability {
     onCreate(want, launchParam) {

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) {

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() {

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) {

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() {

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) {

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) {

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) {

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) {

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) {

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) {

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) {

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) {

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) {

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) {

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) {

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) {

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) {

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) {

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) {

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) {

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 {

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_'

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) {

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() {

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){

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;

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() {

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 {
 

account/appaccount/actsaccounttstest/entry/src/main/ets/Application/AbilityStage.ts

-import AbilityStage from "@ohos.application.AbilityStage"
+import AbilityStage from "@ohos.app.ability.AbilityStage"
 
 export default class MyAbilityStage extends AbilityStage {
     onCreate() {

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'

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) {

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) {

arkui/ace_ets_web_dev/entry/src/main/ets/Application/AbilityStage.ts

-import AbilityStage from "@ohos.application.AbilityStage"
+import AbilityStage from "@ohos.app.ability.AbilityStage"
 
 export default class MyAbilityStage extends AbilityStage {
     onCreate() {

arkui/ace_ets_web_dev/entry/src/main/ets/MainAbility/MainAbility.ts

-import Ability from '@ohos.application.Ability'
+import Ability from '@ohos.app.ability.UIAbility'
 
 export default class MainAbility extends Ability {
     onCreate(want,launchParam){

arkui/ace_ets_web_dev_three/entry/src/main/ets/Application/AbilityStage.ts

-import AbilityStage from "@ohos.application.AbilityStage"
+import AbilityStage from "@ohos.app.ability.AbilityStage"
 
 export default class MyAbilityStage extends AbilityStage {
     onCreate() {

arkui/ace_ets_web_dev_three/entry/src/main/ets/MainAbility/MainAbility.ts

-import Ability from '@ohos.application.Ability'
+import Ability from '@ohos.app.ability.UIAbility'
 
 export default class MainAbility extends Ability {
     onCreate(want,launchParam){

arkui/ace_ets_web_dev_two/entry/src/main/ets/Application/AbilityStage.ts

-import AbilityStage from "@ohos.application.AbilityStage"
+import AbilityStage from "@ohos.app.ability.AbilityStage"
 
 export default class MyAbilityStage extends AbilityStage {
     onCreate() {

arkui/ace_ets_web_dev_two/entry/src/main/ets/MainAbility/MainAbility.ts

-import Ability from '@ohos.application.Ability'
+import Ability from '@ohos.app.ability.UIAbility'
 
 export default class MainAbility extends Ability {
     onCreate(want,launchParam){

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 {

barrierfree/accessibilityconfig/entry/src/main/ets/Application/AbilityStage.ts

-import AbilityStage from "@ohos.application.AbilityStage"
+import AbilityStage from "@ohos.app.ability.AbilityStage"
 
 export default class MyAbilityStage extends AbilityStage {
     onCreate() {

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'

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) {

barrierfree/accessibilityconfigreqreadpermission/entry/src/main/ets/Application/AbilityStage.ts

-import AbilityStage from "@ohos.application.AbilityStage"
+import AbilityStage from "@ohos.app.ability.AbilityStage"
 
 export default class MyAbilityStage extends AbilityStage {
     onCreate() {

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'

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) {

barrierfree/accessibilityconfigreqwritepermission/entry/src/main/ets/Application/AbilityStage.ts

-import AbilityStage from "@ohos.application.AbilityStage"
+import AbilityStage from "@ohos.app.ability.AbilityStage"
 
 export default class MyAbilityStage extends AbilityStage {
     onCreate() {

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){

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'

barrierfree/accessibilityelement/entry/src/main/ets/Application/AbilityStage.ts

-import AbilityStage from "@ohos.application.AbilityStage"
+import AbilityStage from "@ohos.app.ability.AbilityStage"
 
 export default class MyAbilityStage extends AbilityStage {
     onCreate() {

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'

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) {

barrierfree/accessibilityerrcode/entry/src/main/ets/Application/AbilityStage.ts

-import AbilityStage from "@ohos.application.AbilityStage"
+import AbilityStage from "@ohos.app.ability.AbilityStage"
 
 export default class MyAbilityStage extends AbilityStage {
     onCreate() {

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){

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'

barrierfree/accessibilityevent/entry/src/main/ets/Application/AbilityStage.ts

-import AbilityStage from "@ohos.application.AbilityStage"
+import AbilityStage from "@ohos.app.ability.AbilityStage"
 
 export default class MyAbilityStage extends AbilityStage {
     onCreate() {

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'

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) {

barrierfree/accessibilityextension/entry/src/main/ets/Application/AbilityStage.ts

-import AbilityStage from "@ohos.application.AbilityStage"
+import AbilityStage from "@ohos.app.ability.AbilityStage"
 
 export default class MyAbilityStage extends AbilityStage {
     onCreate() {

barrierfree/accessibilityextension/entry/src/main/ets/MainAbility/MainAbility.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'

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) {

barrierfree/accessibilityextensioncontext/entry/src/main/ets/Application/AbilityStage.ts

-import AbilityStage from "@ohos.application.AbilityStage"
+import AbilityStage from "@ohos.app.ability.AbilityStage"
 
 export default class MyAbilityStage extends AbilityStage {
     onCreate() {

barrierfree/accessibilityextensioncontext/entry/src/main/ets/MainAbility/MainAbility.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'

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) {

barrierfree/accessibilityextensioncontextcaperrcode/entry/src/main/ets/Application/AbilityStage.ts

-import AbilityStage from "@ohos.application.AbilityStage"
+import AbilityStage from "@ohos.app.ability.AbilityStage"
 
 export default class MyAbilityStage extends AbilityStage {
     onCreate() {

barrierfree/accessibilityextensioncontextcaperrcode/entry/src/main/ets/MainAbility/MainAbility.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'

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) {

barrierfree/accessibilitygestureevent/entry/src/main/ets/Application/AbilityStage.ts

-import AbilityStage from "@ohos.application.AbilityStage"
+import AbilityStage from "@ohos.app.ability.AbilityStage"
 
 export default class MyAbilityStage extends AbilityStage {
     onCreate() {

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'

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) {

barrierfree/accessibilitysendaccessibilityevent/entry/src/main/ets/Application/AbilityStage.ts

-import AbilityStage from "@ohos.application.AbilityStage"
+import AbilityStage from "@ohos.app.ability.AbilityStage"
 
 export default class MyAbilityStage extends AbilityStage {
     onCreate() {

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){

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'

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() {

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) {

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'

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")

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) {

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'

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() {

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) {

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'

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() {

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) {

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() {

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) {

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() {

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) {

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() {

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) {

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() {

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) {

barrierfree/targetProject/aceTest/entry/src/main/ets/Application/AbilityStage.ts

-import AbilityStage from "@ohos.application.AbilityStage"
+import AbilityStage from "@ohos.app.ability.AbilityStage"
 
 export default class MyAbilityStage extends AbilityStage {
     onCreate() {

barrierfree/targetProject/aceTest/entry/src/main/ets/MainAbility/MainAbility.ts

-import Ability from '@ohos.application.Ability'
+import Ability from '@ohos.app.ability.UIAbility'
 
 export default class MainAbility extends Ability {
     onCreate(want, launchParam) {

bundlemanager/bundle_standard/bundlemanager/actsbundlemanagerstagetest/entry/src/main/ets/Application/AbilityStage.ts

-import AbilityStage from "@ohos.application.AbilityStage"
+import AbilityStage from "@ohos.app.ability.AbilityStage"
 
 export default class MyAbilityStage extends AbilityStage {
     onCreate() {

bundlemanager/bundle_standard/bundlemanager/actsbundlemanagerstagetest/entry/src/main/ets/MainAbility/MainAbility.ts

-import Ability from '@ohos.application.Ability'
+import Ability from '@ohos.app.ability.UIAbility'
 
 export default class MainAbility extends Ability {
     onCreate(want,launchParam){

bundlemanager/bundle_standard/bundlemanager/actsbundlemanagerstagetest/entry/src/main/ets/TestAbility/TestAbility.ts

-import Ability from '@ohos.application.Ability'
+import Ability from '@ohos.app.ability.UIAbility'
 
 export default class TestAbility extends Ability {
     onCreate(want, launchParam) {

bundlemanager/bundle_standard/bundlemanager/sceneProject/bmsstagedemoone/entry/src/main/ets/Application/AbilityStage.ts

-import AbilityStage from "@ohos.application.AbilityStage"
+import AbilityStage from "@ohos.app.ability.AbilityStage"
 
 export default class MyAbilityStage extends AbilityStage {
     onCreate() {

bundlemanager/bundle_standard/bundlemanager/sceneProject/bmsstagedemoone/entry/src/main/ets/MainAbility/MainAbility.ts

-import Ability from '@ohos.application.Ability'
+import Ability from '@ohos.app.ability.UIAbility'
 
 export default class MainAbility extends Ability {
     onCreate(want,launchParam){

bundlemanager/bundle_standard/bundlemanager/sceneProject/bmsstagedemotwo/entry/src/main/ets/Application/AbilityStage.ts

-import AbilityStage from "@ohos.application.AbilityStage"
+import AbilityStage from "@ohos.app.ability.AbilityStage"
 
 export default class MyAbilityStage extends AbilityStage {
     onCreate() {

bundlemanager/bundle_standard/bundlemanager/sceneProject/bmsstagedemotwo/entry/src/main/ets/MainAbility/MainAbility.ts

-import Ability from '@ohos.application.Ability'
+import Ability from '@ohos.app.ability.UIAbility'
 
 export default class MainAbility extends Ability {
     onCreate(want,launchParam){

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() {

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] <<Consumer>> 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] <<Consumer>> connectDataShareExtAbility begin");
             await dataShare.createDataShareHelper(globalThis.abilityContext, dseUri, (err,data)=>{
@@ -122,7 +122,7 @@ export default class MainAbility extends Ability {
                 console.info("[ttt] [DataShareTest] <<Consumer>> ----- 3 -----, err = " + err);
                 console.info("[ttt] [DataShareTest] <<Consumer>> ----- 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)
     }

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) {

graphic/effectKit/entry/src/main/ets/Application/AbilityStage.ts

-import AbilityStage from "@ohos.application.AbilityStage"
+import AbilityStage from "@ohos.app.ability.AbilityStage"
 
 export default class MyAbilityStage extends AbilityStage {
     onCreate() {

graphic/effectKit/entry/src/main/ets/MainAbility/MainAbility.ts

-import Ability from '@ohos.application.Ability'
+import Ability from '@ohos.app.ability.UIAbility'
 
 export default class MainAbility extends Ability {
     onCreate(want,launchParam){

graphic/graphicColorSpace/entry/src/main/ets/Application/AbilityStage.ts

-import AbilityStage from "@ohos.application.AbilityStage"
+import AbilityStage from "@ohos.app.ability.AbilityStage"
 
 export default class MyAbilityStage extends AbilityStage {
     onCreate() {

graphic/graphicColorSpace/entry/src/main/ets/MainAbility/MainAbility.ts

-import Ability from '@ohos.application.Ability'
+import Ability from '@ohos.app.ability.UIAbility'
 
 export default class MainAbility extends Ability {
     onCreate(want,launchParam){

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) {

graphic/windowStage/entry/src/main/ets/Application/AbilityStage.ts

-import AbilityStage from "@ohos.application.AbilityStage"
+import AbilityStage from "@ohos.app.ability.AbilityStage"
 
 export default class MyAbilityStage extends AbilityStage {
     onCreate() {

graphic/windowStage/entry/src/main/ets/MainAbility/MainAbility.ts

-import Ability from '@ohos.application.Ability'
+import Ability from '@ohos.app.ability.UIAbility'
 
 export default class MainAbility extends Ability {
     onCreate(want,launchParam){

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) {

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 {

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 {

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() {

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){

multimedia/medialibrary/mediaLibrary_album/entry/src/main/ets/Application/AbilityStage.ts

-import AbilityStage from "@ohos.application.AbilityStage"
+import AbilityStage from "@ohos.app.ability.AbilityStage"
 
 export default class MyAbilityStage extends AbilityStage {
     onCreate() {

multimedia/medialibrary/mediaLibrary_album/entry/src/main/ets/MainAbility/MainAbility.ts

-import Ability from '@ohos.application.Ability'
+import Ability from '@ohos.app.ability.UIAbility'
 
 export default class MainAbility extends Ability {
     onCreate(want,launchParam){

multimedia/medialibrary/mediaLibrary_base/entry/src/main/ets/Application/AbilityStage.ts

-import AbilityStage from "@ohos.application.AbilityStage"
+import AbilityStage from "@ohos.app.ability.AbilityStage"
 
 export default class MyAbilityStage extends AbilityStage {
     onCreate() {

multimedia/medialibrary/mediaLibrary_base/entry/src/main/ets/MainAbility/MainAbility.ts

-import Ability from '@ohos.application.Ability'
+import Ability from '@ohos.app.ability.UIAbility'
 
 export default class MainAbility extends Ability {
     onCreate(want,launchParam){

multimedia/medialibrary/mediaLibrary_favorite/entry/src/main/ets/Application/AbilityStage.ts

-import AbilityStage from "@ohos.application.AbilityStage"
+import AbilityStage from "@ohos.app.ability.AbilityStage"
 
 export default class MyAbilityStage extends AbilityStage {
     onCreate() {

multimedia/medialibrary/mediaLibrary_favorite/entry/src/main/ets/MainAbility/MainAbility.ts

-import Ability from '@ohos.application.Ability'
+import Ability from '@ohos.app.ability.UIAbility'
 
 export default class MainAbility extends Ability {
     onCreate(want,launchParam){

multimedia/medialibrary/mediaLibrary_file/entry/src/main/ets/Application/AbilityStage.ts

-import AbilityStage from "@ohos.application.AbilityStage"
+import AbilityStage from "@ohos.app.ability.AbilityStage"
 
 export default class MyAbilityStage extends AbilityStage {
     onCreate() {

multimedia/medialibrary/mediaLibrary_file/entry/src/main/ets/MainAbility/MainAbility.ts

-import Ability from '@ohos.application.Ability'
+import Ability from '@ohos.app.ability.UIAbility'
 
 export default class MainAbility extends Ability {
     onCreate(want,launchParam){

multimedia/medialibrary/mediaLibrary_fileAsset/entry/src/main/ets/Application/AbilityStage.ts

-import AbilityStage from "@ohos.application.AbilityStage"
+import AbilityStage from "@ohos.app.ability.AbilityStage"
 
 export default class MyAbilityStage extends AbilityStage {
     onCreate() {

multimedia/medialibrary/mediaLibrary_fileAsset/entry/src/main/ets/MainAbility/MainAbility.ts

-import Ability from '@ohos.application.Ability'
+import Ability from '@ohos.app.ability.UIAbility'
 
 export default class MainAbility extends Ability {
     onCreate(want,launchParam){

multimedia/medialibrary/mediaLibrary_fileKey/entry/src/main/ets/Application/AbilityStage.ts

-import AbilityStage from "@ohos.application.AbilityStage"
+import AbilityStage from "@ohos.app.ability.AbilityStage"
 
 export default class MyAbilityStage extends AbilityStage {
     onCreate() {

multimedia/medialibrary/mediaLibrary_fileKey/entry/src/main/ets/MainAbility/MainAbility.ts

-import Ability from '@ohos.application.Ability'
+import Ability from '@ohos.app.ability.UIAbility'
 
 export default class MainAbility extends Ability {
     onCreate(want,launchParam){

multimedia/medialibrary/mediaLibrary_fileResult/entry/src/main/ets/Application/AbilityStage.ts

-import AbilityStage from "@ohos.application.AbilityStage"
+import AbilityStage from "@ohos.app.ability.AbilityStage"
 
 export default class MyAbilityStage extends AbilityStage {
     onCreate() {

multimedia/medialibrary/mediaLibrary_fileResult/entry/src/main/ets/MainAbility/MainAbility.ts

-import Ability from '@ohos.application.Ability'
+import Ability from '@ohos.app.ability.UIAbility'
 
 export default class MainAbility extends Ability {
     onCreate(want,launchParam){

multimedia/medialibrary/mediaLibrary_getThumbnail/entry/src/main/ets/Application/AbilityStage.ts

-import AbilityStage from "@ohos.application.AbilityStage"
+import AbilityStage from "@ohos.app.ability.AbilityStage"
 
 export default class MyAbilityStage extends AbilityStage {
     onCreate() {

multimedia/medialibrary/mediaLibrary_getThumbnail/entry/src/main/ets/MainAbility/MainAbility.ts

-import Ability from '@ohos.application.Ability'
+import Ability from '@ohos.app.ability.UIAbility'
 
 export default class MainAbility extends Ability {
     onCreate(want,launchParam){

multimedia/medialibrary/mediaLibrary_mediafetchoptions/entry/src/main/ets/Application/AbilityStage.ts

-import AbilityStage from "@ohos.application.AbilityStage"
+import AbilityStage from "@ohos.app.ability.AbilityStage"
 
 export default class MyAbilityStage extends AbilityStage {
     onCreate() {

multimedia/medialibrary/mediaLibrary_mediafetchoptions/entry/src/main/ets/MainAbility/MainAbility.ts

-import Ability from '@ohos.application.Ability'
+import Ability from '@ohos.app.ability.UIAbility'
 
 export default class MainAbility extends Ability {
     onCreate(want,launchParam){

multimedia/medialibrary/mediaLibrary_trash/entry/src/main/ets/Application/AbilityStage.ts

-import AbilityStage from "@ohos.application.AbilityStage"
+import AbilityStage from "@ohos.app.ability.AbilityStage"
 
 export default class MyAbilityStage extends AbilityStage {
     onCreate() {

multimedia/medialibrary/mediaLibrary_trash/entry/src/main/ets/MainAbility/MainAbility.ts

-import Ability from '@ohos.application.Ability'
+import Ability from '@ohos.app.ability.UIAbility'
 
 export default class MainAbility extends Ability {
     onCreate(want,launchParam){

multimedia/userfilemgr/userfilemgr_album/entry/src/main/ets/Application/AbilityStage.ts

-import AbilityStage from "@ohos.application.AbilityStage"
+import AbilityStage from "@ohos.app.ability.AbilityStage"
 
 export default class MyAbilityStage extends AbilityStage {
     onCreate() {

multimedia/userfilemgr/userfilemgr_album/entry/src/main/ets/MainAbility/MainAbility.ts

-import Ability from '@ohos.application.Ability'
+import Ability from '@ohos.app.ability.UIAbility'
 
 export default class MainAbility extends Ability {
     onCreate(want,launchParam){

multimedia/userfilemgr/userfilemgr_base/entry/src/main/ets/Application/AbilityStage.ts

-import AbilityStage from "@ohos.application.AbilityStage"
+import AbilityStage from "@ohos.app.ability.AbilityStage"
 
 export default class MyAbilityStage extends AbilityStage {
     onCreate() {

multimedia/userfilemgr/userfilemgr_base/entry/src/main/ets/MainAbility/MainAbility.ts

-import Ability from '@ohos.application.Ability'
+import Ability from '@ohos.app.ability.UIAbility'
 
 export default class MainAbility extends Ability {
     onCreate(want,launchParam){

multimedia/userfilemgr/userfilemgr_fileAsset/entry/src/main/ets/Application/AbilityStage.ts

-import AbilityStage from "@ohos.application.AbilityStage"
+import AbilityStage from "@ohos.app.ability.AbilityStage"
 
 export default class MyAbilityStage extends AbilityStage {
     onCreate() {

multimedia/userfilemgr/userfilemgr_fileAsset/entry/src/main/ets/MainAbility/MainAbility.ts

-import Ability from '@ohos.application.Ability'
+import Ability from '@ohos.app.ability.UIAbility'
 
 export default class MainAbility extends Ability {
     onCreate(want,launchParam){

multimedia/userfilemgr/userfilemgr_noPermission/entry/src/main/ets/Application/AbilityStage.ts

-import AbilityStage from "@ohos.application.AbilityStage"
+import AbilityStage from "@ohos.app.ability.AbilityStage"
 
 export default class MyAbilityStage extends AbilityStage {
     onCreate() {

multimedia/userfilemgr/userfilemgr_noPermission/entry/src/main/ets/MainAbility/MainAbility.ts

-import Ability from '@ohos.application.Ability'
+import Ability from '@ohos.app.ability.UIAbility'
 
 export default class MainAbility extends Ability {
     onCreate(want,launchParam){

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() {

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 {
 

request/RequestTest_Stage/entry/src/main/ets/Application/MyAbilityStage.ts

 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() {

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 {

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() {

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) {

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) {

time/timeTest/entry/src/main/ets/Application/MyAbilityStage.ts

 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() {

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 {