Merge branch 'monthly_20221018' of gitee.com:openharmony/xts_acts into monthly_20221018

Signed-off-by: Nry <ry.renyi@huawei.com>

ability/ability_runtime/actsappselector/actsappselectorpctest/entry/src/main/module.json

@@ -32,6 +32,16 @@
           }
         ]
       }
+    ],
+    "requestPermissions": [
+      {
+        "name":"ohos.permission.START_ABILITIES_FROM_BACKGROUND",
+        "reason":"need use ohos.permission.START_ABILITIES_FROM_BACKGROUND"
+      },
+      {
+        "name":"ohos.permission.START_INVISIBLE_ABILITY",
+        "reason":"need use ohos.permission.START_INVISIBLE_ABILITY"
+      }
     ]
   }
 }
\ No newline at end of file

ability/ability_runtime/actsappselector/actsappselectortest/entry/src/main/module.json

@@ -31,6 +31,16 @@
           }
         ]
       }
+    ],
+    "requestPermissions": [
+      {
+        "name":"ohos.permission.START_ABILITIES_FROM_BACKGROUND",
+        "reason":"need use ohos.permission.START_ABILITIES_FROM_BACKGROUND"
+      },
+      {
+        "name":"ohos.permission.START_INVISIBLE_ABILITY",
+        "reason":"need use ohos.permission.START_INVISIBLE_ABILITY"
+      }
     ]
   }
 }
\ No newline at end of file

ability/ability_runtime/actscalltest/systemcallentrytest/entry/src/main/ets/test/Ability.test.ets

@@ -1002,5 +1002,186 @@ export default function abilityTest() {
       expect(exceptionFlag).assertEqual(true);
       done();
     })
+
+    /**
+     * @tc.number: ACTS_CommonComponent_Call_5500
+     * @tc.name: The callee exits abnormally after the caller requests the call to be called successfully.
+     * @tc.desc: Verify that the caller can register the server's death listener.
+     */
+    it('ACTS_CommonComponent_Call_5500', 0, async function (done) {
+      console.log('ACTS_CommonComponent_Call_5500 begin');
+
+      function releaseCallback(data) {
+        console.log('ACTS_CommonComponent_Call_5500 releaseCallBack:' + data);
+        expect(data).assertEqual("died");
+        done();
+      }
+
+      let bundleNameCallee = "com.example.systemappcalleea";
+      let abilityNameCallee = "com.example.systemappcalleea.MainAbility";
+      let want = {
+        bundleName: bundleNameCallee,
+        abilityName: abilityNameCallee,
+      }
+      let caller = await globalThis.globalThis.abilityContext.startAbilityByCall(want);
+      if (typeof caller !== "object" || caller == null) {
+        console.log('ACTS_CommonComponent_Call_5500 startAbilityByCall fail');
+        expect().assertFail();
+      }
+      try {
+        caller.on('release', releaseCallback);
+      } catch (e) {
+        console.log('ACTS_CommonComponent_Call_5500 Caller onRelease fail ' + e);
+        expect().assertFail();
+      }
+      await appManager.killProcessesByBundleName(bundleNameCallee);
+    })
+
+    /**
+     * @tc.number: ACTS_CommonComponent_Call_5600
+     * @tc.name: The callee exits abnormally after the caller requests the call to be called successfully.
+     * @tc.desc: Verify that the caller can unregister the server's death listener.
+     */
+    it('ACTS_CommonComponent_Call_5600', 0, async function (done) {
+      console.log('ACTS_CommonComponent_Call_5600 begin');
+
+      function releaseCallback(data) {
+        console.log('ACTS_CommonComponent_Call_5600 releaseCallBack:' + data);
+        expect(data).assertEqual("died");
+        done();
+      }
+
+      let bundleNameCallee = "com.example.systemappcalleea";
+      let abilityNameCallee = "com.example.systemappcalleea.MainAbility";
+      let want = {
+        bundleName: bundleNameCallee,
+        abilityName: abilityNameCallee,
+      }
+      let caller = await globalThis.globalThis.abilityContext.startAbilityByCall(want);
+      if (typeof caller !== "object" || caller == null) {
+        console.log('ACTS_CommonComponent_Call_5600 startAbilityByCall fail');
+        expect().assertFail();
+      }
+      try {
+        caller.off('release', releaseCallback);
+      } catch (e) {
+        console.log('ACTS_CommonComponent_Call_5600 Caller onRelease fail ' + e);
+        expect().assertFail();
+        done();
+      }
+      await appManager.killProcessesByBundleName(bundleNameCallee);
+      done();
+    })
+
+    /**
+     * @tc.number: ACTS_CommonComponent_Call_5700
+     * @tc.name: The callee exits abnormally after the caller requests the call to be called successfully.
+     * @tc.desc: Verify that the caller can unregister the server's death listener.
+     */
+    it('ACTS_CommonComponent_Call_5700', 0, async function (done) {
+      console.log('ACTS_CommonComponent_Call_5700 begin');
+
+      function releaseCallback(data) {
+        console.log('ACTS_CommonComponent_Call_5700 releaseCallBack:' + data);
+        expect(data).assertEqual("died");
+        done();
+      }
+
+      let bundleNameCallee = "com.example.systemappcalleea";
+      let abilityNameCallee = "com.example.systemappcalleea.MainAbility";
+      let want = {
+        bundleName: bundleNameCallee,
+        abilityName: abilityNameCallee,
+      }
+      let caller = await globalThis.globalThis.abilityContext.startAbilityByCall(want);
+      if (typeof caller !== "object" || caller == null) {
+        console.log('ACTS_CommonComponent_Call_5700 startAbilityByCall fail');
+        expect().assertFail();
+      }
+      let flag = false;
+      try {
+        caller.off('release');
+      } catch (e) {
+        console.log('ACTS_CommonComponent_Call_5700 Caller onRelease fail ' + e);
+        flag = true;
+      }
+      await appManager.killProcessesByBundleName(bundleNameCallee);
+      expect(flag).assertEqual(true);
+      done();
+    })
+
+    /**
+     * @tc.number: ACTS_CommonComponent_Call_5800
+     * @tc.name: The callee exits abnormally after the caller requests the call to be called successfully.
+     * @tc.desc: Verify that the caller can unregister the server's death listener.
+     */
+    it('ACTS_CommonComponent_Call_5800', 0, async function (done) {
+      console.log('ACTS_CommonComponent_Call_5800 begin');
+
+      function releaseCallback(data) {
+        console.log('ACTS_CommonComponent_Call_5800 releaseCallBack:' + data);
+        expect(data).assertEqual("died");
+        done();
+      }
+
+      let bundleNameCallee = "com.example.systemappcalleea";
+      let abilityNameCallee = "com.example.systemappcalleea.MainAbility";
+      let want = {
+        bundleName: bundleNameCallee,
+        abilityName: abilityNameCallee,
+      }
+      let caller = await globalThis.globalThis.abilityContext.startAbilityByCall(want);
+      if (typeof caller !== "object" || caller == null) {
+        console.log('ACTS_CommonComponent_Call_5800 startAbilityByCall fail');
+        expect().assertFail();
+      }
+      let flag = false;
+      try {
+        caller.off('Not release', releaseCallback);
+      } catch (e) {
+        console.log('ACTS_CommonComponent_Call_5800 Caller onRelease fail ' + e);
+        flag = true;
+      }
+      await appManager.killProcessesByBundleName(bundleNameCallee);
+      expect(flag).assertEqual(true);
+      done();
+    })
+
+    /**
+     * @tc.number: ACTS_CommonComponent_Call_5900
+     * @tc.name: The callee exits abnormally after the caller requests the call to be called successfully.
+     * @tc.desc: Verify that the caller can unregister the server's death listener.
+     */
+    it('ACTS_CommonComponent_Call_5900', 0, async function (done) {
+      console.log('ACTS_CommonComponent_Call_5900 begin');
+
+      function releaseCallback(data) {
+        console.log('ACTS_CommonComponent_Call_5900 releaseCallBack:' + data);
+        expect(data).assertEqual("died");
+        done();
+      }
+
+      let bundleNameCallee = "com.example.systemappcalleea";
+      let abilityNameCallee = "com.example.systemappcalleea.MainAbility";
+      let want = {
+        bundleName: bundleNameCallee,
+        abilityName: abilityNameCallee,
+      }
+      let caller = await globalThis.globalThis.abilityContext.startAbilityByCall(want);
+      if (typeof caller !== "object" || caller == null) {
+        console.log('ACTS_CommonComponent_Call_5900 startAbilityByCall fail');
+        expect().assertFail();
+      }
+      let flag = false;
+      try {
+        caller.off('Not release');
+      } catch (e) {
+        console.log('ACTS_CommonComponent_Call_5900 Caller onRelease fail ' + e);
+        flag = true;
+      }
+      await appManager.killProcessesByBundleName(bundleNameCallee);
+      expect(flag).assertEqual(true);
+      done();
+    })
   })
 }
