From 1983a0270755f94e5236b671ba1e96215724ca06 Mon Sep 17 00:00:00 2001
From: Martin Sajti <martin.sajti@h-lab.eu>
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 <martin.sajti@h-lab.eu>
---
 .../ets/@ohos.abilityAccessCtrl.ets           | 26 +++++++++----------
 .../ani/privacy/ets/@ohos.privacyManager.ets  | 12 ++++-----
 2 files changed, 19 insertions(+), 19 deletions(-)

diff --git a/frameworks/ets/ani/accesstoken/ets/@ohos.abilityAccessCtrl.ets b/frameworks/ets/ani/accesstoken/ets/@ohos.abilityAccessCtrl.ets
index 1e48fc2a9..fa1f241d7 100644
--- a/frameworks/ets/ani/accesstoken/ets/@ohos.abilityAccessCtrl.ets
+++ b/frameworks/ets/ani/accesstoken/ets/@ohos.abilityAccessCtrl.ets
@@ -79,7 +79,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<string>();
             err.code = STSErrorCode.STS_ERROR_PARAM_ILLEGAL;
@@ -153,8 +153,8 @@ export default namespace abilityAccessCtrl {
                 });
                 p1.then((e: NullishType) => {
                     resolve(e as GrantStatus);
-                }).catch((err: BusinessError): void => {
-                    reject(err);
+                }).catch((err: Error): void => {
+                    reject(err as BusinessError);
                 });
             });
             return p;
@@ -168,7 +168,7 @@ export default namespace abilityAccessCtrl {
                 });
                 p1.then((e: NullishType) => {
                     resolve(e as GrantStatus);
-                }).catch((err: BusinessError): void => {
+                }).catch((err: Error): void => {
                     resolve(GrantStatus.PERMISSION_DENIED);
                 });
             });
@@ -253,8 +253,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);
                 })
             });
         }
@@ -267,8 +267,8 @@ export default namespace abilityAccessCtrl {
             job.then(()=>{
                 let err = new BusinessError<void>();
                 callback(err, undefined);
-            }, (err: BusinessError): void=> {
-                callback(err, undefined);
+            }, (err: Error): void=> {
+                callback(err as BusinessError, undefined);
             })
         }
 
@@ -280,8 +280,8 @@ export default namespace abilityAccessCtrl {
                     });
                     p1.then((e: NullishType) => {
                         resolve(e as int);
-                    }).catch((err: BusinessError): void => {
-                        reject(err);
+                    }).catch((err: Error): void => {
+                        reject(err as BusinessError);
                     });
                 });
             return p;
@@ -297,11 +297,11 @@ export default namespace abilityAccessCtrl {
                 });
                 p1.then((e: NullishType) => {
                     resolve(e as Array<PermissionStatus>);
-                }).catch((err: BusinessError): void => {
-                    reject(err);
+                }).catch((err: Error): void => {
+                    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 b53beac77..1fb38e789 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 {
@@ -107,8 +107,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;
@@ -129,8 +129,8 @@ export default namespace privacyManager {
         p2.then(() => {
             let err = new BusinessError<void>();
             callback(err, undefined);
-        },(err: BusinessError): void=> {
-            callback(err, undefined);
+        },(err: Error): void=> {
+            callback(err as BusinessError, undefined);
         })
     }
 
@@ -139,4 +139,4 @@ export default namespace privacyManager {
 
     export native function off(type: 'activeStateChange', permissionList: Array<Permissions>,
         callback?: Callback<ActiveChangeResponse>): void;
-}
\ No newline at end of file
+}
-- 
Gitee