From db458f2dcc9f8358bcc11d586ac5816d907ba1db Mon Sep 17 00:00:00 2001 From: lirismankarina Date: Mon, 7 Jul 2025 17:15:13 +0300 Subject: [PATCH] [security_access_token] Sync primitives Issue: [cherry-pick 0603] Primitive types big pr https://gitee.com/openharmony/arkcompiler_ets_frontend/issues/ICJ8GH Signed-off-by: lirismankarina --- .../accesstoken/ets/@ohos.abilityAccessCtrl.ets | 16 ++++++++-------- .../ets/ani/privacy/ets/@ohos.privacyManager.ets | 8 ++++---- 2 files changed, 12 insertions(+), 12 deletions(-) diff --git a/frameworks/ets/ani/accesstoken/ets/@ohos.abilityAccessCtrl.ets b/frameworks/ets/ani/accesstoken/ets/@ohos.abilityAccessCtrl.ets index 575731294..5cd6ed3a0 100644 --- a/frameworks/ets/ani/accesstoken/ets/@ohos.abilityAccessCtrl.ets +++ b/frameworks/ets/ani/accesstoken/ets/@ohos.abilityAccessCtrl.ets @@ -209,8 +209,8 @@ export default namespace abilityAccessCtrl { permissionName) as GrantStatus;}); p1.then((e: NullishType) => { resolve(e as GrantStatus); - }).catch((err: BusinessError): void => { - reject(err); + }).catch((err: Error): void => { + reject(err as BusinessError); }); }); return p; @@ -299,8 +299,8 @@ export default namespace abilityAccessCtrl { }); p.then((e: NullishType): void => { resolve(undefined); - }).catch((err: BusinessError): void => { - reject(err); + }).catch((err: Error): void => { + reject(err as BusinessError); }) }); } @@ -313,8 +313,8 @@ export default namespace abilityAccessCtrl { job.then(()=>{ let err = new BusinessError(); callback(err, undefined); - }, (err: BusinessError): void=> { - callback(err, undefined); + }, (err: Error): void=> { + callback(err as BusinessError, undefined); }) } @@ -326,8 +326,8 @@ export default namespace abilityAccessCtrl { let p1 = taskpool.execute((): int => { return new AtManagerInner().getVersionExecute() as int;}); p1.then((e: NullishType) => { resolve(e as int); - }).catch((err: BusinessError): void => { - reject(err); + }).catch((err: Error): void => { + reject(err as BusinessError); }); }); return p; diff --git a/frameworks/ets/ani/privacy/ets/@ohos.privacyManager.ets b/frameworks/ets/ani/privacy/ets/@ohos.privacyManager.ets index f91c45fe6..dcfb66369 100644 --- a/frameworks/ets/ani/privacy/ets/@ohos.privacyManager.ets +++ b/frameworks/ets/ani/privacy/ets/@ohos.privacyManager.ets @@ -114,8 +114,8 @@ export default namespace privacyManager { tokenID, permissionName, successCount, failCount, optionsLocal) }); p1.then(() => { resolve(undefined); - }).catch((err: BusinessError): void => { - reject(err); + }).catch((err: Error): void => { + reject(err as BusinessError); }); }); return p; @@ -136,8 +136,8 @@ export default namespace privacyManager { p2.then(() => { let err = new BusinessError(); callback(err, undefined); - },(err: BusinessError): void=> { - callback(err, undefined); + },(err: Error): void=> { + callback(err as BusinessError, undefined); }) } -- Gitee