From 37bcd6ac6dffc8ec5338ca4889d39a8a427375cb Mon Sep 17 00:00:00 2001 From: igorlegalov Date: Thu, 10 Jul 2025 15:26:26 +0300 Subject: [PATCH] Remove NullishType alias Issue: https://gitee.com/open_harmony/dashboard?issue_id=ICW8Y8 Testing: all pre-merge tests passed Signed-off-by: igorlegalov --- .../ets/@ohos.abilityAccessCtrl.ets | 20 +++++++++---------- .../ani/privacy/ets/@ohos.privacyManager.ets | 10 +++++----- 2 files changed, 15 insertions(+), 15 deletions(-) diff --git a/frameworks/ets/ani/accesstoken/ets/@ohos.abilityAccessCtrl.ets b/frameworks/ets/ani/accesstoken/ets/@ohos.abilityAccessCtrl.ets index a70c174b0..1fe8337df 100644 --- a/frameworks/ets/ani/accesstoken/ets/@ohos.abilityAccessCtrl.ets +++ b/frameworks/ets/ani/accesstoken/ets/@ohos.abilityAccessCtrl.ets @@ -209,7 +209,7 @@ export default namespace abilityAccessCtrl { let p1 = taskpool.execute((): GrantStatus => { return new AtManagerInner().checkAccessTokenExecute(tokenID, permissionName) as GrantStatus; }); - p1.then((e: NullishType) => { + p1.then((e: Any) => { resolve(e as GrantStatus); }).catch((err: Error): void => { reject(err as BusinessError); @@ -224,7 +224,7 @@ export default namespace abilityAccessCtrl { let p1 = taskpool.execute((): GrantStatus => { return new AtManagerInner().checkAccessTokenExecute(tokenID, permissionName) as GrantStatus; }); - p1.then((e: NullishType) => { + p1.then((e: Any) => { resolve(e as GrantStatus); }).catch((err: Error): void => { resolve(GrantStatus.PERMISSION_DENIED); @@ -328,7 +328,7 @@ export default namespace abilityAccessCtrl { let p = taskpool.execute(() : void => { new AtManagerInner().grantUserGrantedPermissionExecute(tokenID, permissionName, permissionFlags); }); - p.then((e: NullishType) : void => { + p.then((e: Any) : void => { resolve(undefined); }).catch((err: Error) : void => { reject(err as BusinessError); @@ -342,7 +342,7 @@ export default namespace abilityAccessCtrl { let p = taskpool.execute((): void => { new AtManagerInner().revokeUserGrantedPermissionExecute(tokenID, permissionName, permissionFlags); }); - p.then((e: NullishType): void => { + p.then((e: Any): void => { resolve(undefined); }).catch((err: Error): void => { reject(err as BusinessError); @@ -368,7 +368,7 @@ export default namespace abilityAccessCtrl { let p1 = taskpool.execute((): int => { return new AtManagerInner().getVersionExecute() as int; }); - p1.then((e: NullishType) => { + p1.then((e: Any) => { resolve(e as int); }).catch((err: Error): void => { reject(err as BusinessError); @@ -384,7 +384,7 @@ export default namespace abilityAccessCtrl { return new AtManagerInner().getPermissionsStatusExecute( tokenID, permissionList) as Array; }); - p1.then((e: NullishType) => { + p1.then((e: Any) => { resolve(e as Array); }).catch((err: Error): void => { reject(err as BusinessError); @@ -399,7 +399,7 @@ export default namespace abilityAccessCtrl { let p1 = taskpool.execute((): int => { return new AtManagerInner().getPermissionFlagsExecute(tokenID, permissionName); }); - p1.then((e: NullishType): void => { + p1.then((e: Any): void => { resolve(e as int); }).catch((err: Error): void => { reject(err as BusinessError); @@ -414,7 +414,7 @@ export default namespace abilityAccessCtrl { let p = taskpool.execute((): void => { new AtManagerInner().setPermissionRequestToggleStatusExecute(permissionName, status); }); - p.then((e: NullishType): void => { + p.then((e: Any): void => { resolve(undefined); }).catch((err: Error): void => { reject(err as BusinessError); @@ -430,7 +430,7 @@ export default namespace abilityAccessCtrl { let p1 = taskpool.execute((): PermissionRequestToggleStatus => { return new AtManagerInner().getPermissionRequestToggleStatusExecute(permissionName) as PermissionRequestToggleStatus; }); - p1.then((e: NullishType): void => { + p1.then((e: Any): void => { resolve(e as PermissionRequestToggleStatus); }).catch((err: Error): void => { reject(err as BusinessError); @@ -445,7 +445,7 @@ export default namespace abilityAccessCtrl { let p = taskpool.execute((): void => { new AtManagerInner().requestAppPermOnSettingExecute(tokenID); }); - p.then((e: NullishType): void => { + p.then((e: Any): void => { resolve(undefined); }).catch((err: Error): void => { reject(err as BusinessError); diff --git a/frameworks/ets/ani/privacy/ets/@ohos.privacyManager.ets b/frameworks/ets/ani/privacy/ets/@ohos.privacyManager.ets index c8df59689..d8b38bc85 100644 --- a/frameworks/ets/ani/privacy/ets/@ohos.privacyManager.ets +++ b/frameworks/ets/ani/privacy/ets/@ohos.privacyManager.ets @@ -210,7 +210,7 @@ export default namespace privacyManager { let p1 = taskpool.execute((): PermissionUsedResponse => { return getPermissionUsedRecordExecute(request); }); - p1.then((e: NullishType):void => { + p1.then((e: Any):void => { resolve(e as PermissionUsedResponse); }).catch((err: Error): void => { reject(err as BusinessError); @@ -222,7 +222,7 @@ export default namespace privacyManager { let p1 = taskpool.execute((): PermissionUsedResponse => { return getPermissionUsedRecordExecute(request); }); - p1.then((ret: NullishType): void => { + p1.then((ret: Any): void => { callback(null, ret as PermissionUsedResponse); }).catch((err: Error): void => { callback(err as BusinessError, undefined); @@ -239,7 +239,7 @@ export default namespace privacyManager { let p1 = taskpool.execute((): Array => { return getPermissionUsedTypeInfosExecute(tokenIdIn, permissionNameIn); }); - p1.then((e: NullishType): void => { + p1.then((e: Any): void => { resolve(e as Array); }).catch((err: Error): void => { reject(err as BusinessError); @@ -253,7 +253,7 @@ export default namespace privacyManager { let p1 = taskpool.execute((): void => { setPermissionUsedRecordToggleStatusExecute(status); }); - p1.then((e: NullishType): void => { + p1.then((e: Any): void => { resolve(undefined); }).catch((err: Error): void => { reject(err as BusinessError); @@ -267,7 +267,7 @@ export default namespace privacyManager { let p1 = taskpool.execute((): boolean => { return getPermissionUsedRecordToggleStatusExecute(); }); - p1.then((e: NullishType): void => { + p1.then((e: Any): void => { resolve(e as boolean); }).catch((err: Error): void =>{ reject(err as BusinessError); -- Gitee