From ed95eaa90419b96c90fae777f2e607454424f35f Mon Sep 17 00:00:00 2001 From: cheezzario Date: Wed, 18 Jun 2025 14:36:18 +0300 Subject: [PATCH] [ArkTS][StdLib] 'concurrency' namespace Description: Move concurrency related APIs to 'concurrency' namespace Issue: https://gitee.com/openharmony/arkcompiler_runtime_core/issues/ICDFT2 Testing: All required pre-merge tests passed. Results are available in the ggwatcher Signed-off-by: cheezzario --- .../ets/@ohos.abilityAccessCtrl.ets | 31 ++++++++++--------- 1 file changed, 16 insertions(+), 15 deletions(-) diff --git a/frameworks/ets/ani/accesstoken/ets/@ohos.abilityAccessCtrl.ets b/frameworks/ets/ani/accesstoken/ets/@ohos.abilityAccessCtrl.ets index c1bf2f105..22185dc81 100644 --- a/frameworks/ets/ani/accesstoken/ets/@ohos.abilityAccessCtrl.ets +++ b/frameworks/ets/ani/accesstoken/ets/@ohos.abilityAccessCtrl.ets @@ -13,6 +13,7 @@ * limitations under the License. */ +import { concurrency as cnc } from 'std/core'; import { AsyncCallback, Callback, BusinessError } from '@ohos.base'; import { Permissions } from 'permissions'; import type _PermissionRequestResult from 'security.PermissionRequestResult'; @@ -204,7 +205,7 @@ export default namespace abilityAccessCtrl { checkAccessToken(tokenID: int, permissionName: Permissions): Promise { let p = new Promise(( resolve: (v: GrantStatus) => void, reject: (error: BusinessError) => void) => { - let p1 = taskpool.execute((): GrantStatus => { + let p1 = cnc.taskpool.execute((): GrantStatus => { return new AtManagerInner().checkAccessTokenExecute(tokenID, permissionName) as GrantStatus; }); p1.then((e: NullishType) => { @@ -219,7 +220,7 @@ export default namespace abilityAccessCtrl { verifyAccessToken(tokenID: int, permissionName: Permissions): Promise { let p = new Promise(( resolve: (v: GrantStatus) => void, reject: (error: BusinessError) => void) => { - let p1 = taskpool.execute((): GrantStatus => { + let p1 = cnc.taskpool.execute((): GrantStatus => { return new AtManagerInner().checkAccessTokenExecute(tokenID, permissionName) as GrantStatus; }); p1.then((e: NullishType) => { @@ -235,7 +236,7 @@ export default namespace abilityAccessCtrl { requestCallback: AsyncCallback): void { validateRequestParams(context, permissionList); let callbackWrap = new AsyncCallbackWrapper(requestCallback); - taskpool.execute((): void => { + cnc.taskpool.execute((): void => { new AtManagerInner().requestPermissionsFromUserExecute(context, permissionList, callbackWrap); }); } @@ -255,7 +256,7 @@ export default namespace abilityAccessCtrl { reject(err as BusinessError); } }); - taskpool.execute((): void => { + cnc.taskpool.execute((): void => { new AtManagerInner().requestPermissionsFromUserExecute(context, permissionList, callbackWrap); }); }); @@ -276,7 +277,7 @@ export default namespace abilityAccessCtrl { reject(err as BusinessError); } }); - taskpool.execute((): void => { + cnc.taskpool.execute((): void => { new AtManagerInner().requestPermissionOnSettingExecute(context, permissionList, callbackWrap); }); }); @@ -302,7 +303,7 @@ export default namespace abilityAccessCtrl { reject(err as BusinessError); } }); - taskpool.execute((): void => { + cnc.taskpool.execute((): void => { new AtManagerInner().requestGlobalSwitchExecute(context, type, callbackWrap); }); }); @@ -311,7 +312,7 @@ export default namespace abilityAccessCtrl { grantUserGrantedPermission(tokenID: int, permissionName: Permissions, permissionFlags: int, callback: AsyncCallback): void { - let p1 = taskpool.execute((): void => { + let p1 = cnc.taskpool.execute((): void => { new AtManagerInner().grantUserGrantedPermissionExecute(tokenID, permissionName, permissionFlags);}); p1.then(() => { let err = new BusinessError(); @@ -324,7 +325,7 @@ export default namespace abilityAccessCtrl { grantUserGrantedPermission(tokenID: int, permissionName: Permissions, permissionFlags: int): Promise { return new Promise( (resolve: (v: undefined) => void, reject: (error: BusinessError) => void) : void => { - let p = taskpool.execute(() : void => { + let p = cnc.taskpool.execute(() : void => { new AtManagerInner().grantUserGrantedPermissionExecute(tokenID, permissionName, permissionFlags); }); p.then((e: NullishType) : void => { @@ -338,7 +339,7 @@ export default namespace abilityAccessCtrl { revokeUserGrantedPermission(tokenID: int, permissionName: Permissions, permissionFlags: int): Promise { return new Promise( (resolve: (v: undefined) => void, reject: (error: BusinessError) => void): void => { - let p = taskpool.execute((): void => { + let p = cnc.taskpool.execute((): void => { new AtManagerInner().revokeUserGrantedPermissionExecute(tokenID, permissionName, permissionFlags); }); p.then((e: NullishType): void => { @@ -351,7 +352,7 @@ export default namespace abilityAccessCtrl { revokeUserGrantedPermission(tokenID: int, permissionName: Permissions, permissionFlags: int, callback: AsyncCallback): void { - let job = taskpool.execute((): void => { + let job = cnc.taskpool.execute((): void => { new AtManagerInner().revokeUserGrantedPermissionExecute(tokenID, permissionName, permissionFlags); }); job.then(() => { @@ -365,7 +366,7 @@ export default namespace abilityAccessCtrl { getVersion(): Promise { let p = new Promise(( resolve: (v: int) => void, reject: (error: BusinessError) => void) => { - let p1 = taskpool.execute((): int => { + let p1 = cnc.taskpool.execute((): int => { return new AtManagerInner().getVersionExecute() as int; }); p1.then((e: NullishType) => { @@ -380,7 +381,7 @@ export default namespace abilityAccessCtrl { getPermissionsStatus(tokenID: int, permissionList: Array): Promise> { let p = new Promise>(( resolve: (v: Array) => void, reject: (error: BusinessError) => void) => { - let p1 = taskpool.execute((): Array => { + let p1 = cnc.taskpool.execute((): Array => { return new AtManagerInner().getPermissionsStatusExecute( tokenID, permissionList) as Array; }); @@ -396,7 +397,7 @@ export default namespace abilityAccessCtrl { getPermissionFlags(tokenID: int, permissionName: Permissions): Promise { let p = new Promise( (resolve: (v: int) => void, reject: (err: BusinessError) => void): int => { - let p1 = taskpool.execute((): int => { + let p1 = cnc.taskpool.execute((): int => { return new AtManagerInner().getPermissionFlagsExecute(tokenID, permissionName); }); p1.then((e: NullishType): void => { @@ -411,7 +412,7 @@ export default namespace abilityAccessCtrl { setPermissionRequestToggleStatus(permissionName: Permissions, status: PermissionRequestToggleStatus): Promise { let p = new Promise( (resolve: (v: undefined) => void, reject: (error: BusinessError) => void): void => { - let p = taskpool.execute((): void => { + let p = cnc.taskpool.execute((): void => { new AtManagerInner().setPermissionRequestToggleStatusExecute(permissionName, status); }); p.then((e: NullishType): void => { @@ -427,7 +428,7 @@ export default namespace abilityAccessCtrl { let p = new Promise( (resolve: (v: PermissionRequestToggleStatus) => void, reject: (err: BusinessError) => void): PermissionRequestToggleStatus => { - let p1 = taskpool.execute((): PermissionRequestToggleStatus => { + let p1 = cnc.taskpool.execute((): PermissionRequestToggleStatus => { return new AtManagerInner().getPermissionRequestToggleStatusExecute(permissionName) as PermissionRequestToggleStatus; }); p1.then((e: NullishType): void => { -- Gitee