\ No newline at end of file

ability/ability_runtime/actscalltest/thirdcalltest/entry/src/main/ets/test/Ability.test.ets

@@ -88,8 +88,8 @@ export default function abilityTest() {
 
     /**
      * @tc.number: ACTS_CommonComponent_Call_1100
-     * @tc.name: The parameter "method" of the Caller.callWithResult function is an empty string.
-     * @tc.desc: Verify that the parameter "method" of the Caller.callWithResult function is an empty string.
+     * @tc.name: The thirdApp is not allowed to startAbilityByCall.
+     * @tc.desc: Verify that the thirdApp is not allowed to startAbilityByCall.
      */
     it('ACTS_CommonComponent_Call_1100', 0, async function (done) {
       console.log('ACTS_CommonComponent_Call_1100 begin');
@@ -111,8 +111,8 @@ export default function abilityTest() {
 
     /**
      * @tc.number: ACTS_CommonComponent_Call_1500
-     * @tc.name: The parameter "method" of the Caller.callWithResult function is an empty string.
-     * @tc.desc: Verify that the parameter "method" of the Caller.callWithResult function is an empty string.
+     * @tc.name: The thirdApp is not allowed to startAbilityByCall.
+     * @tc.desc: Verify that the thirdApp is not allowed to startAbilityByCall.
      */
     it('ACTS_CommonComponent_Call_1500', 0, async function (done) {
       console.log('ACTS_CommonComponent_Call_1500 begin');
@@ -122,20 +122,20 @@ export default function abilityTest() {
       }
       globalThis.abilityContext.startAbilityByCall(want)
         .then(data => {
-          console.info(`ACTS_CommonComponent_Call_1100 startAbilityByCall SUCCESS`);
+          console.info(`ACTS_CommonComponent_Call_1500 startAbilityByCall SUCCESS`);
           expect().assertFail();
           done();
         })
         .catch(error => {
-          console.info(`ACTS_CommonComponent_Call_1100 startAbilityByCall Catch`);
+          console.info(`ACTS_CommonComponent_Call_1500 startAbilityByCall Catch`);
           done();
         });
     })
 
     /**
      * @tc.number: ACTS_CommonComponent_Call_1600
-     * @tc.name: The parameter "method" of the Caller.callWithResult function is an empty string.
-     * @tc.desc: Verify that the parameter "method" of the Caller.callWithResult function is an empty string.
+     * @tc.name: The thirdApp is not allowed to startAbilityByCall.
+     * @tc.desc: Verify that the thirdApp is not allowed to startAbilityByCall.
      */
     it('ACTS_CommonComponent_Call_1600', 0, async function (done) {
       console.log('ACTS_CommonComponent_Call_1600 begin');
@@ -145,12 +145,12 @@ export default function abilityTest() {
       }
       globalThis.abilityContext.startAbilityByCall(want)
         .then(data => {
-          console.info(`ACTS_CommonComponent_Call_1100 startAbilityByCall SUCCESS`);
+          console.info(`ACTS_CommonComponent_Call_1600 startAbilityByCall SUCCESS`);
           expect().assertFail();
           done();
         })
         .catch(error => {
-          console.info(`ACTS_CommonComponent_Call_1100 startAbilityByCall Catch`);
+          console.info(`ACTS_CommonComponent_Call_1600 startAbilityByCall Catch`);
           done();
         });
     })

ability/ability_runtime/actssingleton/SystemSingletonExtension/entry/src/main/ets/test/Ability.test.ets

@@ -48,7 +48,7 @@ export default function singleusermodelTest() {
 
             console.debug("====>start connectAbilityWithAccount====>");
 
-            connId = globalThis.abilityContext.connectAbilityWithAccount(
+            connId = globalThis.abilityContext.connectServiceExtensionAbilityWithAccount(
                 {
                     bundleName: "com.singleusermodel.actssingleusertest",
                     abilityName: "ServiceAbility1",
@@ -86,7 +86,7 @@ export default function singleusermodelTest() {
                     console.info('executeShellCommand : err : ' + JSON.stringify(err));
                 })
                 console.debug('ACTS_ExtensionSingleUserModel_0500====>timeout====>');
-                await globalThis.abilityContext.disconnectAbility(connId).then((data) => {
+                await globalThis.abilityContext.disconnectServiceExtensionAbility(connId).then((data) => {
                     console.debug("====>data is====>" + JSON.stringify(data));
                 })
             }, START_ABILITY_TIMEOUT);

ability/ability_runtime/actsusers/ActsAmsUsersExtensionSystemTest/entry/src/main/module.json

@@ -114,6 +114,14 @@
       {
         "name": "ohos.permission.INTERACT_ACROSS_LOCAL_ACCOUNTS_EXTENSION",
         "reason": "need use ohos.permission.MANAGE_LOCAL_ACCOUNTS"
+      },
+      {
+        "name":"ohos.permission.START_ABILITIES_FROM_BACKGROUND",
+        "reason":"need use ohos.permission.START_ABILITIES_FROM_BACKGROUND"
+      },
+      {
+        "name":"ohos.permission.START_INVISIBLE_ABILITY",
+        "reason":"need use ohos.permission.START_INVISIBLE_ABILITY"
       }
     ]
   }

ability/ability_runtime/actsusers/ActsAmsUsersExtensionThirdTest/entry/src/main/module.json

@@ -61,6 +61,16 @@
         "type": "service",
         "visible": true
       }
+    ],
+    "requestPermissions": [
+      {
+        "name":"ohos.permission.START_ABILITIES_FROM_BACKGROUND",
+        "reason":"need use ohos.permission.START_ABILITIES_FROM_BACKGROUND"
+      },
+      {
+        "name":"ohos.permission.START_INVISIBLE_ABILITY",
+        "reason":"need use ohos.permission.START_INVISIBLE_ABILITY"
+      }
     ]
   }
 }

ability/ability_runtime/actsusers/actsconnectabilitysystemabilitytest/entry/src/main/ets/test/manyusersabilitytest.test.ets

@@ -81,13 +81,12 @@ export default function abilityTest() {
       let id;
       let connId;
 
-
       function subscribeCallBack(err, data) {
         console.debug("====>ACTS_ConnectAbility_0100 7 CallBack data:====>" + JSON.stringify(data));
         clearTimeout(id);
         expect(data.event).assertEqual("AMS_ConnectAbility_0100_commonEvent");
         console.debug("====>ACTS_ConnectAbility_0100 5  ");
-        globalThis.abilityContext.disconnectAbility(
+        globalThis.abilityContext.disconnectServiceExtensionAbility(
           connId,
           (error, data) => {
             console.log('featureAbilityTest DisconnectAbility result errCode : ' + error.code + " data: " + data)
@@ -98,7 +97,6 @@ export default function abilityTest() {
 
       }
 
-
       commonEvent.createSubscriber(subscriberInfoStartAbility_0100).then(async (data) => {
         console.debug("====>ACTS_ConnectAbility_0100 2  Subscriber1====>");
         subscriber = data;
@@ -114,7 +112,7 @@ export default function abilityTest() {
         expect().assertFail();
         console.debug('AMS_ConnectAbility_0100 timeout');
         commonEvent.unsubscribe(subscriber, unSubscribeCallback)
-        globalThis.abilityContext.disconnectAbility(
+        globalThis.abilityContext.disconnectServiceExtensionAbility(
           connId,
           (error, data) => {
             console.log('featureAbilityTest DisconnectAbility result errCode : ' + error.code + " data: " + data)
@@ -139,7 +137,7 @@ export default function abilityTest() {
 
       id = setTimeout(timeout, START_ABILITY_TIMEOUT);
       console.debug("====>ACTS_ConnectAbility_0100 3  ");
-      connId = await globalThis.abilityContext.connectAbility(
+      connId = await globalThis.abilityContext.connectServiceExtensionAbility(
         {
           bundleName: "com.example.actsconnectabilitysystemabilitytest",
           abilityName: "com.example.actsconnectabilitysystemabilitytest.ServiceAbility",
@@ -152,7 +150,6 @@ export default function abilityTest() {
         }
       );
       console.debug("====>ACTS_ConnectAbility_0100 4  ");
-
     })
 
     /*

ability/ability_runtime/apicover/apicoverhaptest/entry/src/main/ets/test/ApiCoverAbility.test.ets

@@ -26,6 +26,7 @@ import applicationContext from '@ohos.application.context'
 import commonEvent from '@ohos.commonEvent';
 import ability from '@ohos.ability.ability';
 import abilityDelegatorRegistry from '@ohos.app.ability.abilityDelegatorRegistry';
+import common from '@ohos.app.ability.common';
 
 var EXTENSION_INFO_ERR = 16000001
 var INNER_ERROR = 16000050
@@ -312,8 +313,21 @@ export default function ApiCoverTest() {
      */
     it('SUB_AA_ABILITY_Extension_API_012', 0, async function (done) {
       try {
-        globalThis.abilityContext.getApplicationContext().killProcessesBySelf();
-        globalThis.abilityContext.getApplicationContext().killProcessesBySelf((err, data) => {
+        let info: appManager.ProcessRunningInfo;
+        let stageContext: common.AbilityStageContext = globalThis.stageContext;
+        let abilityContext: common.AbilityContext = globalThis.abilityContext;
+        let appContext: common.ApplicationContext = abilityContext.getApplicationContext();
+        let baseContext: common.BaseContext = stageContext;
+        let context: common.Context = stageContext;
+        let el1 = common.AreaMode.EL1;
+        let el2 = common.AreaMode.EL2;
+        let eventHub: common.EventHub = context.eventHub;
+        let permissionRequestResult: common.PermissionRequestResult;
+        let abilityResult: common.AbilityResult;
+        let connectOptions: common.ConnectOptions;
+
+        appContext.killProcessesBySelf();
+        appContext.killProcessesBySelf((err, data) => {
             console.log(`killProcessesBySelf, err: ${JSON.stringify(err)}, data: ${JSON.stringify(data)}`);
         })
         let abilityDelegator: abilityDelegatorRegistry.AbilityDelegator;

ability/ability_runtime/apicover/formmodule/entry/src/main/ets/FormAbility/FormAbility.ts

 import FormExtensionAbility from '@ohos.app.form.FormExtensionAbility';
 import formBindingData from '@ohos.app.form.formBindingData';
 import formInfo from '@ohos.app.form.formInfo';
+import common from '@ohos.app.ability.common';
 
 export default class FormModuleAbility extends FormExtensionAbility {
     onAddForm(want) {
         // Called to return a FormBindingData object.
         console.info("FormAbility onAddForm")
         globalThis.abilityContext = this.context;
+        let formExtensionAbilities: common.FormExtensionContext = this.context;
+        let extensionAbilities: common.ExtensionContext = this.context;
         let formData = {
         };
         return formBindingData.createFormBindingData(formData);

ability/ability_runtime/want/actsgetwantalltest/src/main/js/test/ActsGetWantAllTest.js

@@ -44,6 +44,7 @@ describe('ActsGetWantTest', function () {
                     mykey3: "str",
                     mykey4: [false, true, false],
                     mykey5: ["str", "STR", "helloopenharmony"],
+                    mykey6: {"subKey1":"STRING", "subKey2":10, "subKey3":true},
                 },
             }
         }).then((data) => {
@@ -64,6 +65,9 @@ describe('ActsGetWantTest', function () {
             expect(data.want.parameters.mykey5[0]).assertEqual("str");
             expect(data.want.parameters.mykey5[1]).assertEqual("STR");
             expect(data.want.parameters.mykey5[2]).assertEqual("helloopenharmony");
+            expect(data.want.parameters.mykey6["subKey1"]).assertEqual("STRING");
+            expect(data.want.parameters.mykey6["subKey2"]).assertEqual(10);
+            expect(data.want.parameters.mykey6["subKey3"]).assertEqual(true);
             setTimeout(()=>{
                 done();
             }, TIMEOUT_NUMBER);

ability/dmsfwk/continuationmanagertest/src/main/config.json

@@ -17,6 +17,7 @@
         "name": ".entry",
         "mainAbility": ".MainAbility",
         "deviceType": [
+            "tablet",
             "default"
         ],
         "distro": {
@@ -91,4 +92,4 @@
         },
         "srcPath": ""
     }
-}
+}
\ No newline at end of file

account/OsAccountTest_js/src/main/config.json

@@ -18,6 +18,7 @@
     "mainAbility": ".MainAbility",
     "srcPath":"",
     "deviceType": [
+      "tablet",
       "default",
       "phone"
     ],

account/appaccount/actsaccounttest/src/main/config.json

@@ -17,6 +17,7 @@
     "package": "com.example.actsaccounttest",
     "name": ".MyApplication",
     "deviceType": [
+      "tablet",
       "default",
       "phone"
     ],

account/appaccount/actsaccounttstest/entry/src/main/module.json

@@ -6,6 +6,7 @@
         "description": "$string:phone_entry_dsc",
         "mainElement": "MainAbility",
         "deviceTypes": [
+      "tablet",
       "default",
             "phone"
         ],

account/appaccount/actsgetallaccounts/src/main/config.json

@@ -19,6 +19,7 @@
     "mainAbility": ".MainAbility",
     "srcPath":"",
     "deviceType": [
+      "tablet",
       "default",
       "phone"
     ],

account/appaccount/actssetchecksyncenable/src/main/config.json

@@ -19,6 +19,7 @@
     "mainAbility": ".MainAbility",
     "srcPath":"",
     "deviceType": [
+      "tablet",
       "default",
       "phone"
     ],

account/appaccount/getallaccessibleaccounts/actsgetallaccessibleaccounts/src/main/config.json

@@ -19,6 +19,7 @@
     "mainAbility": ".MainAbility",
     "srcPath":"",
     "deviceType": [
+      "tablet",
       "default",
       "phone"
     ],

account/appaccount/getallaccessibleaccounts/actsgetallaccessiblemultiple/src/main/config.json

@@ -19,6 +19,7 @@
     "mainAbility": ".MainAbility",
     "srcPath":"",
     "deviceType": [
+      "tablet",
       "default",
       "phone"
     ],

account/appaccount/sceneProject/actsaccountaccessibleFirst/entry/src/main/config.json

@@ -17,6 +17,7 @@
     "package": "com.example.actsaccountaccessiblefirst",
     "name": ".MyApplication",
     "deviceType": [
+      "tablet",
       "default",
       "phone"
     ],

account/appaccount/sceneProject/actsaccountaccessibleSecond/entry/src/main/config.json

@@ -17,6 +17,7 @@
     "package": "com.example.actsaccountaccessiblesecond",
     "name": ".MyApplication",
     "deviceType": [
+      "tablet",
       "default",
       "phone"
     ],

account/appaccount/sceneProject/actsaccountauthenticator/entry/src/main/config.json

@@ -15,6 +15,7 @@
   "module": {
     "mainAbility": ".MainAbility",
     "deviceType": [
+      "tablet",
       "default",
       "default",
       "tablet"

account/appaccount/sceneProject/actsaccountoauthtoken/entry/src/main/config.json

@@ -17,6 +17,7 @@
     "package": "com.example.actsaccountOauthtoken",
     "name": ".MyApplication",
     "deviceType": [
+      "tablet",
       "default",
       "phone"
     ],

account/appaccount/sceneProject/actsaccountsceneaccessible/entry/src/main/config.json

@@ -17,6 +17,7 @@
     "package": "com.example.actsaccountsceneaccessible",
     "name": ".MyApplication",
     "deviceType": [
+      "tablet",
       "default",
       "phone"
     ],

account/appaccount/sceneProject/actsaccountsceneappaccess/entry/src/main/config.json

@@ -17,6 +17,7 @@
     "package": "com.example.actsaccountsceneappaccess",
     "name": ".MyApplication",
     "deviceType": [
+      "tablet",
       "default",
       "phone"
     ],

account/appaccount/sceneProject/actsaccountsceneonoff/entry/src/main/config.json

@@ -17,6 +17,7 @@
     "package": "com.example.actsaccountsceneonoff",
     "name": ".MyApplication",
     "deviceType": [
+      "tablet",
       "default",
       "phone"
     ],

account/appaccount/sceneProject/actsscenegetallaccounts/entry/src/main/config.json

@@ -17,6 +17,7 @@
     "package": "com.example.actsscenegetallaccounts",
     "name": ".MyApplication",
     "deviceType": [
+      "tablet",
       "default",
       "phone"
     ],

account/osaccount/actsosaccountthirdpartytest/src/main/config.json

@@ -19,6 +19,7 @@
     "mainAbility": ".MainAbility",
     "srcPath":"",
     "deviceType": [
+      "tablet",
       "default",
       "phone"
     ],

applications/settingsdata/settings_ets/entry/src/main/config.json

@@ -19,6 +19,7 @@
     "mainAbility": "com.open.harmony.settings.MainAbility",
     "srcPath": "",
     "deviceType": [
+      "tablet",
       "default",
       "phone"
     ],

arkXtest/uitest/Test.json

@@ -20,11 +20,17 @@
             "type": "ShellKit",
             "run-command": [
                 "param set persist.ace.testmode.enabled 1",
+                "param set persist.sys.suspend_manager_enabled 0",
+                "reboot",
                 "power-shell wakeup",
                 "hilog -Q pidoff",
                 "hilog -b DEBUG",
                 "uinput -T -d 300 600 -m 300 600 300 100 -u 300 100",
                 "power-shell setmode 602"
+            ],
+            "teardown-command": [
+                "param set persist.sys.suspend_manager_enabled 1",
+                "reboot"
             ]
         }
     ]

arkXtest/uitest/src/main/config.json

@@ -19,6 +19,7 @@
     "mainAbility": ".MainAbility",
     "srcPath": "MainAbility",
     "deviceType": [
+      "tablet",
       "default",
       "phone"
     ],

arkXtest/uitest/src/main/ets/test/uitest.test.ets

@@ -70,7 +70,7 @@ export default function UiTest() {
             expect(await Button1.getText() == 'next page').assertTrue()
             let Button2 = await driver.findComponent(BY.text('next', MatchPattern.STARTS_WITH))
             expect(await Button2.getText() == 'next page').assertTrue()
-            let Button3 = await driver.findComponent(BY.text('page', MatchPattern.ENDS_WITH))
+            let Button3 = await driver.findComponent(BY.text('xt page', MatchPattern.ENDS_WITH))
             expect(await Button3.getText() == 'next page').assertTrue()
             let Button4 = await driver.findComponent(BY.text('ext', MatchPattern.CONTAINS))
             expect(await Button4.getText() == 'next page').assertTrue()
@@ -476,7 +476,7 @@ export default function UiTest() {
             expect(await Button1.getText() == 'next page').assertTrue()
             let Button2 = await driver.findComponent(ON.text('next',MatchPattern.STARTS_WITH))
             expect(await Button2.getText() == 'next page').assertTrue()
-            let Button3 = await driver.findComponent(ON.text('page',MatchPattern.ENDS_WITH))
+            let Button3 = await driver.findComponent(ON.text('xt page',MatchPattern.ENDS_WITH))
             expect(await Button3.getText() == 'next page').assertTrue()
             let Button4 = await driver.findComponent(ON.text('ext',MatchPattern.CONTAINS))
             expect(await Button4.getText() == 'next page').assertTrue()
@@ -1372,25 +1372,49 @@ export default function UiTest() {
             await startAbility('com.uitestScene.acts', 'com.uitestScene.acts.MainAbility')
             let driver = Driver.create()
             await driver.delayMs(waitUiReadyMs)
-            await driver.delayMs(waitUiReadyMs)
-            await driver.setDisplayRotation(DisplayRotation.ROTATION_90)
-            let rotation1 = await driver.getDisplayRotation()
-            expect(rotation1 == DisplayRotation.ROTATION_90).assertTrue()
-            await driver.delayMs(waitUiReadyMs)
-
             await driver.setDisplayRotation(DisplayRotation.ROTATION_180)
-            let rotation2 = await driver.getDisplayRotation()
-            expect(rotation2 == DisplayRotation.ROTATION_180).assertTrue()
-            await driver.delayMs(waitUiReadyMs)
+            let rotation = await driver.getDisplayRotation()
+            if (rotation == DisplayRotation.ROTATION_180) {
+                console.info('The device is displayed in vertical on default')
+                await driver.setDisplayRotation(DisplayRotation.ROTATION_90)
+                await driver.delayMs(waitUiReadyMs)
+                let rotation1 = await driver.getDisplayRotation()
+                expect(rotation1 == DisplayRotation.ROTATION_90)
+                await driver.setDisplayRotation(DisplayRotation.ROTATION_180)
+                await driver.delayMs(waitUiReadyMs)
+                let rotation2 = await driver.getDisplayRotation()
+                expect(rotation2 == DisplayRotation.ROTATION_180)
+                await driver.setDisplayRotation(DisplayRotation.ROTATION_270)
+                await driver.delayMs(waitUiReadyMs)
+                let rotation3 = await driver.getDisplayRotation()
+                expect(rotation3 == DisplayRotation.ROTATION_270)
+                await driver.setDisplayRotation(DisplayRotation.ROTATION_0)
+                await driver.delayMs(waitUiReadyMs)
+                let rotation4 = await driver.getDisplayRotation()
+                expect(rotation4 == DisplayRotation.ROTATION_0)
+            } else if (rotation == DisplayRotation.ROTATION_270) {
+                console.info('The device is displayed in horizontal on default')
+                await driver.setDisplayRotation(DisplayRotation.ROTATION_90)
+                await driver.delayMs(waitUiReadyMs)
+                let rotation1 = await driver.getDisplayRotation()
+                expect(rotation1 == DisplayRotation.ROTATION_0)
 
-            await driver.setDisplayRotation(DisplayRotation.ROTATION_270)
-            let rotation3 = await driver.getDisplayRotation()
-            expect(rotation3 == DisplayRotation.ROTATION_270).assertTrue()
-            await driver.delayMs(waitUiReadyMs)
+                await driver.setDisplayRotation(DisplayRotation.ROTATION_180)
+                await driver.delayMs(waitUiReadyMs)
+                let rotation2 = await driver.getDisplayRotation()
+                expect(rotation2 == DisplayRotation.ROTATION_270)
+
+                await driver.setDisplayRotation(DisplayRotation.ROTATION_270)
+                await driver.delayMs(waitUiReadyMs)
+                let rotation3 = await driver.getDisplayRotation()
+                expect(rotation3 == DisplayRotation.ROTATION_180)
 
-            await driver.setDisplayRotation(DisplayRotation.ROTATION_0)
-            let rotation4 = await driver.getDisplayRotation()
-            expect(rotation4== DisplayRotation.ROTATION_0).assertTrue()
+                await driver.setDisplayRotation(DisplayRotation.ROTATION_0)
+                await driver.delayMs(waitUiReadyMs)
+                let rotation4 = await driver.getDisplayRotation()
+                expect(rotation4 == DisplayRotation.ROTATION_90)
+                await driver.setDisplayRotation(DisplayRotation.ROTATION_90)
+            }
             await stopApplication('com.uitestScene.acts')
         })
 
@@ -1402,14 +1426,20 @@ export default function UiTest() {
         it('testSetDisplayRotationEnabled', 0, async function () {
             await startAbility('com.uitestScene.acts', 'com.uitestScene.acts.MainAbility')
             let driver = Driver.create()
-            await driver.setDisplayRotationEnabled(false)
             await driver.setDisplayRotation(DisplayRotation.ROTATION_180)
-            await driver.delayMs(waitUiReadyMs)
+            let rotation = await driver.getDisplayRotation()
             await driver.setDisplayRotationEnabled(true)
             await driver.setDisplayRotation(DisplayRotation.ROTATION_90)
+            await driver.delayMs(waitUiReadyMs)
             let rotation2 = await driver.getDisplayRotation()
-            expect(rotation2 == DisplayRotation.ROTATION_90).assertTrue()
-            await driver.setDisplayRotation(DisplayRotation.ROTATION_0)
+            if (rotation == DisplayRotation.ROTATION_180) {
+                console.info('The device is displayed in vertical on default')
+                expect(rotation2 == DisplayRotation.ROTATION_90)
+                await driver.setDisplayRotation(DisplayRotation.ROTATION_0)
+            } else {
+                expect(rotation2 == DisplayRotation.ROTATION_0)
+                console.info('The device is displayed in horizontal on default')
+            }
             await stopApplication('com.uitestScene.acts')
         })
 

arkXtest/uitestScene/src/main/config.json

@@ -19,6 +19,7 @@
     "mainAbility": ".MainAbility",
     "srcPath": "MainAbility",
     "deviceType": [
+      "tablet",
       "default",
       "phone"
     ],

arkui/ace_ets_component/entry/src/main/config.json

@@ -18,6 +18,7 @@
     "name": ".MyApplication",
     "mainAbility": "com.open.harmony.acetest.MainAbility",
     "deviceType": [
+      "tablet",
       "default",
       "phone"
     ],

arkui/ace_ets_component_apilack/entry/src/main/config.json

@@ -18,6 +18,7 @@
     "name": ".MyApplication",
     "mainAbility": "com.open.harmony.aceEtsApiLack.MainAbility",
     "deviceType": [
+      "tablet",
       "default",
       "phone"
     ],

arkui/ace_ets_component_attrlack/entry/src/main/config.json

@@ -18,6 +18,7 @@
     "name": ".MyApplication",
     "mainAbility": "com.open.harmony.aceEtsAttrLack.MainAbility",
     "deviceType": [
+      "tablet",
       "default",
       "phone"
     ],

arkui/ace_ets_component_five/entry/src/main/config.json

@@ -18,6 +18,7 @@
     "name": ".MyApplication",
     "mainAbility": "com.open.harmony.acetestfive.MainAbility",
     "deviceType": [
+      "tablet",
       "default",
       "phone"
     ],

arkui/ace_ets_component_four/entry/src/main/config.json

@@ -18,6 +18,7 @@
     "name": ".MyApplication",
     "mainAbility": "com.open.harmony.acetestfour.MainAbility",
     "deviceType": [
+      "tablet",
       "default",
       "phone"
     ],

arkui/ace_ets_component_four/entry/src/main/ets/test/TextClockJsunit.test.ets

@@ -152,7 +152,7 @@ export default function textClockJsunit() {
       let strJson = getInspectorByKey('textClock');
       let obj = JSON.parse(strJson);
       console.info("[textClockTest06] obj is: " + JSON.stringify(obj));
-      expect(obj.$attrs.format).assertEqual('20');
+      expect(obj.$attrs.format).assertEqual('hms');
       console.info('textClockTest06 END');
       done();
     });

arkui/ace_ets_component_three/entry/src/main/config.json

@@ -18,6 +18,7 @@
     "name": ".MyApplication",
     "mainAbility": "com.open.harmony.acetestthree.MainAbility",
     "deviceType": [
+      "tablet",
       "default",
       "phone"
     ],

arkui/ace_ets_component_two/entry/src/main/config.json

@@ -18,6 +18,7 @@
     "name": ".MyApplication",
     "mainAbility": "com.open.harmony.acetesttwo.MainAbility",
     "deviceType": [
+      "tablet",
       "default",
       "phone"
     ],

arkui/ace_ets_dev/entry/src/main/config.json

@@ -18,6 +18,7 @@
     "name": ".MyApplication",
     "mainAbility": "com.open.harmony.acedevtest.MainAbility",
     "deviceType": [
+      "tablet",
       "default",
       "phone"
     ],

arkui/ace_ets_standard/entry/src/main/config.json

@@ -19,6 +19,7 @@
     "mainAbility": ".MainAbility",
     "srcPath": "",
     "deviceType": [
+      "tablet",
       "default",
       "phone"
     ],

arkui/ace_ets_test/entry/src/main/config.json

@@ -19,6 +19,7 @@
     "mainAbility": ".MainAbility",
     "srcPath": "",
     "deviceType": [
+      "tablet",
       "default",
       "phone"
     ],

arkui/ace_ets_third_test/entry/src/main/config.json

@@ -19,6 +19,7 @@
     "mainAbility": ".MainAbility",
     "srcPath": "",
     "deviceType": [
+      "tablet",
       "default",
       "phone"
     ],

arkui/ace_ets_webView/entry/src/main/config.json

@@ -18,6 +18,7 @@
     "name": ".MyApplication",
     "mainAbility": "com.open.harmony.webview.MainAbility",
     "deviceType": [
+      "tablet",
       "default",
       "phone"
     ],

arkui/ace_ets_web_dev/entry/src/main/module.json

@@ -6,6 +6,7 @@
         "description": "$string:phone_entry_dsc",
         "mainElement": "MainAbility",
         "deviceTypes": [
+      "tablet",
       "default",
             "phone"
         ],

arkui/ace_ets_web_dev_two/entry/src/main/module.json

@@ -6,6 +6,7 @@
         "description": "$string:phone_entry_dsc",
         "mainElement": "MainAbility",
         "deviceTypes": [
+      "tablet",
       "default",
             "phone"
         ],

arkui/ace_ets_xcomponent/entry/src/main/config.json

@@ -19,6 +19,7 @@
     "mainAbility": "com.acts.ace.xcomponentetstest.MainAbility",
 
     "deviceType": [
+      "tablet",
       "default",
       "phone"
     ],

arkui/ace_js_attribute_api/src/main/config.json

@@ -17,6 +17,7 @@
         "name": ".entry",
         "mainAbility": ".MainAbility",
         "deviceType": [
+      "tablet",
       "default",
             "phone"
         ],

arkui/ace_napi_test/entry/src/main/config.json

@@ -19,6 +19,7 @@
     "mainAbility": "com.acts.ace.napitest.MainAbility",
 
     "deviceType": [
+      "tablet",
       "default",
       "phone"
     ],

arkui/ace_standard/src/main/config.json

@@ -17,6 +17,7 @@
     "name": ".MyApplication",
     "mainAbility": "com.example.aceceshi.MainAbility",
     "deviceType": [
+      "tablet",
       "default",
       "phone"
     ],

arkui/ace_standard_video/src/main/config.json

@@ -17,6 +17,7 @@
         "name": ".entry",
         "mainAbility": ".MainAbility",
         "deviceType": [
+      "tablet",
       "default",
             "phone"
         ],

barrierfree/accessibilityconfig/entry/src/main/module.json

@@ -6,6 +6,7 @@
         "description": "$string:phone_entry_dsc",
         "mainElement": "MainAbility",
         "deviceTypes": [
+      "tablet",
       "default",
             "phone"
         ],

barrierfree/accessibilityconfigreqreadpermission/entry/src/main/module.json

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

barrierfree/accessibilityconfigreqwritepermission/entry/src/main/module.json

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

barrierfree/accessibilityelement/Test.json

@@ -19,6 +19,8 @@
         {
             "type": "ShellKit",
             "run-command": [
+                "power-shell wakeup",
+                "power-shell setmode 602",
                 "param set persist.ace.testmode.enabled 1"
             ]
         }

barrierfree/accessibilityelement/entry/src/main/module.json

@@ -6,6 +6,7 @@
         "description": "$string:phone_entry_dsc",
         "mainElement": "MainAbility",
         "deviceTypes": [
+      "tablet",
       "default",
             "phone"
         ],

barrierfree/accessibilityerrcode/entry/src/main/module.json

@@ -6,6 +6,7 @@
         "description": "$string:phone_entry_dsc",
         "mainElement": "MainAbility",
         "deviceTypes": [
+      "tablet",
             "default",
             "phone"
         ],

barrierfree/accessibilityevent/Test.json

@@ -15,6 +15,12 @@
             ],
             "type": "AppInstallKit",
             "cleanup-apps": true
+        },{
+            "type": "ShellKit",
+            "run-command": [
+                "power-shell wakeup",
+                "power-shell setmode 602"
+            ]
         }
     ]
 }
\ No newline at end of file

barrierfree/accessibilityevent/entry/src/main/module.json

@@ -6,6 +6,7 @@
         "description": "$string:phone_entry_dsc",
         "mainElement": "MainAbility",
         "deviceTypes": [
+      "tablet",
       "default",
             "phone"
         ],

barrierfree/accessibilityextension/Test.json

@@ -15,6 +15,12 @@
             ],
             "type": "AppInstallKit",
             "cleanup-apps": true
+        },{
+            "type": "ShellKit",
+            "run-command": [
+                "power-shell wakeup",
+                "power-shell setmode 602"
+            ]
         }
     ]
 }
\ No newline at end of file

barrierfree/accessibilityextension/entry/src/main/module.json

@@ -6,6 +6,7 @@
         "description": "$string:phone_entry_dsc",
         "mainElement": "MainAbility",
         "deviceTypes": [
+      "tablet",
       "default",
             "phone"
         ],

barrierfree/accessibilityextensioncontext/Test.json

@@ -19,6 +19,8 @@
         {
             "type": "ShellKit",
             "run-command": [
+                "power-shell wakeup",
+                "power-shell setmode 602",
                 "param set persist.ace.testmode.enabled 1"
             ]
         }

barrierfree/accessibilityextensioncontext/entry/src/main/module.json

@@ -6,6 +6,7 @@
         "description": "$string:phone_entry_dsc",
         "mainElement": "MainAbility",
         "deviceTypes": [
+      "tablet",
       "default",
             "phone"
         ],

barrierfree/accessibilityextensioncontextcaperrcode/Test.json

@@ -19,6 +19,8 @@
         {
             "type": "ShellKit",
             "run-command": [
+                "power-shell wakeup",
+                "power-shell setmode 602",
                 "param set persist.ace.testmode.enabled 1"
             ]
         }

barrierfree/accessibilityextensioncontextcaperrcode/entry/src/main/module.json

@@ -6,6 +6,7 @@
         "description": "$string:phone_entry_dsc",
         "mainElement": "MainAbility",
         "deviceTypes": [
+      "tablet",
             "default",
             "phone"
         ],

barrierfree/accessibilitygestureevent/Test.json

@@ -15,6 +15,12 @@
             ],
             "type": "AppInstallKit",
             "cleanup-apps": true
+        },{
+            "type": "ShellKit",
+            "run-command": [
+                "power-shell wakeup",
+                "power-shell setmode 602"
+            ]
         }
     ]
 }

barrierfree/accessibilitygestureevent/entry/src/main/module.json

@@ -6,6 +6,7 @@
         "description": "$string:phone_entry_dsc",
         "mainElement": "MainAbility",
         "deviceTypes": [
+      "tablet",
       "default",
             "phone"
         ],

barrierfree/accessibilitysendaccessibilityevent/entry/src/main/module.json

@@ -6,6 +6,7 @@
         "description": "$string:phone_entry_dsc",
         "mainElement": "MainAbility",
         "deviceTypes": [
+      "tablet",
             "default",
             "phone"
         ],

barrierfree/accessibleabilitylist/Test.json

@@ -14,6 +14,12 @@
             ],
             "type": "AppInstallKit",
             "cleanup-apps": true
+        },{
+            "type": "ShellKit",
+            "run-command": [
+                "power-shell wakeup",
+                "power-shell setmode 602"
+            ]
         }
     ]
 }
\ No newline at end of file

barrierfree/accessibleabilitylist/src/main/config.json

@@ -19,6 +19,7 @@
         "mainAbility": ".MainAbility",
         "srcPath": "",
         "deviceType": [
+      "tablet",
       "default",
             "phone"
         ],

barrierfree/accessiblecaptionconfiguration/Test.json

@@ -14,6 +14,12 @@
             ],
             "type": "AppInstallKit",
             "cleanup-apps": true
+        },{
+            "type": "ShellKit",
+            "run-command": [
+                "power-shell wakeup",
+                "power-shell setmode 602"
+            ]
         }
     ]
 }
