Merge branch 'master' of https://gitee.com/yuxiaoya2/xts_acts

ability/ability_runtime/abilitymanager/actsamscallbackfifthscene/src/main/js/test/MangerAbilityJsunit.test.js

@@ -115,9 +115,6 @@ export default function ActsAmsCallBackFifthScene() {
         * @tc.desc      : Get All Running Processes Info(by CallBack)
         */
         it('Acts_Ams_test_6600', 0, async function (done) {
-            console.info("sleep begin");
-            sleep(5000);
-            console.info("sleep end");
             appManager.getProcessRunningInfos(
                 (error, info) => {
                     console.info('Acts_Ams_test_6600 getProcessRunningInfos error.code \
@@ -141,5 +138,37 @@ export default function ActsAmsCallBackFifthScene() {
                 }
             );
         })
+
+        /*
+        * @tc.number    : Acts_Ams_test_6700
+        * @tc.name      : getProcessRunningInformation : Get All Running Processes Information
+        * @tc.desc      : Get All Running Processes Information(by CallBack)
+        */
+        it('Acts_Ams_test_6700', 0, async function (done) {
+            appManager.getProcessRunningInformation(
+                (error, info) => {
+                    console.info('Acts_Ams_test_6700 getProcessRunningInformation error.code \
+                    ' + error.code + ', data length [' + info.length + ']');
+                    expect(Array.isArray(info)).assertEqual(true);
+                    expect(info.length).assertLarger(0);
+                    for (let i = 0; i < info.length; i++) {
+                        console.info('Acts_Ams_test_6700 getProcessRunningInformation[' + i + "]: \
+                            " + JSON.stringify(info[i]));
+                        expect(typeof (info[i].pid)).assertEqual("number");
+                        expect(info[i].pid).assertLarger(0);
+
+                        expect(typeof (info[i].processName)).assertEqual("string");
+                        expect(info[i].processName.length).assertLarger(0);
+                        expect(Array.isArray(info[i].bundleNames)).assertEqual(true);
+                        expect(info[i].bundleNames.length).assertLarger(0);
+
+                        expect(typeof (info[i].uid)).assertEqual("number");
+                        expect(info[i].uid).assertLarger(0);
+                    }
+                    done();
+                }
+            );
+        })
+
     })
 }
\ No newline at end of file

ability/ability_runtime/abilitymanager/actsamscallbackfirstscene/src/main/js/test/MangerAbilityJsunit.test.js

@@ -59,9 +59,6 @@ export default function ActsAmsCallBackFirstScene() {
         * @tc.desc      : Get All Running Processes Info(by CallBack)
         */
         it('Acts_Ams_test_0200', 0, async function (done) {
-            console.info("sleep begin");
-            sleep(5000);
-            console.info("sleep end");
             appManager.getProcessRunningInfos(
                 (error, info) => {
                     console.info('Acts_Ams_test_0200 getProcessRunningInfos error.code \
@@ -84,5 +81,36 @@ export default function ActsAmsCallBackFirstScene() {
                     done();
                 });
         })
+
+        /*
+        * @tc.number    : Acts_Ams_test_0300
+        * @tc.name      : getProcessRunningInformation : Get All Running Processes Information
+        * @tc.desc      : Get All Running Processes Information(by CallBack)
+        */
+        it('Acts_Ams_test_0300', 0, async function (done) {
+            appManager.getProcessRunningInformation(
+                (error, info) => {
+                    console.info('Acts_Ams_test_0300 getProcessRunningInformation error.code \
+                    ' + error.code + ', data length [' + info.length + ']');
+                    expect(Array.isArray(info)).assertEqual(true);
+                    expect(info.length).assertLarger(0);
+                    for (var i = 0; i < info.length; i++) {
+                        console.info('Acts_Ams_test_0200 getProcessRunningInformation[' + i + "]: \
+                            " + JSON.stringify(info[i]));
+                        expect(typeof (info[i].pid)).assertEqual("number");
+                        expect(info[i].pid).assertLarger(0);
+
+                        expect(typeof (info[i].processName)).assertEqual("string");
+                        expect(info[i].processName.length).assertLarger(0);
+                        expect(Array.isArray(info[i].bundleNames)).assertEqual(true);
+                        expect(info[i].bundleNames.length).assertLarger(0);
+
+                        expect(typeof (info[i].uid)).assertEqual("number");
+                        expect(info[i].uid).assertLarger(0);
+                    }
+                    done();
+                });
+        })
+
     })
 }
\ No newline at end of file

ability/ability_runtime/abilitymanager/actsamscallbackfourthscene/src/main/js/test/MangerAbilityJsunit.test.js

@@ -110,9 +110,6 @@ export default function ActsAmsCallBackFourthScene() {
         * @tc.desc      : Get All Running Processes Info(by CallBack)
         */
         it('Acts_Ams_test_5000', 0, async function (done) {
-            console.info("sleep begin");
-            sleep(5000);
-            console.info("sleep end");
             appManager.getProcessRunningInfos(
                 (error, info) => {
                     console.info('Acts_Ams_test_5000 getProcessRunningInfos error.code \
@@ -135,5 +132,36 @@ export default function ActsAmsCallBackFourthScene() {
                     done();
                 });
         })
+
+        /*
+        * @tc.number    : Acts_Ams_test_5100
+        * @tc.name      : getProcessRunningInformation : Get All Running Processes Information
+        * @tc.desc      : Get All Running Processes Information(by CallBack)
+        */
+        it('Acts_Ams_test_5100', 0, async function (done) {
+            appManager.getProcessRunningInformation(
+                (error, info) => {
+                    console.info('Acts_Ams_test_5100 getProcessRunningInformation error.code \
+                    ' + error.code + ', data length [' + info.length + ']');
+                    expect(Array.isArray(info)).assertEqual(true);
+                    expect(info.length).assertLarger(0);
+                    for (let i = 0; i < info.length; i++) {
+                        console.info('Acts_Ams_test_5100 getProcessRunningInformation[' + i + "]: \
+                            " + JSON.stringify(info[i]));
+                        expect(typeof (info[i].pid)).assertEqual("number");
+                        expect(info[i].pid).assertLarger(0);
+
+                        expect(typeof (info[i].processName)).assertEqual("string");
+                        expect(info[i].processName.length).assertLarger(0);
+                        expect(Array.isArray(info[i].bundleNames)).assertEqual(true);
+                        expect(info[i].bundleNames.length).assertLarger(0);
+
+                        expect(typeof (info[i].uid)).assertEqual("number");
+                        expect(info[i].uid).assertLarger(0);
+                    }
+                    done();
+                });
+        })
+
     })
 }
\ No newline at end of file

ability/ability_runtime/abilitymanager/actsamscallbacksecondscene/src/main/js/test/MangerAbilityJsunit.test.js

@@ -76,9 +76,6 @@ export default function ActsAmsCallBackSecondScene() {
         * @tc.desc      : Get All Running Processes Info(by CallBack)
         */
         it('Acts_Ams_test_1800', 0, async function (done) {
-            console.info("sleep begin");
-            sleep(5000);
-            console.info("sleep end");
             appManager.getProcessRunningInfos(
                 (error, info) => {
                     console.info('Acts_Ams_test_1800 getProcessRunningInfos error.code \
@@ -101,5 +98,36 @@ export default function ActsAmsCallBackSecondScene() {
                     done();
                 });
         })
+
+        /*
+        * @tc.number    : Acts_Ams_test_1900
+        * @tc.name      : getProcessRunningInformation : Get All Running Processes Information
+        * @tc.desc      : Get All Running Processes Information(by CallBack)
+        */
+        it('Acts_Ams_test_1900', 0, async function (done) {
+            appManager.getProcessRunningInformation(
+                (error, info) => {
+                    console.info('Acts_Ams_test_1900 getProcessRunningInformation error.code \
+                    ' + error.code + ', data length [' + info.length + ']');
+                    expect(Array.isArray(info)).assertEqual(true);
+                    expect(info.length).assertLarger(0);
+                    for (let i = 0; i < info.length; i++) {
+                        console.info('Acts_Ams_test_1900 getProcessRunningInformation[' + i + "]: \
+                            " + JSON.stringify(info[i]));
+                        expect(typeof (info[i].pid)).assertEqual("number");
+                        expect(info[i].pid).assertLarger(0);
+
+                        expect(typeof (info[i].processName)).assertEqual("string");
+                        expect(info[i].processName.length).assertLarger(0);
+                        expect(Array.isArray(info[i].bundleNames)).assertEqual(true);
+                        expect(info[i].bundleNames.length).assertLarger(0);
+
+                        expect(typeof (info[i].uid)).assertEqual("number");
+                        expect(info[i].uid).assertLarger(0);
+                    }
+                    done();
+                });
+        })
+
     })
 }
\ No newline at end of file

ability/ability_runtime/abilitymanager/actsamscallbackthirdscene/src/main/js/test/MangerAbilityJsunit.test.js

