From 82847f8d86f2bf86d008b037d1fc9e707dd41633 Mon Sep 17 00:00:00 2001
From: zzz701 <lihaima1@huawei.com>
Date: Sun, 22 Jun 2025 16:22:50 +0800
Subject: [PATCH] =?UTF-8?q?AsyncCallback=20Error=E5=8F=98=E6=9B=B4?=
 =?UTF-8?q?=E5=8F=AF=E9=80=89=E7=9A=84=E5=8F=82=E6=95=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: zzz701 <lihaima1@huawei.com>
---
 .../ets/@ohos.abilityAccessCtrl.ets           | 32 +++++++++++--------
 1 file changed, 19 insertions(+), 13 deletions(-)

diff --git a/frameworks/ets/ani/accesstoken/ets/@ohos.abilityAccessCtrl.ets b/frameworks/ets/ani/accesstoken/ets/@ohos.abilityAccessCtrl.ets
index 0631672a2..c65bd848c 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<T> {
-  private wrapperCallback_: AsyncCallback<T, void> = (err: BusinessError<void>, data: T) => {}
+  private wrapperCallback_: AsyncCallback<T, void> = (err: BusinessError<void> | null, data: T | undefined) => {}
 
   constructor(callback: AsyncCallback<T, void>) {
     this.wrapperCallback_ = callback;
@@ -219,11 +219,13 @@ export default namespace abilityAccessCtrl {
             let p: Promise<PermissionRequestResult> = new Promise<PermissionRequestResult>((
                 resolve: (v: PermissionRequestResult) => void, reject: (error: BusinessError) => void) => {
                 let callbackWrap = new AsyncCallbackWrapper<PermissionRequestResult>((
-                    err: BusinessError<void>, data: PermissionRequestResult) => {
-                    if (err.code == 0) {
-                        resolve(data);
+                    err: BusinessError<void> | 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<Array<GrantStatus>> = new Promise<Array<GrantStatus>>((
                 resolve: (v: Array<GrantStatus>) => void, reject: (error: BusinessError) => void) => {
                 let callbackWrap = new AsyncCallbackWrapper<Array<GrantStatus>>((
-                    err: BusinessError<void>, data: Array<GrantStatus>) => {
-                    if (err.code == 0) {
-                        resolve(data);
+                    err: BusinessError<void> | null, data: Array<GrantStatus> | 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<boolean> = new Promise<boolean>((
                 resolve: (v: boolean) => void, reject: (error: BusinessError) => void) => {
                 let callbackWrap = new AsyncCallbackWrapper<boolean>((
-                    err: BusinessError<void>, data: boolean) => {
-                    if (err.code == 0) {
-                        resolve(data);
+                    err: BusinessError<void> | null, data: boolean | undefined) => {
+                    if (err?.code == 0) {
+                        if (data !== undefined) {
+                            resolve(data);
+                        }
                     } else {
-                        reject(err);
+                        reject(err as BusinessError);
                     }
                 });
                 taskpool.execute((): void => {
-- 
Gitee