\ No newline at end of file

barrierfree/accessiblecaptionconfiguration/src/main/config.json

@@ -17,6 +17,7 @@
         "package": "com.example.accessiblecaptionconfiguration",
         "name": ".entry",
         "deviceType": [
+      "tablet",
       "default",
             "phone"
         ],

barrierfree/accessiblecheckability/Test.json

@@ -14,6 +14,12 @@
             ],
             "type": "AppInstallKit",
             "cleanup-apps": true
+        },{
+            "type": "ShellKit",
+            "run-command": [
+                "power-shell wakeup",
+                "power-shell setmode 602"
+            ]
         }
     ]
 }
\ No newline at end of file

barrierfree/accessiblecheckability/src/main/config.json

@@ -17,6 +17,7 @@
         "package": "com.example.accessiblecheckability",
         "name": ".entry",
         "deviceType": [
+      "tablet",
       "default",
             "phone"
         ],

barrierfree/accessibleregisterstate/Test.json

@@ -14,6 +14,12 @@
             ],
             "type": "AppInstallKit",
             "cleanup-apps": true
+        },{
+            "type": "ShellKit",
+            "run-command": [
+                "power-shell wakeup",
+                "power-shell setmode 602"
+            ]
         }
     ]
 }
\ No newline at end of file

barrierfree/accessibleregisterstate/src/main/config.json