@@ -70,9 +70,6 @@ export default function ActsAmsCallBackThirdScene() {
         * @tc.desc      : Get All Running Processes Info(by CallBack)
         */
         it('Acts_Ams_test_3400', 0, async function (done) {
-            console.info("sleep begin");
-            sleep(5000);
-            console.info("sleep end");
             appManager.getProcessRunningInfos(
                 (error, info) => {
                     console.info('Acts_Ams_test_3400 getProcessRunningInfos error.code \
@@ -95,5 +92,36 @@ export default function ActsAmsCallBackThirdScene() {
                     done();
                 });
         })
+
+        /*
+        * @tc.number    : Acts_Ams_test_3500
+        * @tc.name      : getProcessRunningInformation : Get All Running Processes Information
+        * @tc.desc      : Get All Running Processes Information(by CallBack)
+        */
+        it('Acts_Ams_test_3500', 0, async function (done) {
+            appManager.getProcessRunningInformation(
+                (error, info) => {
+                    console.info('Acts_Ams_test_3500 getProcessRunningInformation error.code \
+                    ' + error.code + ', data length [' + info.length + ']');
+                    expect(Array.isArray(info)).assertEqual(true);
+                    expect(info.length).assertLarger(0);
+                    for (let i = 0; i < info.length; i++) {
+                        console.info('Acts_Ams_test_3500 getProcessRunningInformation[' + i + "]: \
+                            " + JSON.stringify(info[i]));
+                        expect(typeof (info[i].pid)).assertEqual("number");
+                        expect(info[i].pid).assertLarger(0);
+
+                        expect(typeof (info[i].processName)).assertEqual("string");
+                        expect(info[i].processName.length).assertLarger(0);
+                        expect(Array.isArray(info[i].bundleNames)).assertEqual(true);
+                        expect(info[i].bundleNames.length).assertLarger(0);
+
+                        expect(typeof (info[i].uid)).assertEqual("number");
+                        expect(info[i].uid).assertLarger(0);
+                    }
+                    done();
+                });
+        })
+
     })
 }
\ No newline at end of file

ability/ability_runtime/abilitymanager/actsamstestfifthscene/src/main/js/test/MangerAbilityJsunit.test.js

@@ -130,9 +130,6 @@ export default function ActsAmsTestFifthScene() {
         * @tc.desc      : Get All Running Processes Info(by Promise)
         */
         it('Acts_Ams_test_0100', 0, async function (done) {
-            console.info("sleep begin");
-            sleep(5000);
-            console.info("sleep end");
             let info = await appManager.getProcessRunningInfos();
             expect(Array.isArray(info)).assertEqual(true);
             expect(info.length).assertLarger(0);
@@ -151,5 +148,32 @@ export default function ActsAmsTestFifthScene() {
             }
             done();
         })
+
+        /*
+        * @tc.number    : Acts_Ams_test_0200
+        * @tc.name      : getProcessRunningInformation : Get All Running Processes Information
+        * @tc.desc      : Get All Running Processes Information(by Promise)
+        */
+        it('Acts_Ams_test_0200', 0, async function (done) {
+            let info = await appManager.getProcessRunningInformation();
+            expect(Array.isArray(info)).assertEqual(true);
+            expect(info.length).assertLarger(0);
+            for (let i = 0; i < info.length; i++) {
+                console.info('Acts_Ams_test_0200 getProcessRunningInformation[' + i + "]: \
+                    " + JSON.stringify(info[i]));
+                expect(typeof (info[i].pid)).assertEqual("number");
+                expect(info[i].pid).assertLarger(0);
+
+                expect(typeof (info[i].processName)).assertEqual("string");
+                expect(info[i].processName.length).assertLarger(0);
+                expect(Array.isArray(info[i].bundleNames)).assertEqual(true);
+                expect(info[i].bundleNames.length).assertLarger(0);
+
+                expect(typeof (info[i].uid)).assertEqual("number");
+                expect(info[i].uid).assertLarger(0);
+            }
+            done();
+        })
+
     })
 }
\ No newline at end of file

ability/ability_runtime/abilitymanager/actsamstestfirstscene/src/main/js/test/MangerAbilityJsunit.test.js

@@ -64,9 +64,6 @@ export default function ActsAmsTestFirstScene() {
         * @tc.desc      : Get All Running Processes Info(by Promise)
         */
         it('Acts_Ams_test_0100', 0, async function (done) {
-            console.info("sleep begin");
-            sleep(5000);
-            console.info("sleep end");
             var info = await appManager.getProcessRunningInfos();
             expect(Array.isArray(info)).assertEqual(true);
             expect(info.length).assertLarger(0);
@@ -85,5 +82,32 @@ export default function ActsAmsTestFirstScene() {
             }
             done();
         })
+
+        /*
+        * @tc.number    : Acts_Ams_test_0200
+        * @tc.name      : getProcessRunningInformation : Get All Running Processes Information
+        * @tc.desc      : Get All Running Processes Information(by Promise)
+        */
+        it('Acts_Ams_test_0200', 0, async function (done) {
+            var info = await appManager.getProcessRunningInformation();
+            expect(Array.isArray(info)).assertEqual(true);
+            expect(info.length).assertLarger(0);
+            for (var i = 0; i < info.length; i++) {
+                console.info('Acts_Ams_test_0200 getProcessRunningInformation[' + i + "]: \
+                    " + JSON.stringify(info[i]));
+                expect(typeof (info[i].pid)).assertEqual("number");
+                expect(info[i].pid).assertLarger(0);
+
+                expect(typeof (info[i].processName)).assertEqual("string");
+                expect(info[i].processName.length).assertLarger(0);
+                expect(Array.isArray(info[i].bundleNames)).assertEqual(true);
+                expect(info[i].bundleNames.length).assertLarger(0);
+
+                expect(typeof (info[i].uid)).assertEqual("number");
+                expect(info[i].uid).assertLarger(0);
+            }
+            done();
+        })
+
     })
 }
\ No newline at end of file

ability/ability_runtime/abilitymanager/actsamstestfourthscene/src/main/js/test/MangerAbilityJsunit.test.js

@@ -131,7 +131,7 @@ export default function ActsAmsTestFourthScene() {
         */
         it('Acts_Ams_test_1700', 0, async function (done) {
             console.info("sleep begin");
-            sleep(5000);
+            sleep(2000);
             console.info("sleep end");
             var info = await appManager.getProcessRunningInfos();
             expect(Array.isArray(info)).assertEqual(true);
@@ -151,5 +151,35 @@ export default function ActsAmsTestFourthScene() {
             }
             done();
         })
+
+        /*
+        * @tc.number    : Acts_Ams_test_1800
+        * @tc.name      : getProcessRunningInformation : Get All Running Processes Information
+        * @tc.desc      : Get All Running Processes Information(by Promise)
+        */
+        it('Acts_Ams_test_1800', 0, async function (done) {
+            console.info("sleep begin");
+            sleep(2000);
+            console.info("sleep end");
+            var info = await appManager.getProcessRunningInformation();
+            expect(Array.isArray(info)).assertEqual(true);
+            expect(info.length).assertLarger(0);
+            for (var i = 0; i < info.length; i++) {
+                console.info('Acts_Ams_test_1800 getProcessRunningInformation[' + i + "]: \
+                    " + JSON.stringify(info[i]));
+                expect(typeof (info[i].pid)).assertEqual("number");
+                expect(info[i].pid).assertLarger(0);
+
+                expect(typeof (info[i].processName)).assertEqual("string");
+                expect(info[i].processName.length).assertLarger(0);
+                expect(Array.isArray(info[i].bundleNames)).assertEqual(true);
+                expect(info[i].bundleNames.length).assertLarger(0);
+
+                expect(typeof (info[i].uid)).assertEqual("number");
+                expect(info[i].uid).assertLarger(0);
+            }
+            done();
+        })
+
     })
 }
\ No newline at end of file

ability/ability_runtime/abilitymanager/actsamstestsecondscene/src/main/js/test/MangerAbilityJsunit.test.js

@@ -86,9 +86,6 @@ export default function ActsAmsTestSecondScene() {
         * @tc.desc      : Get All Running Processes Info(by Promise)
         */
         it('Acts_Ams_test_1700', 0, async function (done) {
-            console.info("sleep begin");
-            sleep(5000);
-            console.info("sleep end");
             var info = await appManager.getProcessRunningInfos();
             expect(Array.isArray(info)).assertEqual(true);
             expect(info.length).assertLarger(0);
@@ -107,5 +104,32 @@ export default function ActsAmsTestSecondScene() {
             }
             done();
         })
+
+        /*
+        * @tc.number    : Acts_Ams_test_1800
+        * @tc.name      : getProcessRunningInformation : Get All Running Processes Information
+        * @tc.desc      : Get All Running Processes Information(by Promise)
+        */
+        it('Acts_Ams_test_1800', 0, async function (done) {
+            var info = await appManager.getProcessRunningInformation();
+            expect(Array.isArray(info)).assertEqual(true);
+            expect(info.length).assertLarger(0);
+            for (var i = 0; i < info.length; i++) {
+                console.info('Acts_Ams_test_1800 getProcessRunningInformation[' + i + "]: \
+                    " + JSON.stringify(info[i]));
+                expect(typeof (info[i].pid)).assertEqual("number");
+                expect(info[i].pid).assertLarger(0);
+
+                expect(typeof (info[i].processName)).assertEqual("string");
+                expect(info[i].processName.length).assertLarger(0);
+                expect(Array.isArray(info[i].bundleNames)).assertEqual(true);
+                expect(info[i].bundleNames.length).assertLarger(0);
+
+                expect(typeof (info[i].uid)).assertEqual("number");
+                expect(info[i].uid).assertLarger(0);
+            }
+            done();
+        })
+
     })
 }
