From 819be56090bdfca1f1cb9e84b425e04844b56ba0 Mon Sep 17 00:00:00 2001 From: Martin Sajti Date: Fri, 16 May 2025 13:48:56 +0200 Subject: [PATCH] Fix invlid code after primitive type refactor Change-Id: I0615ceabceb8503b09b036dbbb595fe63eda1bc7 Signed-off-by: Martin Sajti --- .../accesstoken/ets/@ohos.abilityAccessCtrl.ets | 14 +++++++------- .../ets/ani/privacy/ets/@ohos.privacyManager.ets | 10 +++++----- 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 181c61283..39ea50e65 100644 --- a/frameworks/ets/ani/accesstoken/ets/@ohos.abilityAccessCtrl.ets +++ b/frameworks/ets/ani/accesstoken/ets/@ohos.abilityAccessCtrl.ets @@ -81,7 +81,7 @@ export default namespace abilityAccessCtrl { err.data = PARAM_ERROR_MSG("context", "UIAbility or UIExtension Context"); throw err; } - if (typeof permissionList !== "object" || !Array.isArray(permissionList) || + if (typeof permissionList !== "object" || !Array.isArray(permissionList) || permissionList.length == 0 || typeof permissionList[0] !== "string") { let err = new BusinessError(); err.code = STSErrorCode.STS_ERROR_PARAM_ILLEGAL; @@ -139,8 +139,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; @@ -175,14 +175,14 @@ export default namespace abilityAccessCtrl { p1.then((e: NullishType)=> { let r : PermissionRequestResult = e as PermissionRequestResult; resolve(r); - }).catch((err: BusinessError): void => { - if (err.code == STSErrorCode.STS_ERROR_PARAM_ILLEGAL) { + }).catch((err: Error): void => { + if ((err as BusinessError).code == STSErrorCode.STS_ERROR_PARAM_ILLEGAL) { throw err; } - reject(err); + reject(err as BusinessError); }); }); return p; } } -} \ No newline at end of file +} diff --git a/frameworks/ets/ani/privacy/ets/@ohos.privacyManager.ets b/frameworks/ets/ani/privacy/ets/@ohos.privacyManager.ets index e308a928f..1d6683711 100644 --- a/frameworks/ets/ani/privacy/ets/@ohos.privacyManager.ets +++ b/frameworks/ets/ani/privacy/ets/@ohos.privacyManager.ets @@ -13,7 +13,7 @@ * limitations under the License. */ -import { AsyncCallback, Callback, BusinessError} from '@ohos.base'; +import { AsyncCallback, Callback, BusinessError} from '@ohos.base'; import { Permissions } from 'permissions'; function PARAM_ERROR_MSG(param: string, type: string): string { @@ -85,8 +85,8 @@ export default namespace privacyManager { }); p1.then(() => { resolve(undefined); - }).catch((err: BusinessError): void => { - reject(err); + }).catch((err: Error): void => { + reject(err as BusinessError); }); }); return p; @@ -107,8 +107,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); }) } } \ No newline at end of file -- Gitee