@@ -17,6 +17,7 @@
         "package": "com.example.accessibleregisterstate",
         "name": ".entry",
         "deviceType": [
+      "tablet",
       "default",
             "phone"
         ],

barrierfree/accessiblesendevent/Test.json

@@ -14,6 +14,12 @@
             ],
             "type": "AppInstallKit",
             "cleanup-apps": true
+        },{
+            "type": "ShellKit",
+            "run-command": [
+                "power-shell wakeup",
+                "power-shell setmode 602"
+            ]
         }
     ]
 }
\ No newline at end of file

barrierfree/accessiblesendevent/src/main/config.json

@@ -17,6 +17,7 @@
         "package": "com.example.accessiblesendevent",
         "name": ".entry",
         "deviceType": [
+      "tablet",
       "default",
             "phone"
         ],

barrierfree/accessibletest/actsabilitylisttest/Test.json

@@ -24,6 +24,8 @@
         {
         "type": "ShellKit",
         "run-command": [
+            "power-shell wakeup",
+            "power-shell setmode 602",
             "param set persist.ace.testmode.enabled 1"
         ],
         "teardown-command":[

barrierfree/accessibletest/actsabilitylisttest/entry/src/main/module.json

@@ -6,6 +6,7 @@
     "description": "$string:entry_desc",
     "mainElement": "MainAbility",
     "deviceTypes": [
+      "tablet",
       "default",
       "phone",
       "tablet"

barrierfree/accessibletest/actscaptionconfigurationtest/Test.json

@@ -19,6 +19,8 @@
         {
         "type": "ShellKit",
         "run-command": [
+            "power-shell wakeup",
+            "power-shell setmode 602",
             "param set persist.ace.testmode.enabled 1"
         ],
         "teardown-command":[

barrierfree/accessibletest/actscaptionconfigurationtest/entry/src/main/module.json

@@ -6,6 +6,7 @@
     "description": "$string:entry_desc",
     "mainElement": "MainAbility",
     "deviceTypes": [
+      "tablet",
       "default",
       "phone",
       "tablet"

barrierfree/accessibletest/actsgesturesimulationtest/Test.json

@@ -19,6 +19,9 @@
         {
         "type": "ShellKit",
         "run-command": [
+            "power-shell wakeup",
+            "power-shell setmode 602",
+            "uinput -T -m 500 1000 500 500 400",
             "param set persist.ace.testmode.enabled 1"
         ],
         "teardown-command":[

barrierfree/accessibletest/actsgesturesimulationtest/entry/src/main/module.json

@@ -6,6 +6,7 @@
     "description": "$string:entry_desc",
     "mainElement": "MainAbility",
     "deviceTypes": [
+      "tablet",
       "phone",
       "tablet"
     ],

barrierfree/accessibletest/sceneProject/accessibilityAudibleAbility/entry/src/main/module.json

@@ -6,6 +6,7 @@
     "description": "$string:entry_desc",
     "mainElement": "MainAbility",
     "deviceTypes": [
+      "tablet",
       "default",
       "phone",
       "tablet"

barrierfree/accessibletest/sceneProject/accessibilityGenericAbility/entry/src/main/module.json

@@ -6,6 +6,7 @@
     "description": "$string:entry_desc",
     "mainElement": "MainAbility",
     "deviceTypes": [
+      "tablet",
       "default",
       "phone",
       "tablet"

barrierfree/accessibletest/sceneProject/accessibilityHapticAbility/entry/src/main/module.json

@@ -6,6 +6,7 @@
     "description": "$string:entry_desc",
     "mainElement": "MainAbility",
     "deviceTypes": [
+      "tablet",
       "default",
       "phone",
       "tablet"

barrierfree/accessibletest/sceneProject/accessibilitySpokenAbility/entry/src/main/module.json

@@ -6,6 +6,7 @@
     "description": "$string:entry_desc",
     "mainElement": "MainAbility",
     "deviceTypes": [
+      "tablet",
       "default",
       "phone",
       "tablet"

barrierfree/accessibletest/sceneProject/accessibilityVisualAbility/entry/src/main/module.json

@@ -6,6 +6,7 @@
     "description": "$string:entry_desc",
     "mainElement": "MainAbility",
     "deviceTypes": [
+      "tablet",
       "default",
       "phone",
       "tablet"

barrierfree/targetProject/aceTest/entry/src/main/module.json

@@ -6,6 +6,7 @@
         "description": "$string:phone_entry_dsc",
         "mainElement": "MainAbility",
         "deviceTypes": [
+      "tablet",
       "default",
             "phone"
         ],

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

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

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

@@ -20,7 +20,7 @@
     "srcPath": "",
     "deviceType": [
       "default",
-      "default"
+      "tablet"
     ],
     "distro": {
       "deliveryWithInstall": true,

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

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

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

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

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

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

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

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

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

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

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

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