!4980 【包管理子系统】【master】签名文件app-feature修改为hos_normal_app和应用设备类型由phone改为default

Merge pull request !4980 from ry/master

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

@@ -469,7 +469,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 +499,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/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,

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

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

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

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

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

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

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

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

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

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

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

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

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

@@ -44,7 +44,7 @@
       }
     ],
     "deviceType": [
-      "phone"
+      "default"
     ],
     "distro": {
       "moduleType": "feature",

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

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

bundlemanager/bundle_standard/bundlemanager/sceneProject/bmsstagedemoone/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/sceneProject/bmsstagedemotwo/entry/src/main/module.json

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

bundlemanager/zlib/actszipfileandunzipfiletest/src/main/config.json

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