\ No newline at end of file

ability/ability_runtime/abilitymanager/actsamstestthirdscene/src/main/js/test/MangerAbilityJsunit.test.js

@@ -87,9 +87,6 @@ export default function ActsAmsTestThirdScene() {
         * @tc.desc      : Get All Running Processes Info(by Promise)
         */
         it('Acts_Ams_test_3300', 0, async function (done) {
-            console.info("sleep begin");
-            sleep(5000);
-            console.info("sleep end");
             var info = await appManager.getProcessRunningInfos();
             console.info('Acts_Ams_test_3300 getProcessRunningInfos JSON String: ' + JSON.stringify(info));
             expect(Array.isArray(info)).assertEqual(true);
@@ -109,5 +106,34 @@ export default function ActsAmsTestThirdScene() {
             }
             done();
         })
+
+        /*
+        * @tc.number    : Acts_Ams_test_3400
+        * @tc.name      : getProcessRunningInformation : Get All Running Processes Information
+        * @tc.desc      : Get All Running Processes Information(by Promise)
+        */
+        it('Acts_Ams_test_3400', 0, async function (done) {
+            var info = await appManager.getProcessRunningInformation();
+            console.info('Acts_Ams_test_3400 getProcessRunningInformation JSON String: \
+                ' + JSON.stringify(info));
+            expect(Array.isArray(info)).assertEqual(true);
+            expect(info.length).assertLarger(0);
+            for (var i = 0; i < info.length; i++) {
+                console.info('Acts_Ams_test_3400 getProcessRunningInformation[' + i + "]: \
+                    " + JSON.stringify(info[i]));
+                expect(typeof (info[i].pid)).assertEqual("number");
+                expect(info[i].pid).assertLarger(0);
+        
+                expect(typeof (info[i].processName)).assertEqual("string");
+                expect(info[i].processName.length).assertLarger(0);
+                expect(Array.isArray(info[i].bundleNames)).assertEqual(true);
+                expect(info[i].bundleNames.length).assertLarger(0);
+        
+                expect(typeof (info[i].uid)).assertEqual("number");
+                expect(info[i].uid).assertLarger(0);
+            }
+            done();
+        })
+
     })
 }
\ No newline at end of file

ability/ability_runtime/amsgetabilityprocessinfo/actsgetabilityprocessinfotest/src/main/js/test/ActsProcessManageJsTest.test.js

@@ -58,5 +58,35 @@ describe('ActsAbilityRunningInfosTest', function () {
             done();
         })
     })
+
+    /*
+    * @tc.number: ACTS_getProcessRunningInformation_0300
+    * @tc.name: Application running ability information query
+    * @tc.desc: Verify applications are started to query getProcessRunningInformation ability information
+    *           （by promise）
+    */
+    it('ACTS_getProcessRunningInformation_0300', 0, async function (done) {
+        console.log('ACTS_getProcessRunningInformation_0300====<begin');
+        var data = await appManager.getProcessRunningInformation()
+        console.info('====> ACTS_getProcessRunningInformation_0300 ====>' + JSON.stringify(data))
+        expect(checkRunningProcess('com.example.abilityrunninginfostest', data)).assertTrue();
+        done();
+    })
+
+    /*
+    * @tc.number: ACTS_getProcessRunningInformation_0400
+    * @tc.name: Application running ability information query
+    * @tc.desc: Verify applications are started to query getProcessRunningInformation ability information
+    *           （by callback）
+    */
+    it('ACTS_getProcessRunningInformation_0400', 0, async function (done) {
+        console.log('ACTS_getProcessRunningInformation_0400====<begin');
+        appManager.getProcessRunningInformation((err, data) => {
+            console.info('====> ACTS_getProcessRunningInformation_0400 ====>' + JSON.stringify(data))
+            expect(checkRunningProcess('com.example.abilityrunninginfostest', data)).assertTrue();
+            done();
+        })
+    })
+
 })
 }

arkui/ace_ets_component/BUILD.gn

