diff --git a/frameworks/ets/ani/accesstoken/ets/@ohos.abilityAccessCtrl.ets b/frameworks/ets/ani/accesstoken/ets/@ohos.abilityAccessCtrl.ets index 0631672a23e5cd1492a11474bf81f2a8a30b8016..c65bd848c44b51c3b46d8db86eb82d29334c739e 100644 --- a/frameworks/ets/ani/accesstoken/ets/@ohos.abilityAccessCtrl.ets +++ b/frameworks/ets/ani/accesstoken/ets/@ohos.abilityAccessCtrl.ets @@ -26,7 +26,7 @@ export { Permissions }; export type PermissionRequestResult = _PermissionRequestResult; class AsyncCallbackWrapper { - private wrapperCallback_: AsyncCallback = (err: BusinessError, data: T) => {} + private wrapperCallback_: AsyncCallback = (err: BusinessError | null, data: T | undefined) => {} constructor(callback: AsyncCallback) { this.wrapperCallback_ = callback; @@ -219,11 +219,13 @@ export default namespace abilityAccessCtrl { let p: Promise = new Promise(( resolve: (v: PermissionRequestResult) => void, reject: (error: BusinessError) => void) => { let callbackWrap = new AsyncCallbackWrapper(( - err: BusinessError, data: PermissionRequestResult) => { - if (err.code == 0) { - resolve(data); + err: BusinessError | null, data: PermissionRequestResult | undefined) => { + if (err?.code == 0) { + if (data !== undefined) { + resolve(data); + } } else { - reject(err); + reject(err as BusinessError); } }); taskpool.execute((): void => { @@ -238,11 +240,13 @@ export default namespace abilityAccessCtrl { let p: Promise> = new Promise>(( resolve: (v: Array) => void, reject: (error: BusinessError) => void) => { let callbackWrap = new AsyncCallbackWrapper>(( - err: BusinessError, data: Array) => { - if (err.code == 0) { - resolve(data); + err: BusinessError | null, data: Array | undefined) => { + if (err?.code == 0) { + if (data !== undefined) { + resolve(data); + } } else { - reject(err); + reject(err as BusinessError); } }); taskpool.execute((): void => { @@ -262,11 +266,13 @@ export default namespace abilityAccessCtrl { let p: Promise = new Promise(( resolve: (v: boolean) => void, reject: (error: BusinessError) => void) => { let callbackWrap = new AsyncCallbackWrapper(( - err: BusinessError, data: boolean) => { - if (err.code == 0) { - resolve(data); + err: BusinessError | null, data: boolean | undefined) => { + if (err?.code == 0) { + if (data !== undefined) { + resolve(data); + } } else { - reject(err); + reject(err as BusinessError); } }); taskpool.execute((): void => {