From 659b40d28abed3a6fec0acc6a089eb99b862dcd5 Mon Sep 17 00:00:00 2001
From: Zhelyapov Aleksey <zhelyapov.aleksey@huawei-partners.com>
Date: Thu, 10 Jul 2025 19:05:53 +0300
Subject: [PATCH] Remove enum conversions

Issue:
https://gitee.com/openharmony/arkcompiler_ets_frontend/issues/ICL8SL

Signed-off-by: Zhelyapov Aleksey <zhelyapov.aleksey@huawei-partners.com>
---
 .../accesstoken/ets/@ohos.abilityAccessCtrl.ets    | 14 +++++++-------
 .../ets/@ohos.ability.screenLockFileManager.ets    | 12 ++++++------
 2 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/frameworks/ets/ani/accesstoken/ets/@ohos.abilityAccessCtrl.ets b/frameworks/ets/ani/accesstoken/ets/@ohos.abilityAccessCtrl.ets
index 8de915f7f..5f0bd90d0 100644
--- a/frameworks/ets/ani/accesstoken/ets/@ohos.abilityAccessCtrl.ets
+++ b/frameworks/ets/ani/accesstoken/ets/@ohos.abilityAccessCtrl.ets
@@ -90,14 +90,14 @@ export default namespace abilityAccessCtrl {
     function validateRequestParams(context: Context, permissionList: Array<Permissions>): void {
         if ((typeof context === "undefined") || (context == null)) {
             let err = new BusinessError<string>();
-            err.code = STSErrorCode.STS_ERROR_PARAM_ILLEGAL as int;
+            err.code = STSErrorCode.STS_ERROR_PARAM_ILLEGAL;
             err.data = PARAM_ERROR_MSG("context", "UIAbility or UIExtension Context");
             throw err;
         }
         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 as int;
+            err.code = STSErrorCode.STS_ERROR_PARAM_ILLEGAL;
             err.data = PARAM_ERROR_MSG("permissionList", "Array<Permissions>");
             throw err;
         }
@@ -193,19 +193,19 @@ export default namespace abilityAccessCtrl {
 
         verifyAccessTokenSync(tokenID: int, permissionName: Permissions): GrantStatus {
             let result = this.checkAccessTokenExecute(tokenID, permissionName);
-            return result as GrantStatus;
+            return GrantStatus.fromValue(result);
         }
 
         checkAccessTokenSync(tokenID: int, permissionName: Permissions): GrantStatus {
             let result = this.checkAccessTokenExecute(tokenID, permissionName);
-            return result as GrantStatus;
+            return GrantStatus.fromValue(result);
         }
 
         checkAccessToken(tokenID: int, permissionName: Permissions): Promise<GrantStatus> {
             let p = new Promise<GrantStatus>((
                 resolve: (v: GrantStatus) => void, reject: (error: BusinessError) => void) => {
                 let p1 = taskpool.execute((): GrantStatus => {
-                    return new AtManagerInner().checkAccessTokenExecute(tokenID, permissionName) as GrantStatus;
+                    return GrantStatus.fromValue(new AtManagerInner().checkAccessTokenExecute(tokenID, permissionName));
                 });
                 p1.then((e: NullishType) => {
                     resolve(e as GrantStatus);
@@ -220,7 +220,7 @@ export default namespace abilityAccessCtrl {
             let p = new Promise<GrantStatus>((
                 resolve: (v: GrantStatus) => void, reject: (error: BusinessError) => void) => {
                 let p1 = taskpool.execute((): GrantStatus => {
-                    return new AtManagerInner().checkAccessTokenExecute(tokenID, permissionName) as GrantStatus;
+                    return GrantStatus.fromValue(new AtManagerInner().checkAccessTokenExecute(tokenID, permissionName));
                 });
                 p1.then((e: NullishType) => {
                     resolve(e as GrantStatus);
@@ -426,7 +426,7 @@ export default namespace abilityAccessCtrl {
                 (resolve: (v: PermissionRequestToggleStatus) => void,
                     reject: (err: BusinessError) => void): PermissionRequestToggleStatus => {
                     let p1 = taskpool.execute((): PermissionRequestToggleStatus => {
-                        return new AtManagerInner().getPermissionRequestToggleStatusExecute(permissionName) as PermissionRequestToggleStatus;
+                        return PermissionRequestToggleStatus.fromValue(new AtManagerInner().getPermissionRequestToggleStatusExecute(permissionName));
                     });
                     p1.then((e: NullishType): void => {
                         resolve(e as PermissionRequestToggleStatus);
diff --git a/frameworks/ets/ani/el5filekeymanager/ets/@ohos.ability.screenLockFileManager.ets b/frameworks/ets/ani/el5filekeymanager/ets/@ohos.ability.screenLockFileManager.ets
index fd2bd2191..7703a5cbc 100644
--- a/frameworks/ets/ani/el5filekeymanager/ets/@ohos.ability.screenLockFileManager.ets
+++ b/frameworks/ets/ani/el5filekeymanager/ets/@ohos.ability.screenLockFileManager.ets
@@ -45,28 +45,28 @@ export namespace screenLockFileManager {
 
   export function acquireAccess(): AccessStatus {
     let result: int = acquireAccessSync();
-    return result as AccessStatus;
+    return AccessStatus.fromValue(result);
   }
   export function acquireAccess(dataType: DataType): AccessStatus {
     let result: int = acquireAccessExecute(dataType);
-    return result as AccessStatus;
+    return AccessStatus.fromValue(result);
   }
 
   export function releaseAccess(): ReleaseStatus {
     let result: int = releaseAccessSync();
-    return result as ReleaseStatus;
+    return ReleaseStatus.fromValue(result);
   }
   export function releaseAccess(dataType: DataType): ReleaseStatus {
     let result: int = releaseAccessExecute(dataType);
-    return result as ReleaseStatus;
+    return ReleaseStatus.fromValue(result);
   }
 
   export function queryAppKeyState(): KeyStatus {
     let result: int = queryAppKeyStateSync();
-    return result as KeyStatus;
+    return KeyStatus.fromValue(result);
   }
   export function queryAppKeyState(dataType: DataType): KeyStatus {
     let result: int = queryAppKeyStateExecute(dataType);
-    return result as KeyStatus;
+    return KeyStatus.fromValue(result);
   }
 }
\ No newline at end of file
-- 
Gitee