@@ -23,6 +23,8 @@ ohos_js_hap_suite("ActsAceEtsComponentTest") {
   ets2abc = true
   certificate_profile = "./signature/openharmony_sx.p7b"
   hap_name = "ActsAceEtsComponentTest"
+  subsystem_name = "arkui"
+  part_name = "ace_engine"
 }
 ohos_js_assets("ace_ets_component_assets") {
   source_dir = "./entry/src/main/ets/MainAbility"

arkui/ace_ets_component_five/BUILD.gn

@@ -23,6 +23,8 @@ ohos_js_hap_suite("ActsAceEtsComponentFiveTest") {
   ets2abc = true
   certificate_profile = "./signature/openharmony_sx.p7b"
   hap_name = "ActsAceEtsComponentFiveTest"
+  subsystem_name = "arkui"
+  part_name = "ace_engine"
 }
 ohos_js_assets("ace_ets_component_assets") {
   source_dir = "./entry/src/main/ets/MainAbility"

arkui/ace_ets_component_four/BUILD.gn

@@ -23,6 +23,8 @@ ohos_js_hap_suite("ActsAceEtsComponentFourTest") {
   ets2abc = true
   certificate_profile = "./signature/openharmony_sx.p7b"
   hap_name = "ActsAceEtsComponentFourTest"
+  subsystem_name = "arkui"
+  part_name = "ace_engine"
 }
 ohos_js_assets("ace_ets_component_assets") {
   source_dir = "./entry/src/main/ets/MainAbility"

arkui/ace_ets_component_three/BUILD.gn

@@ -23,6 +23,8 @@ ohos_js_hap_suite("ActsAceEtsComponentThreeTest") {
   ets2abc = true
   certificate_profile = "./signature/openharmony_sx.p7b"
   hap_name = "ActsAceEtsComponentThreeTest"
+  subsystem_name = "arkui"
+  part_name = "ace_engine"
 }
 ohos_js_assets("ace_ets_component_assets") {
   source_dir = "./entry/src/main/ets/MainAbility"

arkui/ace_ets_component_two/BUILD.gn

@@ -23,6 +23,8 @@ ohos_js_hap_suite("ActsAceEtsComponentTwoTest") {
   ets2abc = true
   certificate_profile = "./signature/openharmony_sx.p7b"
   hap_name = "ActsAceEtsComponentTwoTest"
+  subsystem_name = "arkui"
+  part_name = "ace_engine"
 }
 ohos_js_assets("ace_ets_component_assets") {
   source_dir = "./entry/src/main/ets/MainAbility"

arkui/ace_ets_standard/BUILD.gn

@@ -23,6 +23,8 @@ ohos_js_hap_suite("ActsAceEtsStTest") {
   ets2abc = true
   certificate_profile = "./signature/openharmony_sx.p7b"
   hap_name = "ActsAceEtsStTest"
+  subsystem_name = "arkui"
+  part_name = "ace_engine"
 }
 ohos_js_assets("ace_demo_ets_assets") {
   source_dir = "./entry/src/main/ets/MainAbility"

arkui/ace_ets_test/BUILD.gn

@@ -23,6 +23,8 @@ ohos_js_hap_suite("ActsAceEtsTest") {
   ets2abc = true
   certificate_profile = "./signature/openharmony_sx.p7b"
   hap_name = "ActsAceEtsTest"
+  subsystem_name = "arkui"
+  part_name = "ace_engine"
 }
 ohos_js_assets("ace_ets_assets") {
   source_dir = "./entry/src/main/ets/MainAbility"

arkui/ace_ets_third_test/BUILD.gn

@@ -23,6 +23,8 @@ ohos_js_hap_suite("ActsAceEtsThirdTest") {
   ets2abc = true
   certificate_profile = "./signature/openharmony_sx.p7b"
   hap_name = "ActsAceEtsThirdTest"
+  subsystem_name = "arkui"
+  part_name = "ace_engine"
 }
 ohos_js_assets("ace_third_ets_assets") {
   source_dir = "./entry/src/main/ets/MainAbility"

arkui/ace_ets_webView/BUILD.gn

@@ -22,6 +22,8 @@ ohos_js_hap_suite("AceEtsWebViewTest") {
   ets2abc = true
   certificate_profile = "./signature/openharmony_sx.p7b"
   hap_name = "AceEtsWebViewTest"
+  subsystem_name = "arkui"
+  part_name = "webview"
 }
 ohos_js_assets("ace_ets_webView_assets") {
   source_dir = "./entry/src/main/ets/MainAbility"

arkui/ace_napi_test/BUILD.gn

@@ -23,6 +23,8 @@ ohos_js_hap_suite("ActsAceNapiEtsTest") {
   ets2abc = true
   certificate_profile = "./signature/openharmony_sx.p7b"
   hap_name = "ActsAceNapiEtsTest"
+  subsystem_name = "arkui"
+  part_name = "napi"
   shared_libraries = [ "./entry/src/main/cpp:teststring" ]
 }
 

arkui/ace_standard/BUILD.gn

@@ -21,6 +21,8 @@ ohos_js_hap_suite("ActsAceStandardTest") {
   ]
   certificate_profile = "./signature/openharmony_sx.p7b"
   hap_name = "ActsAceStandardTest"
+  subsystem_name = "arkui"
+  part_name = "ace_engine"
 }
 ohos_js_assets("ace_js_assets") {
   source_dir = "./src/main/js/default"

arkui/ace_standard_video/BUILD.gn

@@ -21,6 +21,8 @@ ohos_js_hap_suite("ActsAceStandardVideoTest") {
   ]
   certificate_profile = "./signature/openharmony_sx.p7b"
   hap_name = "ActsAceStandardVideoTest"
+  subsystem_name = "arkui"
+  part_name = "ace_engine"
 }
 ohos_js_assets("ace_js_assets") {
   js2abc = true

bundlemanager/bundle_standard/bundlemanager/actsbmsaccesstokentest/src/main/config.json

@@ -17,7 +17,7 @@
         "package": "com.example.actsbmsaccesstokentest",
         "name": ".entry",
         "deviceType": [
-            "phone"
+            "default"
         ],
         "distro": {
             "deliveryWithInstall": true,

bundlemanager/bundle_standard/bundlemanager/actsbmsetsmodulenametest/entry/src/main/config.json

@@ -19,7 +19,7 @@
     "mainAbility": ".MainAbility",
     "srcPath": "",
     "deviceType": [
-      "phone"
+      "default"
     ],
     "distro": {
       "deliveryWithInstall": true,

bundlemanager/bundle_standard/bundlemanager/actsbmsetsmodulenametest/entry/src/main/ets/test/ActsBmsEtsModuleNameTest.test.ets

@@ -485,7 +485,7 @@ export default function actsBmsJsModuleNameTest() {
             expect(data.icon).assertEqual("$media:icon");
             expect(typeof (data.icon)).assertEqual("string");
             expect(data.isVisible).assertEqual(false);
-            expect(data.deviceTypes[0]).assertEqual("phone");
+            expect(data.deviceTypes[0]).assertEqual("default");
             expect(typeof (data.process)).assertEqual("string");
             expect(data.process).assertEqual("com.example.bmsmodulename");
             expect(typeof (data.uri)).assertEqual("string");
@@ -513,7 +513,7 @@ export default function actsBmsJsModuleNameTest() {
             expect(info.label).assertEqual("$string:app_name");
             expect(typeof (info.labelId)).assertEqual("number");
             expect(info.labelId > 0).assertTrue();
-            expect(info.systemApp).assertEqual(true);
+            expect(info.systemApp).assertEqual(false);
             expect(typeof (info.entryDir)).assertEqual("string");
             expect(info.entryDir).assertEqual("/data/app/el1/bundle/public/com.example.bmsmodulename/com.example.bmsmodulenamedentry");
             expect(typeof (info.process)).assertEqual("string");

bundlemanager/bundle_standard/bundlemanager/actsbmsetsunpermissiontest/entry/src/main/config.json

@@ -19,7 +19,7 @@
     "mainAbility": ".MainAbility",
     "srcPath": "",
     "deviceType": [
-      "phone"
+      "default"
     ],
     "distro": {
       "deliveryWithInstall": true,

bundlemanager/bundle_standard/bundlemanager/actsbmsetsunpermissiontest/entry/src/main/ets/test/ActsBmsEtsUnPermissionTest.test.ets

@@ -237,7 +237,7 @@ export default function actsBmsJsUnPermissionTest() {
             expect(data.description).assertEqual("$string:description_mainability");
             expect(data.icon).assertEqual("$media:icon");
             expect(data.isVisible).assertEqual(true);
-            expect(data.deviceTypes[0]).assertEqual("phone");
+            expect(data.deviceTypes[0]).assertEqual("default");
             expect(data.process).assertEqual("com.example.actsbmsetsunpermissiontest");
             expect(data.uri).assertEqual("");
             expect(data.moduleName).assertEqual("entry");
@@ -275,7 +275,7 @@ export default function actsBmsJsUnPermissionTest() {
             expect(info.labelId > 0).assertTrue();
             expect(info.labelIndex > 0).assertTrue();
             expect(info.labelIndex).assertEqual(info.labelId);
-            expect(info.systemApp).assertEqual(true);
+            expect(info.systemApp).assertEqual(false);
             expect(info.entryDir).assertEqual("/data/app/el1/bundle/public/com.example.actsbmsetsunpermissiontest/com.example.actsbmsetsunpermissiontest");
             expect(info.supportedModes).assertEqual(0);
             expect(info.process).assertEqual("com.example.actsbmsetsunpermissiontest");

bundlemanager/bundle_standard/bundlemanager/actsbmsgetinfostest/src/main/config.json

@@ -17,7 +17,7 @@
         "package": "com.example.actsbmsgetinfostest",
         "name": ".entry",
         "deviceType": [
-            "phone"
+            "default"
         ],
         "distro": {
             "deliveryWithInstall": true,

bundlemanager/bundle_standard/bundlemanager/actsbmsgetinfostest/src/main/js/test/ActsBmsQueryAbilityByWant.test.js

@@ -158,7 +158,7 @@ describe('ActsBmsQueryAbilityByWant', function () {
         expect(data.isVisible).assertEqual(false);
         expect(data.permissions.length).assertEqual(0);
         expect(data.deviceCapabilities.length).assertEqual(0);
-        expect(data.deviceTypes[0]).assertEqual('phone');
+        expect(data.deviceTypes[0]).assertEqual('default');
         expect(data.process).assertEqual(SYSTEM_NAME);
         expect(data.uri).assertEqual('');
         expect(data.bundleName).assertEqual(SYSTEM_NAME);

bundlemanager/bundle_standard/bundlemanager/actsbmshapmoduletest/src/main/config.json

@@ -17,7 +17,7 @@
         "package": "com.example.actsbmshapmoduletest",
         "name": ".entry",
         "deviceType": [
-            "phone"
+            "default"
         ],
         "distro": {
             "deliveryWithInstall": true,

bundlemanager/bundle_standard/bundlemanager/actsbmshapmoduletest/src/main/js/test/ActsBmsHapModuleTest.test.js

@@ -27,7 +27,7 @@ const ICON = '$media:icon';
 const ICON_ID = 16777218;
 const LABEL = '$string:app_name';
 const LABEL_ID = 16777216;
-const DEVICE_TYPES = 'phone';
+const DEVICE_TYPES = 'default';
 const FIRST_SCENE_HAP_NAME = 'com.example.bmsmainabilityfirstscene.MyApplication';
 const SECOND_SCENE_HAP_NAME = 'com.example.bmsmainabilitysecondscene.MyApplication';
 const THIRD_TWO_HAP_NAME = 'com.example.third2.MyApplication';

bundlemanager/bundle_standard/bundlemanager/actsbmsjstest/src/main/config.json

@@ -17,7 +17,7 @@
         "package": "com.example.actsbmsjstest",
         "name": ".entry",
         "deviceType": [
-            "phone"
+            "default"
         ],
         "distro": {
             "deliveryWithInstall": true,

bundlemanager/bundle_standard/bundlemanager/actsbmsjstest/src/main/js/test/ActsBmsHasInstalldTest.test.js

@@ -31,7 +31,7 @@ describe('ActsBmsHasInstalldTest', function () {
     it('hasInstalled_0100', 0, async function (done) {
         let flag = 0;
         pkg.hasInstalled({
-            bundleName: 'com.ohos.launcher',
+            bundleName: 'com.example.third2',
             success: function success(data) {
                 console.info('hasInstalled success function in');
                 flag += 1;

bundlemanager/bundle_standard/bundlemanager/actsbmsjstest/src/main/js/test/ActsBmsJsTest.test.js

@@ -54,7 +54,7 @@ describe('ActsBmsJsTest', function () {
             expect(abilityInfo1.icon).assertEqual("$media:icon");
             expect(abilityInfo1.isVisible).assertEqual(true);
             expect(abilityInfo1.permissions.length).assertEqual(0);
-            expect(abilityInfo1.deviceTypes[0]).assertEqual('phone');
+            expect(abilityInfo1.deviceTypes[0]).assertEqual('default');
             expect(abilityInfo1.process).assertEqual(BUNDLE_NAME2);
             expect(abilityInfo1.uri).assertEqual("");
             expect(abilityInfo1.bundleName).assertEqual(BUNDLE_NAME2);
@@ -130,7 +130,7 @@ describe('ActsBmsJsTest', function () {
             expect(abilityInfo1.icon).assertEqual("$media:icon");
             expect(abilityInfo1.isVisible).assertEqual(true);
             expect(abilityInfo1.permissions.length).assertEqual(0);
-            expect(abilityInfo1.deviceTypes[0]).assertEqual('phone');
+            expect(abilityInfo1.deviceTypes[0]).assertEqual('default');
             expect(abilityInfo1.process).assertEqual(BUNDLE_NAME4);
             expect(abilityInfo1.uri).assertEqual("");
             expect(abilityInfo1.bundleName).assertEqual(BUNDLE_NAME4);
@@ -173,7 +173,7 @@ describe('ActsBmsJsTest', function () {
             expect(abilityInfo1.icon).assertEqual("$media:icon");
             expect(abilityInfo1.isVisible).assertEqual(true);
             expect(abilityInfo1.permissions.length).assertEqual(0);
-            expect(abilityInfo1.deviceTypes[0]).assertEqual('phone');
+            expect(abilityInfo1.deviceTypes[0]).assertEqual('default');
             expect(abilityInfo1.process).assertEqual(BUNDLE_NAME5);
             expect(abilityInfo1.uri).assertEqual("");
             expect(abilityInfo1.bundleName).assertEqual(BUNDLE_NAME5);
@@ -205,7 +205,7 @@ describe('ActsBmsJsTest', function () {
         expect(info.icon).assertEqual("$media:icon");
         expect(info.isVisible).assertEqual(true);
         expect(info.permissions.length).assertEqual(0);
-        expect(info.deviceTypes[0]).assertEqual('phone');
+        expect(info.deviceTypes[0]).assertEqual('default');
         expect(info.process).assertEqual(BUNDLE_NAME3);
         expect(info.uri).assertEqual("");
         expect(info.bundleName).assertEqual(BUNDLE_NAME3);

bundlemanager/bundle_standard/bundlemanager/actsbmsjsunpermissiontest/src/main/config.json

@@ -17,7 +17,7 @@
         "package": "com.example.actsbmsjsunpermissiontest",
         "name": ".entry",
         "deviceType": [
-            "phone"
+            "default"
         ],
         "distro": {
             "deliveryWithInstall": true,

bundlemanager/bundle_standard/bundlemanager/actsbmsmetadatatest/src/main/config.json

@@ -17,7 +17,7 @@
         "package": "com.example.actsbmsmetadatatest",
         "name": ".entry",
         "deviceType": [
-            "phone"
+            "default"
         ],
         "distro": {
             "deliveryWithInstall": true,

bundlemanager/bundle_standard/bundlemanager/actsbmsstageetstest/entry/src/main/module.json

@@ -6,7 +6,7 @@
         "description": "$string:phone_entry_dsc",
         "mainElement": "MainAbility",
         "deviceTypes": [
-            "phone"
+            "default"
         ],
         "deliveryWithInstall": true,
         "installationFree": false,

bundlemanager/bundle_standard/bundlemanager/actsbundlemanageretstest/entry/src/main/config.json

@@ -19,7 +19,7 @@
     "srcPath": "",
     "mainAbility": "com.open.harmony.packagemag.MainAbility",
     "deviceType": [
-      "phone"
+      "default"
     ],
     "reqPermissions": [
       {

bundlemanager/bundle_standard/bundlemanager/actsbundlemanageretstest/entry/src/main/ets/test/GetabilityInfo.test.ets

@@ -230,7 +230,7 @@ export default function GetabilityInfo() {
             expect(data.isVisible).assertEqual(true);
             expect(Array.isArray(data.permissions)).assertEqual(true);
             expect(Array.isArray(data.deviceCapabilities)).assertEqual(true);
-            expect(data.deviceTypes[0]).assertEqual("phone");
+            expect(data.deviceTypes[0]).assertEqual("default");
             expect(typeof (data.process)).assertEqual("string");
             expect(data.process).assertEqual("com.open.harmony.packagemag");
             expect(typeof (data.uri)).assertEqual("string");
@@ -268,7 +268,7 @@ export default function GetabilityInfo() {
             expect(typeof (info.labelIndex)).assertEqual("number");
             expect(info.labelIndex > 0).assertTrue();
             expect(info.labelIndex).assertEqual(info.labelId);
-            expect(info.systemApp).assertEqual(true);
+            expect(info.systemApp).assertEqual(false);
             expect(typeof (info.entryDir)).assertEqual("string");
             expect(info.entryDir).assertEqual("/data/app/el1/bundle/public/com.open.harmony.packagemag/com.open.harmony.packagemag");
             expect(typeof (info.supportedModes)).assertEqual("number");
@@ -287,7 +287,7 @@ export default function GetabilityInfo() {
             expect(data.description).assertEqual("$string:mainability_description");
             expect(data.icon).assertEqual("$media:icon");
             expect(data.isVisible).assertEqual(true);
-            expect(data.deviceTypes[0]).assertEqual("phone");
+            expect(data.deviceTypes[0]).assertEqual("default");
             expect(data.process).assertEqual("com.example.third1");
             expect(data.uri).assertEqual("");
             expect(data.moduleName).assertEqual("entry");

bundlemanager/bundle_standard/bundlemanager/actsbundlemanageretstest/entry/src/main/ets/test/QueryExtensionAbilityInfos.test.ets

@@ -1017,7 +1017,7 @@ export default function QueryExtensionAbilityInfos() {
       expect(data[0].applicationInfo.labelId).assertLarger(0);
       expect(data[0].applicationInfo.labelIndex).assertLarger(0);
       expect(data[0].applicationInfo.labelIndex).assertEqual(data[0].applicationInfo.labelId);
-      expect(data[0].applicationInfo.systemApp).assertTrue();
+      expect(data[0].applicationInfo.systemApp).assertFalse();
       expect(data[0].applicationInfo.supportedModes).assertEqual(0);
       expect(data[0].applicationInfo.process).assertEqual("ohos.acts.bundle.stage");
       expect(data[0].applicationInfo.entryDir).assertEqual("/data/app/el1/bundle/public/ohos.acts.bundle.stage/phone");

bundlemanager/bundle_standard/bundlemanager/actsbundlemanageretstest/entry/src/main/ets/test/getAllApplicationInfoJsunit.test.ets

@@ -343,7 +343,7 @@ export default function getAllApplicationBundleTest() {
                     if (data[i].uid !== 0) {
                         expect(data[i].uid > 0).assertEqual(true);
                     };
-                    expect(data[i].systemApp).assertEqual(true);
+                    expect(data[i].systemApp).assertEqual(false);
                     expect(data[i].supportedModes).assertEqual(0);
                     expect(data[i].process).assertEqual('com.open.harmony.packagemag');
                     expect(data[i].entryDir).assertEqual('/data/app/el1/bundle/public/com.open.harmony.packagemag' +

bundlemanager/bundle_standard/bundlemanager/actsbundlemanageretstest/entry/src/main/ets/test/getApplicationInfoJsunit.test.ets

@@ -416,6 +416,7 @@ export default function applicationBundleJsunit() {
                 expect(applicationInfo.descriptionResource.bundleName).assertEqual('com.open.harmony.packagemag')
                 expect(applicationInfo.descriptionResource.moduleName).assertEqual('entry')
                 expect(applicationInfo.descriptionResource.id).assertLarger(0)
+                expect(applicationInfo.appProvisionType).assertEqual('release')
                 done();
             }).catch((err) => {
                 expect(err).assertFail();
@@ -469,7 +470,7 @@ export default function applicationBundleJsunit() {
             expect(data.labelId > 0).assertEqual(true);
             expect(data.labelIndex > 0).assertEqual(true);
             expect(data.labelIndex).assertEqual(data.labelId);
-            expect(data.systemApp).assertEqual(true);
+            expect(data.systemApp).assertEqual(false);
             expect(data.supportedModes).assertEqual(0);
             expect(data.process).assertEqual(BUNDLE_NAME);
             expect(data.entryDir).assertEqual(PATH + '/' + BUNDLE_NAME + '/' + BUNDLE_NAME);
@@ -499,7 +500,7 @@ export default function applicationBundleJsunit() {
             expect(data.labelId).assertLarger(0);
             expect(data.labelIndex).assertLarger(0);
             expect(data.labelIndex).assertEqual(data.labelId);
-            expect(data.systemApp).assertTrue();
+            expect(data.systemApp).assertFalse();
             expect(data.supportedModes).assertEqual(0);
             expect(data.process).assertEqual(BUNDLE_NAME);
             expect(data.entryDir).assertEqual(PATH + '/' + BUNDLE_NAME + '/' + BUNDLE_NAME);

bundlemanager/bundle_standard/bundlemanager/actsbundlemanageretstest/entry/src/main/ets/test/getWindowProperties.test.ets

@@ -32,18 +32,18 @@ const ABILITY_NAME_TEST_10 = "MainAbility10"
 const ABILITY_NAME_TEST_11 = "MainAbility11"
 const ABILITY_NAME_TEST_12 = "MainAbility12"
 const ORIENTATION = "orientation"
-const UNSPECIFIED = 0
-const LANDSCAPE = 1
-const PORTRAIT = 2
-const LANDSCAPE_INVERTED = 4
-const PORTRAIT_INVERTED = 5
-const AUTO_ROTATION = 6
-const AUTO_ROTATION_LANDSCAPE = 7
-const AUTO_ROTATION_PORTRAIT = 8
-const AUTO_ROTATION_RESTRICTED = 9
-const AUTO_ROTATION_LANDSCAPE_RESTRICTED = 10
-const AUTO_ROTATION_PORTRAIT_RESTRICTED = 11
-const LOCKED = 12
+const UNSPECIFIED = bundle.DisplayOrientation.UNSPECIFIED
+const LANDSCAPE = bundle.DisplayOrientation.LANDSCAPE
+const PORTRAIT = bundle.DisplayOrientation.PORTRAIT
+const LANDSCAPE_INVERTED = bundle.DisplayOrientation.LANDSCAPE_INVERTED
+const PORTRAIT_INVERTED = bundle.DisplayOrientation.PORTRAIT_INVERTED
+const AUTO_ROTATION = bundle.DisplayOrientation.AUTO_ROTATION
+const AUTO_ROTATION_LANDSCAPE = bundle.DisplayOrientation.AUTO_ROTATION_LANDSCAPE
+const AUTO_ROTATION_PORTRAIT = bundle.DisplayOrientation.AUTO_ROTATION_PORTRAIT
+const AUTO_ROTATION_RESTRICTED = bundle.DisplayOrientation.AUTO_ROTATION_RESTRICTED
+const AUTO_ROTATION_LANDSCAPE_RESTRICTED = bundle.DisplayOrientation.AUTO_ROTATION_LANDSCAPE_RESTRICTED
+const AUTO_ROTATION_PORTRAIT_RESTRICTED = bundle.DisplayOrientation.AUTO_ROTATION_PORTRAIT_RESTRICTED
+const LOCKED = bundle.DisplayOrientation.LOCKED
 const DEFAULT_VALUE = 0
 const MAX_WINDOW_RATIO_VALUE = 3.5
 const MIN_WINDOW_RATIO_VALUE = 0.5

bundlemanager/bundle_standard/bundlemanager/actsbundlemanagertest/src/main/config.json

@@ -17,7 +17,7 @@
         "package": "com.example.actsbundlemanagertest",
         "name": ".entry",
         "deviceType": [
-            "phone"
+            "default"
         ],
         "distro": {
             "deliveryWithInstall": true,

bundlemanager/bundle_standard/bundlemanager/actsbundlemanagertest/src/main/js/test/ExampleJsunit.test.js

@@ -73,7 +73,7 @@ describe('ActsBundleManagerTest', function () {
         expect(datainfo.appInfo.iconId >= 0).assertTrue();
         expect(datainfo.appInfo.label).assertEqual("$string:app_name");
         expect(datainfo.appInfo.labelId >= 0).assertTrue();
-        expect(datainfo.appInfo.systemApp).assertEqual(true);
+        expect(datainfo.appInfo.systemApp).assertEqual(false);
         expect(datainfo.appInfo.supportedModes).assertEqual(0);
         expect(datainfo.installTime).assertLarger(0);
         expect(datainfo.updateTime).assertLarger(0);
@@ -137,7 +137,7 @@ describe('ActsBundleManagerTest', function () {
         expect(datainfo.appInfo.iconId >= 0).assertTrue();
         expect(datainfo.appInfo.label).assertEqual("$string:app_name");
         expect(datainfo.appInfo.labelId >= 0).assertTrue();
-        expect(datainfo.appInfo.systemApp).assertEqual(true);
+        expect(datainfo.appInfo.systemApp).assertEqual(false);
         expect(datainfo.appInfo.supportedModes).assertEqual(0);
         expect(datainfo.installTime).assertLarger(0);
         expect(datainfo.updateTime).assertLarger(0);
@@ -185,7 +185,7 @@ describe('ActsBundleManagerTest', function () {
         expect(datainfo.appInfo.iconId >= 0).assertTrue();
         expect(datainfo.appInfo.label).assertEqual("$string:app_name");
         expect(datainfo.appInfo.labelId >= 0).assertTrue();
-        expect(datainfo.appInfo.systemApp).assertEqual(true);
+        expect(datainfo.appInfo.systemApp).assertEqual(false);
         done();
     })
 
@@ -210,7 +210,7 @@ describe('ActsBundleManagerTest', function () {
             expect(datainfo.appInfo.iconId >= 0).assertTrue();
             expect(datainfo.appInfo.label).assertEqual("$string:app_name");
             expect(datainfo.appInfo.labelId >= 0).assertTrue();
-            expect(datainfo.appInfo.systemApp).assertEqual(true);
+            expect(datainfo.appInfo.systemApp).assertEqual(false);
             done();
         }
     })
@@ -248,7 +248,7 @@ describe('ActsBundleManagerTest', function () {
         expect(datainfo.appInfo.iconId >= 0).assertTrue();
         expect(datainfo.appInfo.label).assertEqual("$string:app_name");
         expect(datainfo.appInfo.labelId >= 0).assertTrue();
-        expect(datainfo.appInfo.systemApp).assertEqual(true);
+        expect(datainfo.appInfo.systemApp).assertEqual(false);
         expect(datainfo.appInfo.supportedModes).assertEqual(0);
         for (let j = 0; j < datainfo.appInfo.moduleInfos.length; j++) {
             expect(datainfo.appInfo.moduleInfos[j].moduleName).assertEqual("entry");
@@ -293,7 +293,7 @@ describe('ActsBundleManagerTest', function () {
             expect(datainfo.appInfo.iconId >= 0).assertTrue();
             expect(datainfo.appInfo.label).assertEqual("$string:app_name");
             expect(datainfo.appInfo.labelId >= 0).assertTrue();
-            expect(datainfo.appInfo.systemApp).assertEqual(true);
+            expect(datainfo.appInfo.systemApp).assertEqual(false);
             expect(datainfo.appInfo.supportedModes).assertEqual(0);
             for (let j = 0; j < datainfo.appInfo.moduleInfos.length; j++) {
                 expect(datainfo.appInfo.moduleInfos[j].moduleName).assertEqual("entry");
@@ -398,7 +398,7 @@ describe('ActsBundleManagerTest', function () {
         expect(datainfo.appInfo.iconId >= 0).assertTrue();
         expect(datainfo.appInfo.label).assertEqual("$string:app_name");
         expect(datainfo.appInfo.labelId >= 0).assertTrue();
-        expect(datainfo.appInfo.systemApp).assertEqual(true);
+        expect(datainfo.appInfo.systemApp).assertEqual(false);
         expect(datainfo.appInfo.supportedModes).assertEqual(0);
         expect(datainfo.appInfo.enabled).assertEqual(true);
         done();
@@ -425,7 +425,7 @@ describe('ActsBundleManagerTest', function () {
             expect(datainfo.appInfo.iconId >= 0).assertTrue();
             expect(datainfo.appInfo.label).assertEqual("$string:app_name");
             expect(datainfo.appInfo.labelId >= 0).assertTrue();
-            expect(datainfo.appInfo.systemApp).assertEqual(true);
+            expect(datainfo.appInfo.systemApp).assertEqual(false);
             expect(datainfo.appInfo.supportedModes).assertEqual(0);
             for (let j = 0; j < datainfo.appInfo.moduleInfos.length; j++) {
                 expect(datainfo.appInfo.moduleInfos[j].moduleName).assertEqual("entry");
@@ -460,7 +460,7 @@ describe('ActsBundleManagerTest', function () {
                 expect(datainfo.versionName.length).assertLarger(0);
                 expect(datainfo.uid).assertLarger(2099);
                 expect(datainfo.appInfo.name).assertEqual(NAME1);
-                expect(datainfo.appInfo.systemApp).assertEqual(true);
+                expect(datainfo.appInfo.systemApp).assertEqual(false);
                 expect(datainfo.appInfo.supportedModes).assertEqual(0);
                 expect(datainfo.appInfo.moduleInfos.length).assertLarger(0);
                 expect(datainfo.appInfo.enabled).assertEqual(true);
@@ -492,7 +492,7 @@ describe('ActsBundleManagerTest', function () {
         expect(dataInfo.appInfo.iconId >= 0).assertTrue();
         expect(dataInfo.appInfo.label).assertEqual("$string:app_name");
         expect(dataInfo.appInfo.labelId >= 0).assertTrue();
-        expect(dataInfo.appInfo.systemApp).assertEqual(true);
+        expect(dataInfo.appInfo.systemApp).assertEqual(false);
         expect(dataInfo.appInfo.supportedModes).assertEqual(0);
         expect(dataInfo.updateTime).assertLarger(0);
         expect(dataInfo.reqPermissions.length).assertEqual(0);
@@ -541,7 +541,7 @@ describe('ActsBundleManagerTest', function () {
             expect(dataInfo.appInfo.iconId >= 0).assertTrue();
             expect(dataInfo.appInfo.label).assertEqual("$string:app_name");
             expect(dataInfo.appInfo.labelId >= 0).assertTrue();
-            expect(dataInfo.appInfo.systemApp).assertEqual(true);
+            expect(dataInfo.appInfo.systemApp).assertEqual(false);
             expect(dataInfo.appInfo.supportedModes).assertEqual(0);
             expect(dataInfo.updateTime).assertLarger(0);
             expect(dataInfo.reqPermissions.length).assertEqual(0);
@@ -707,7 +707,7 @@ describe('ActsBundleManagerTest', function () {
                 expect(datainfo.description).assertEqual(APPLICATION_DESCRIPTION);
                 expect(datainfo.icon).assertEqual("$media:icon");
                 expect(datainfo.label).assertEqual("$string:app_name");
-                expect(datainfo.systemApp).assertEqual(true);
+                expect(datainfo.systemApp).assertEqual(false);
                 expect(datainfo.descriptionId).assertLarger(0);
                 expect(parseInt(datainfo.iconId)).assertLarger(0);
                 expect(parseInt(datainfo.labelId)).assertLarger(0);
@@ -753,7 +753,7 @@ describe('ActsBundleManagerTest', function () {
                 expect(datainfo.description).assertEqual(APPLICATION_DESCRIPTION);
                 expect(datainfo.icon).assertEqual("$media:icon");
                 expect(datainfo.label).assertEqual("$string:app_name");
-                expect(datainfo.systemApp).assertEqual(true);
+                expect(datainfo.systemApp).assertEqual(false);
                 expect(datainfo.descriptionId).assertLarger(0);
                 expect(parseInt(datainfo.iconId)).assertLarger(0);
                 expect(parseInt(datainfo.labelId)).assertLarger(0);
@@ -792,7 +792,7 @@ describe('ActsBundleManagerTest', function () {
         expect(datainfo.description).assertEqual(APPLICATION_DESCRIPTION);
         expect(datainfo.icon).assertEqual("$media:icon");
         expect(datainfo.label).assertEqual("$string:app_name");
-        expect(datainfo.systemApp).assertEqual(true);
+        expect(datainfo.systemApp).assertEqual(false);
         expect(datainfo.descriptionId >= 0).assertTrue();
         expect(datainfo.iconId >= 0).assertTrue();
         expect(datainfo.labelId >= 0).assertTrue();
@@ -829,7 +829,7 @@ describe('ActsBundleManagerTest', function () {
                 expect(datainfo.description).assertEqual(APPLICATION_DESCRIPTION);
                 expect(datainfo.icon).assertEqual("$media:icon");
                 expect(datainfo.label).assertEqual("$string:app_name");
-                expect(datainfo.systemApp).assertEqual(true);
+                expect(datainfo.systemApp).assertEqual(false);
                 expect(datainfo.descriptionId >= 0).assertTrue();
                 expect(datainfo.iconId >= 0).assertTrue();
                 expect(datainfo.labelId >= 0).assertTrue();
@@ -866,7 +866,7 @@ describe('ActsBundleManagerTest', function () {
         expect(datainfo.iconId >= 0).assertTrue();
         expect(datainfo.label).assertEqual("$string:app_name");
         expect(datainfo.labelId >= 0).assertTrue();
-        expect(datainfo.systemApp).assertEqual(true);
+        expect(datainfo.systemApp).assertEqual(false);
         expect(datainfo.supportedModes).assertEqual(0);
         done();
     })
@@ -890,7 +890,7 @@ describe('ActsBundleManagerTest', function () {
                 expect(datainfo.iconId >= 0).assertTrue();
                 expect(datainfo.label).assertEqual("$string:app_name");
                 expect(datainfo.labelId >= 0).assertTrue();
-                expect(datainfo.systemApp).assertEqual(true);
+                expect(datainfo.systemApp).assertEqual(false);
                 expect(datainfo.supportedModes).assertEqual(0);
                 done();
             })
@@ -988,7 +988,7 @@ describe('ActsBundleManagerTest', function () {
             expect(datainfo.descriptionId).assertLarger(0);
             expect(parseInt(datainfo.iconId)).assertLarger(0);
             expect(parseInt(datainfo.labelId)).assertLarger(0);
-            expect(datainfo.systemApp).assertEqual(true);
+            expect(datainfo.systemApp).assertEqual(false);
             expect(datainfo.supportedModes).assertEqual(0);
             done();
         }).catch(err => {
@@ -1020,7 +1020,7 @@ describe('ActsBundleManagerTest', function () {
             expect(datainfo.descriptionId).assertLarger(0);
             expect(parseInt(datainfo.iconId)).assertLarger(0);
             expect(parseInt(datainfo.labelId)).assertLarger(0);
-            expect(datainfo.systemApp).assertEqual(true);
+            expect(datainfo.systemApp).assertEqual(false);
             expect(datainfo.supportedModes).assertEqual(0);
             done();
         })
@@ -1043,7 +1043,7 @@ describe('ActsBundleManagerTest', function () {
                 expect(datainfo.descriptionId >= 0).assertTrue();
                 expect(parseInt(datainfo.iconId)).assertLarger(0);
                 expect(parseInt(datainfo.labelId)).assertLarger(0);
-                expect(datainfo.systemApp).assertEqual(true);
+                expect(datainfo.systemApp).assertEqual(false);
                 expect(datainfo.supportedModes).assertEqual(0);
                 expect(datainfo.enabled).assertEqual(true);
                 for (let j = 0; j < datainfo.moduleInfos.length; j++) {
@@ -1081,7 +1081,7 @@ describe('ActsBundleManagerTest', function () {
                 expect(datainfo.descriptionId >= 0).assertTrue();
                 expect(parseInt(datainfo.iconId)).assertLarger(0);
                 expect(parseInt(datainfo.labelId)).assertLarger(0);
-                expect(datainfo.systemApp).assertEqual(true);
+                expect(datainfo.systemApp).assertEqual(false);
                 expect(datainfo.supportedModes).assertEqual(0);
                 expect(datainfo.enabled).assertEqual(true);
                 for (let j = 0; j < datainfo.moduleInfos.length; j++) {
@@ -1421,7 +1421,7 @@ describe('ActsBundleManagerTest', function () {
                     expect(datainfo.applicationInfo.iconId >= 0).assertTrue();
                     expect(datainfo.applicationInfo.label).assertEqual("$string:app_name");
                     expect(datainfo.applicationInfo.labelId >= 0).assertTrue();
-                    expect(datainfo.applicationInfo.systemApp).assertEqual(true);
+                    expect(datainfo.applicationInfo.systemApp).assertEqual(false);
                     expect(datainfo.applicationInfo.supportedModes).assertEqual(0);
                     expect(datainfo.applicationInfo.enabled).assertEqual(true);
                     expect(datainfo.metaData.length).assertLarger(0);
@@ -1480,7 +1480,7 @@ describe('ActsBundleManagerTest', function () {
                     expect(datainfo.applicationInfo.iconId >= 0).assertTrue();
                     expect(datainfo.applicationInfo.label).assertEqual("$string:app_name");
                     expect(datainfo.applicationInfo.labelId >= 0).assertTrue();
-                    expect(datainfo.applicationInfo.systemApp).assertEqual(true);
+                    expect(datainfo.applicationInfo.systemApp).assertEqual(false);
                     expect(datainfo.applicationInfo.supportedModes).assertEqual(0);
                     expect(datainfo.applicationInfo.enabled).assertEqual(true);
                     expect(datainfo.metaData.length).assertLarger(0);
@@ -1523,7 +1523,7 @@ describe('ActsBundleManagerTest', function () {
             expect(datainfo.applicationInfo.iconId >= 0).assertTrue();
             expect(datainfo.applicationInfo.label).assertEqual("$string:app_name");
             expect(datainfo.applicationInfo.labelId >= 0).assertTrue();
-            expect(datainfo.applicationInfo.systemApp).assertEqual(true);
+            expect(datainfo.applicationInfo.systemApp).assertEqual(false);
             expect(datainfo.applicationInfo.supportedModes).assertEqual(0);
             expect(datainfo.applicationInfo.enabled).assertEqual(true);
             expect(datainfo.applicationInfo.moduleInfos[0].moduleName).assertEqual("entry");
@@ -1564,7 +1564,7 @@ describe('ActsBundleManagerTest', function () {
                     expect(datainfo.applicationInfo.iconId >= 0).assertTrue();
                     expect(datainfo.applicationInfo.label).assertEqual("$string:app_name");
                     expect(datainfo.applicationInfo.labelId >= 0).assertTrue();
-                    expect(datainfo.applicationInfo.systemApp).assertEqual(true);
+                    expect(datainfo.applicationInfo.systemApp).assertEqual(false);
                     expect(datainfo.applicationInfo.supportedModes).assertEqual(0);
                     expect(datainfo.applicationInfo.enabled).assertEqual(true);
                     expect(datainfo.applicationInfo.moduleInfos[0].moduleName).assertEqual("entry");
@@ -1614,7 +1614,7 @@ describe('ActsBundleManagerTest', function () {
                 expect(datainfo.applicationInfo.iconId >= 0).assertTrue();
                 expect(datainfo.applicationInfo.label).assertEqual("$string:app_name");
                 expect(datainfo.applicationInfo.labelId >= 0).assertTrue();
-                expect(datainfo.applicationInfo.systemApp).assertEqual(true);
+                expect(datainfo.applicationInfo.systemApp).assertEqual(false);
                 expect(datainfo.applicationInfo.supportedModes).assertEqual(0);
                 expect(datainfo.orientation).assertEqual(demo.DisplayOrientation.PORTRAIT);
                 expect(datainfo.orientation).assertEqual(2);
@@ -1682,7 +1682,7 @@ describe('ActsBundleManagerTest', function () {
                 expect(datainfo.applicationInfo.iconId >= 0).assertTrue();
                 expect(datainfo.applicationInfo.label).assertEqual("$string:app_name");
                 expect(datainfo.applicationInfo.labelId >= 0).assertTrue();
-                expect(datainfo.applicationInfo.systemApp).assertEqual(true);
+                expect(datainfo.applicationInfo.systemApp).assertEqual(false);
                 expect(datainfo.applicationInfo.supportedModes).assertEqual(0);
                 expect(datainfo.orientation).assertEqual(2);
                 expect(datainfo.applicationInfo.enabled).assertEqual(true);

bundlemanager/bundle_standard/bundlemanager/actsbundlenativetest/entry/src/main/config.json

@@ -19,7 +19,7 @@
     "mainAbility": "com.actsbundle.napitest.MainAbility",
 
     "deviceType": [
-      "phone"
+      "default"
     ],
     "distro": {
       "deliveryWithInstall": true,

bundlemanager/bundle_standard/bundlemanager/actsbundlenativetest/entry/src/main/ets/test/BudnleNdkNativeTest.ets

@@ -17,7 +17,7 @@ import {describe, beforeAll, beforeEach, afterEach, afterAll, it, expect} from "
 import bundlendk from 'libbundlendk.so'
 
 const BUNDLE_NAME = "com.actsbundle.napitest"
-const FINGER_PRINT = "7B3D8586460A7666621992FD367993D7ECDE40A8FD8E9CF525A48822E9A62655"
+const FINGER_PRINT = "8E93863FC32EE238060BF69A9B37E2608FFFB21F93C862DD511CBAC9F30024B5"
 
 export default function budnleNdkNativeTest() {
     describe('BundleNdkTest', function () {

bundlemanager/bundle_standard/bundlemanager/sceneProject/bmsaccesstokenfive/src/main/config.json

@@ -17,7 +17,7 @@
     "package": "com.example.bmsaccesstoken3",
     "name": ".MyApplication1",
     "deviceType": [
-      "phone"
+      "default"
     ],
     "distro": {
       "deliveryWithInstall": true,

bundlemanager/bundle_standard/bundlemanager/sceneProject/bmsaccesstokenfour/src/main/config.json

@@ -17,7 +17,7 @@
     "package": "com.example.bmsaccesstoken2",
     "name": ".MyApplication1",
     "deviceType": [
-      "phone"
+      "default"
     ],
     "distro": {
       "deliveryWithInstall": true,

bundlemanager/bundle_standard/bundlemanager/sceneProject/bmsaccesstokenone/src/main/config.json

@@ -17,7 +17,7 @@
     "package": "com.example.bmsaccesstoken1",
     "name": ".MyApplication1",
     "deviceType": [
-      "phone"
+      "default"
     ],
     "distro": {
       "deliveryWithInstall": true,

bundlemanager/bundle_standard/bundlemanager/sceneProject/bmsaccesstokenthree/src/main/config.json

@@ -17,7 +17,7 @@
     "package": "com.example.bmsaccesstoken2",
     "name": ".MyApplication2",
     "deviceType": [
-      "phone"
+      "default"
     ],
     "distro": {
       "deliveryWithInstall": true,

bundlemanager/bundle_standard/bundlemanager/sceneProject/bmsaccesstokentwo/src/main/config.json

@@ -17,7 +17,7 @@
     "package": "com.example.bmsaccesstoken2",
     "name": ".MyApplication1",
     "deviceType": [
-      "phone"
+      "default"
     ],
     "distro": {
       "deliveryWithInstall": true,

bundlemanager/bundle_standard/bundlemanager/sceneProject/bmsgetinfosfifthscene/src/main/config.json

@@ -18,7 +18,7 @@
     "name": ".BmsThirdBundle5",
     "mainAbility": "com.example.third5.AMainAbility",
     "deviceType": [
-      "phone"
+      "default"
     ],
     "distro": {
       "deliveryWithInstall": true,

bundlemanager/bundle_standard/bundlemanager/sceneProject/bmsgetinfosfirstscene/src/main/config.json

@@ -20,7 +20,7 @@
     "name": "com.example.third1.BmsThirdBundle1",
     "colorMode": "light",
     "deviceType": [
-      "phone"
+      "default"
     ],
     "distro": {
       "deliveryWithInstall": true,

bundlemanager/bundle_standard/bundlemanager/sceneProject/bmsgetinfosfirstsceneupdate/src/main/config.json

@@ -21,7 +21,7 @@
     "mainAbility": "com.example.third1.MainAbility",
     "colorMode": "dark",
     "deviceType": [
-      "phone"
+      "default"
     ],
     "distro": {
       "deliveryWithInstall": true,

bundlemanager/bundle_standard/bundlemanager/sceneProject/bmsgetinfosfourthscene/src/main/config.json

@@ -17,7 +17,7 @@
     "package": "com.example.third4",
     "name": ".BmsThirdBundle4",
     "deviceType": [
-      "phone"
+      "default"
     ],
     "distro": {
       "deliveryWithInstall": true,

bundlemanager/bundle_standard/bundlemanager/sceneProject/bmsgetinfoshapc/src/main/config.json

@@ -17,7 +17,7 @@
     "package": "com.example.c",
     "name": ".MyApplication",
     "deviceType": [
-      "phone"
+      "default"
     ],
     "distro": {
       "deliveryWithInstall": true,

bundlemanager/bundle_standard/bundlemanager/sceneProject/bmsgetinfosjsscene/src/main/config.json

@@ -17,7 +17,7 @@
     "package": "com.example.js",
     "name": ".MyApplication",
     "deviceType": [
-      "phone"
+      "default"
     ],
     "distro": {
       "deliveryWithInstall": true,

bundlemanager/bundle_standard/bundlemanager/sceneProject/bmsgetinfosscenesystem/src/main/config.json

@@ -20,7 +20,7 @@
     "name": ".BmsSystemBundle1",
     "mainAbility": "com.example.system1.MainAbility",
     "deviceType": [
-      "phone"
+      "default"
     ],
     "distro": {
       "deliveryWithInstall": true,

bundlemanager/bundle_standard/bundlemanager/sceneProject/bmsgetinfosscenesystemtwo/src/main/config.json

@@ -20,7 +20,7 @@
     "name": ".BmsSystemBundle1",
     "mainAbility": "com.example.system2.MainAbility",
     "deviceType": [
-      "phone"
+      "default"
     ],
     "distro": {
       "deliveryWithInstall": true,

bundlemanager/bundle_standard/bundlemanager/sceneProject/bmsgetinfosscenevendor/src/main/config.json

@@ -17,7 +17,7 @@
     "package": "com.example.vendor1",
     "name": ".BmsVendorBundle1",
     "deviceType": [
-      "phone"
+      "default"
     ],
     "distro": {
       "deliveryWithInstall": true,

bundlemanager/bundle_standard/bundlemanager/sceneProject/bmsgetinfossecondscene/src/main/config.json

@@ -17,7 +17,7 @@
     "package": "com.example.third2",
     "name": ".MyApplication",
     "deviceType": [
-      "phone"
+      "default"
     ],
     "distro": {
       "deliveryWithInstall": true,

bundlemanager/bundle_standard/bundlemanager/sceneProject/bmsgetinfosseventhscene/src/main/config.json

@@ -21,7 +21,7 @@
   "module": {
     "mainAbility": ".MainAbility",
     "deviceType": [
-      "phone"
+      "default"
     ],
     "abilities": [
       {

bundlemanager/bundle_standard/bundlemanager/sceneProject/bmsgetinfossixthscene/src/main/config.json

@@ -17,7 +17,7 @@
     "package": "com.example.third6",
     "name": ".MyApplication",
     "deviceType": [
-      "phone"
+      "default"
     ],
     "distro": {
       "deliveryWithInstall": true,

bundlemanager/bundle_standard/bundlemanager/sceneProject/bmsgetinfosthirdscene/src/main/config.json

@@ -20,7 +20,7 @@
     "name": ".BmsThirdBundle3",
     "colorMode": "auto",
     "deviceType": [
-      "phone"
+      "default"
     ],
     "distro": {
       "deliveryWithInstall": true,

bundlemanager/bundle_standard/bundlemanager/sceneProject/bmsmainabilityfirstscene/src/main/config.json

@@ -18,7 +18,7 @@
     "mainAbility": "com.example.bmsmainabilityfirstscene.MainAbility",
     "name": ".MyApplication",
     "deviceType": [
-      "phone"
+      "default"
     ],
     "distro": {
       "deliveryWithInstall": true,

bundlemanager/bundle_standard/bundlemanager/sceneProject/bmsmainabilitysecondscene/src/main/config.json

@@ -18,7 +18,7 @@
     "mainAbility": "com.example.bmsmainabilitysecondscene.MainAbility",
     "name": ".MyApplication",
     "deviceType": [
-      "phone"
+      "default"
     ],
     "distro": {
       "deliveryWithInstall": true,